e 8 жил өмнө
parent
commit
56a7e44294

+ 34 - 0
www/webapp/o2o/css/balanceLog.css

@@ -0,0 +1,34 @@
+.spa-page-balanceLog .scroller{
+    background-color: #c8c8c8;
+}
+.spa-page-balanceLog h4{
+    text-align: center;
+    line-height: 50px;
+    background-color: #fff;
+}
+.spa-page-balanceLog .balance-log{
+    /*width: 95%;*/
+    margin: 15px auto;
+    /*background-color: #00a0e9;*/
+    border:1px solid rgba(0,0,0,0.3);
+    background-color: white;
+    /*padding: 5px;*/
+}
+.spa-page-balanceLog .balance-log div{
+    padding:15px 0;
+    padding-left: 15px;
+}
+.spa-page-balanceLog .balance-log div span{
+    font-size: 1rem;
+    margin-right: 1rem;
+    text-shadow: 2px 1px 4px;
+}
+.spa-page-balanceLog .balance-log .memo{
+    border-bottom:1px solid rgba(0,0,0,0.3);
+}
+.spa-page-balanceLog .balance-log .time-str{
+    border-bottom:1px solid rgba(0,0,0,0.3);
+}
+.spa-page-balanceLog .balance-log .type-str{
+    /*border:1px solid rgba(0,0,0,0.3);*/
+}

+ 1 - 0
www/webapp/o2o/css/main.css

@@ -22,3 +22,4 @@
 @import url("./orderFinish.css");
 @import url("./orderDetail.css");
 @import url("./beautician.css");
+@import url("./balanceLog.css");

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
www/webapp/o2o/dist/css/main.css


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
www/webapp/o2o/dist/js/build/template.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
www/webapp/o2o/dist/js/main.js


+ 1 - 1
www/webapp/o2o/dist/js/page/balanceLog.js

@@ -1 +1 @@
-define(["$","template","IScroll","user","product","native","config","address","api"],function(e,t,n,r,i,s,o,u,a){function c(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:f,pushData:{dontNeedReload:!0}})}var f,l;return{title:"家庭保洁",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){c.call(this,e)}),e.newTouch(".back-button",function(e){c.call(this,e)},r),r.on("tapBackButton",function(e){c.call(this,e)}),n.resolve()},beforeopen:function(e,t){var n=e.pushData;f=n.backHash?n.backHash:"",t.resolve()},afteropen:function(i,s){var o=this,u=e(document);a.getBalanceLog({id:r.id},function(r){if(r.success){console.log(r);for(var s=0;s<r.length;s++)console.log(r[s]);var u=t("balanceLog/index",{balanceLog:r.message});e(".spa-page-body",o).html(u),setTimeout(function(){i.scroll=new n("#balanceLogScroll")},500)}else r.error&&console.log("error")}),console.log(l),s.resolve()},beforeclose:function(e,t){t.resolve()}}});
+define(["$","template","IScroll","user","product","native","config","address","api"],function(e,t,n,r,i,s,o,u,a){function c(t){t.preventDefault(),e(document).trigger("spa:navigate",{hash:f,pushData:{dontNeedReload:!0}})}var f,l;return{title:"家庭保洁",body:"",init:function(t,n){var r=this,i=e(document);r.on("swipeRight",function(e){c.call(this,e)}),e.newTouch(".back-button",function(e){c.call(this,e)},r),r.on("tapBackButton",function(e){c.call(this,e)}),n.resolve()},beforeopen:function(e,t){var n=e.pushData;f=n.backHash?n.backHash:"",t.resolve()},afteropen:function(i,s){var o=this,u=e(document);a.getBalanceLog({id:r.id},function(r){if(r.success){var s=t("balanceLog/index",{balanceLog:r.message});e(".spa-page-body",o).html(s),setTimeout(function(){i.scroll=new n("#balanceLogScroll")},500)}else r.error&&console.log("error")}),console.log(l),s.resolve()},beforeclose:function(e,t){t.resolve()}}});

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 2 - 2
www/webapp/o2o/js/build/template.js


+ 0 - 4
www/webapp/o2o/js/page/balanceLog.js

@@ -44,10 +44,6 @@ define(['$', 'template', 'IScroll', 'user', 'product', 'native', 'config', 'addr
                 id: user.id
             }, function (res) {
                 if (res.success) {
-                    console.log(res);
-                    for(var i=0;i<res.length;i++){
-                        console.log(res[i]);
-                    }
                     var tpl = template('balanceLog/index', {
                         balanceLog: res.message
                     });

+ 9 - 1
www/webapp/o2o/tpl/balanceLog/index.html

@@ -3,7 +3,15 @@
         <div class="box-container box box-vertical">
             <div id="balanceLogScroll" class="scroll-container box-flex-1">
                 <div class="scroller">
-                    <h4>用户余额</h4>
+                    <h4>余额使用明细</h4>
+                    {{each balanceLog as Log}}
+                        <div class="balance-log">
+                            <div class="memo"><span>用途:</span>{{Log.memo}}</div>
+                            <div class="time-str"><span>时间:</span>{{Log.time_str}}</div>
+                            <div class="type-str"><span>类型:</span>{{Log.type_str}}</div>
+                        </div>
+                    {{/each}}
+                    <div style="w"></div>
                 </div>
             </div>
         </div>

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно