e 8 years ago
parent
commit
96fc7d6adf

+ 5 - 12
www/webapp/o2o/css/balanceLog.css

@@ -1,18 +1,6 @@
 .spa-page-balanceLog .scroller{
   background-color: #c8c8c8;
 }
-.spa-page-balanceLog h4{
-  text-align: left;
-  line-height: 35px;
-  padding-left: 15px;
-  background-color: #fff;
-  color: #000;
-  clear: both;
-  margin-bottom: 0;
-  margin-top: 100px;
-  font-size: 15px;
-  border-bottom: 1px solid rgba(0, 0, 0, 0.4);
-}
 .spa-page-balanceLog .balance-log{
   margin: 15px auto;
   border:1px solid rgba(0,0,0,0.3);
@@ -99,3 +87,8 @@
 .spa-page-balanceLog .width-percent-33 .month:active{
   color: red;
 }
+
+/*部分样式修改*/
+.spa-page-balanceLog .segmented-control .control-item.active{
+  background-color: rgb(146,118,3);
+}

File diff suppressed because it is too large
+ 0 - 0
www/webapp/o2o/dist/css/main.css


File diff suppressed because it is too large
+ 0 - 0
www/webapp/o2o/dist/js/api.js


File diff suppressed because it is too large
+ 0 - 0
www/webapp/o2o/dist/js/build/template.js


File diff suppressed because it is too large
+ 0 - 0
www/webapp/o2o/dist/js/main.js


+ 23 - 0
www/webapp/o2o/js/api.js

@@ -103,6 +103,29 @@ define(['config', 'base'], function (config, base) {
         });
     };
 
+    //获取某月订单记录
+    API.prototype.getUserTotalOrder = function (data,callback) {
+        var that = this;
+        this.isLoading = true;
+        $.signAjax({
+            url: config.apiPath + '/index.php?r=o2o/order/GetUserTotalOrder',
+            data: data,
+            dataType: 'JSON',
+            success: function (res) {
+                that.isLoading = false;
+                if (callback) {
+                    callback(res);
+                }
+            },
+            error: function (res) {
+                that.isLoading = false;
+                if (callback) {
+                    callback(apiErrorResult);
+                }
+            }
+        });
+    };
+
     API.prototype.getAgreement = function (data, callback) {
         var that = this;
         this.isLoading = true;

File diff suppressed because it is too large
+ 2 - 2
www/webapp/o2o/js/build/template.js


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

@@ -29,7 +29,10 @@
                     <div>余额</div>
                     <div>{{userBalance}}元</div>
                   </div>
-                  <h4>余额使用明细</h4>
+                  <div class="segmented-control order-type-control">
+                    <a class="control-item active" data-order-type="1">明细</a>
+                    <a class="control-item" data-order-type="2">订单</a>
+                  </div>
                 </div>
             </div>
         </div>

Some files were not shown because too many files changed in this diff