小票界面的优化

yvan.ni
1 parent 06b98db0
Showing 3 changed files with 16 additions and 13 deletions
pages/user/order_list/ofilter.wxs
pages/user/order_list/order_list.js
pages/user/order_list/order_list.wxml
@@ -6,22 +6,22 @@ module.exports = {
 		return url;
 	},
 	for_mat_val:function (e){
-        if(e==undefined) return '-';
-        if(e==null) return '-';
-        if(e=="null") return '-';
-        if(e=="") return '-';
+        if(e===undefined) return '-';
+        if(e===null) return '-';
+        if(e==="null") return '-';
+        if(e==="") return '-';
 	    	return e;
   },
   toFix: function (val, count) {
-    if(val==undefined) return '-';
-    if(val==null) return '-';
-    if(val=="null") return '-';
-    if(val=="") return '-';
+    if(val===undefined) return '-';
+    if(val===null) return '-';
+    if(val==="null") return '-';
+    if(val==="") return '-';
 		if (!val) {
-			return parseFloat(0).toFixed(count);
+			return "0";
 		}
 		val = parseFloat(val);
-		return val.toFixed(count)
+		return parseFloat(val.toFixed(count))
 	},
 }
 \ No newline at end of file
@@ -2683,7 +2683,10 @@ Page({
           var data = res.data.data.pageData;
           // 判断有无更多数据可以加载，如果大于则没有更多数据，反之则有
           if (res.data.data.page * res.data.data.pageSize >= res.data.data.total) { th.setData({ is_no_more2: 1 }); }
-          let list = [];
+          
+          
+          let list = th.data.list2;
+          if(!list) list=[];
           if (currentIndex == 1) {
             //list = th.data.list2;
@@ -535,7 +535,7 @@
 					<view class="flex subitem_n2">
 						<view class="subitem_nn">{{i.Qty}}</view>
 						<view class="subitem_nn">{{i.Price}}</view>
-						<view class="subitem_nn je_color">{{i.Sum}}</view>
+						<view class="subitem_nn je_color">{{ofil.toFix(i.Sum,2)}}</view>
 					</view>
 				</view>
 				<view class="line_new" style="margin-top: 34rpx;"></view>
@@ -551,7 +551,7 @@
 					</view>
 					<view class="more_info flex jc_sb ai_c fs24">
 						<text>实付金额</text>
-						<text class="je_color">{{item.FactSum}}</text>
+						<text class="je_color">{{ofil.toFix(item.FactSum,2)}}</text>
 					</view>
 					<view class="more_info flex jc_sb ai_c fs24">
 						<text>本次积分</text>