Merge branch 'dev_oa_fu42' into dev

WXD-SEASON\season
2 parents e2bc4beb 6cc55373
Showing 5 changed files with 226 additions and 39 deletions
packageE/pages/cart/cart2/cart2.js
pages/user/order_list/ofilter.wxs
pages/user/order_list/order_list.js
pages/user/order_list/order_list.wxml
pages/user/order_list/order_list.wxss
@@ -2929,14 +2929,16 @@ Page({
                   cart_item.g_monthlb_num = [{
                     'month_id': item_map.monthlibao,
                     "monthnum": item_map.monthlb_num,
-                    'monthlbtitle': item_map.monthlbtitle
+                    'monthlbtitle': item_map.monthlbtitle,
+                    'prom_id':item_map.prom_id
                   }];
                 } else {
                   cart_item.monthlibao += "," + item_map.monthlibao;
                   cart_item.g_monthlb_num.push({
                     'month_id': item_map.monthlibao,
                     "monthnum": item_map.monthlb_num,
-                    'monthlbtitle': item_map.monthlbtitle
+                    'monthlbtitle': item_map.monthlbtitle,
+                    'prom_id':item_map.prom_id
                   })
                 }
               }
@@ -5431,7 +5433,8 @@ Page({
               let obj = {
                 num: ite.monthnum,
                 l_id: ite.month_id,
-                monthlbtitle: ite.monthlbtitle
+                monthlbtitle: ite.monthlbtitle,
+                prom_id: ite.prom_id,
               }
               marr.push(obj)
             })
@@ -5886,8 +5889,12 @@ Page({
     }
     var str = JSON.stringify(pdata);
  
+    console.log("--str--");
+    console.log(str);
  
  
+    return false;
+
     wx.showLoading({ title: "加载中" });
     th.setData({ submit: 1, })
     wx.request({
@@ -4,5 +4,24 @@ module.exports = {
 		if(item.presell && item.presell.presell_type==0 && item.order_status<3 && item.presell.deposit_pay_time>0 && item.presell.tail_pay_state==0)
 			url='/packageC/pages/presell/cart/cart?is_fwk=1&order_id='+item.order_id
 		return url;
-	}
+	},
+	for_mat_val:function (e){
+        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) {
+			return parseFloat(0).toFixed(count);
+		}
+		val = parseFloat(val);
+		return val.toFixed(count)
+	},
 }
 \ No newline at end of file
@@ -252,7 +252,11 @@ Page({
     r = r + "&page=" + e.data.currentPage;
     s.request(r, function (t) {
  
-      th.setData({ is_get: 1 });
+
+      if(t.data.data.page*t.data.data.pageSize>=t.data.data.total){
+        th.setData({ iscodeall: 1 });
+      }
+
       var data = e.data.orderList;
  
       //-- 如果有值的时候 --
@@ -437,6 +441,8 @@ Page({
         wx.hideLoading();
       }
  
+      th.setData({ is_get: 1 });
+
  
  
  
@@ -445,19 +451,30 @@ Page({
  
   //滑倒底部
   onReachBottom: function () {
+
+
+
     if (this.data.currentIndex == 0) {
       if (s.data.goodsLoadFinishFlag) {
         this.setData({
           iscodeall: 1
         })
       }
-      s.canloadMore() && this.requestOrderList(this.data.activeCategoryId);
+
+      if(!this.data.iscodeall){
+        wx.showLoading();
+        s.canloadMore() && this.requestOrderList(this.data.activeCategoryId);
+      }
+
+
     } else {
       if (this.data.currentIndex == 1) {
         this.request_list({
           store_id: os.stoid,
           user_id: oo.user_id,
           page: this.data.currentPage2,
+          BeginDate: this.data.startDate,
+          EndDate: this.data.endDate
         });
       } else { // 卡项订单
         this.request_list({
@@ -2646,26 +2663,57 @@ Page({
       url = '/api/weshop/recharge/user/page';
     };
  
+    wx.showLoading({
+      title: '',
+    })
+
     app.request.promiseGet(url, {
       data: data
     }).then(async res => {
       wx.hideLoading();
       // 关闭加载状态
       th.data.is_load2 = 0;
+   
       // 请求成功
       if (res.data.code == 0) {
+
         if (res.data.data.pageData.length > 0) {
           th.data.currentPage2++;
           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 }); }
+          if (res.data.data.page * res.data.data.pageSize >= res.data.data.total) { th.setData({ is_no_more2: 1 }); }
           let list = [];
  
           if (currentIndex == 1) {
             //list = th.data.list2;
-            list = list.concat(data);
+            var new_data= data.map((item,index)=>{
+                 var all_qty=0;  //总数量
+                 var all_yh=0;   //总是优惠金额
+                 if(item.list && item.list.length){
+                   for (let iv = 0; iv < item.list.length; iv++) {
+                       var tt_ite=item.list[iv];
+                       all_qty+=tt_ite.Qty;
+                       all_yh+=tt_ite.LetSum;
+                   }
+                   item.all_qty=all_qty;
+                   item.all_yh=all_yh;
+                 }
+                 if(item.CashRepNo){
+                     var q_arr=item.CashRepNo.split(',');
+                     var n_arr=[];
+                     for (let ix = 0; ix <q_arr.length; ix++) {
+                         if(!q_arr[ix]) continue;
+                         n_arr.push(q_arr[ix]);
+                     }
+                     item.quan_arr=n_arr;
+                 }
+                 return item;
+            })
+
+            list = list.concat(new_data);
             th.setData({ list2: list });
           };
+
           if (currentIndex == 2) { // 卡项订单
             list = th.data.cardList;
             // var new_data= data.map((item,index)=>{
@@ -2713,6 +2761,7 @@ Page({
             th.setData({ is_no_more2: 1 });
           }
         }
+
         if (callback) callback(res);
       } else {
         // wx.showToast({
@@ -2721,6 +2770,9 @@ Page({
         //   duration: 2000
         // })
       }
+
+      th.setData({is_get:1})
+
     })
   },
  
@@ -2728,7 +2780,8 @@ Page({
   onClickTab(e) {
     let currentIndex = e.target.dataset.index;
     this.setData({
-      currentIndex: currentIndex
+      currentIndex: currentIndex,
+      is_get:0
     });
  
     this.setData({
@@ -2744,6 +2797,9 @@ Page({
         endDate: '选择结束时间',
       });--*/
     };
+
+    
+
     if (currentIndex == 1) {
       console.log('线下订单');
       this.request_list({
@@ -2869,14 +2925,6 @@ Page({
     let endDate = this.data.endDate;
  
     // this.data.is_no_data2 = 0;
-    this.setData({
-      currentPage2: 1,
-      list2: [],
-      is_no_data2: 0,
-      is_no_more2:0
-    });
-
-
     if (startDate == '选择开始时间' || endDate == '选择结束时间') {
       wx.showToast({
         title: '请选择完整的查询时间~',
@@ -2892,6 +2940,19 @@ Page({
       return;
     };
  
+    this.setData({
+      currentPage2: 1,
+      list2: [],
+      is_no_data2: 0,
+      is_no_more2:0,
+      is_get:0
+    });
+
+
+    wx.showLoading({
+      title: '',
+    })
+
  
     this.request_list({
       store_id: os.stoid,
@@ -499,29 +499,73 @@
 <!-- 线下订单 -->
 <view class="offline-container" wx:elif="{{currentIndex == 1}}">
 		<view class="offline-list">
-			<view class="item" wx:for="{{list2}}">
-				<view class="title">
-					<view><text class="iconfont icon-order"></text>单号：{{item.No}}</view>
-					<view>{{item.states}}</view>
+			<view class="item new_d" wx:for="{{list2}}">
+				<!-- 顶部 -->
+				<view class="fs32 sto_title">{{item.StorageName}}</view>
+				<view class="fs24 order_info_new flex jc_sb">
+					<view>营业员：{{item.StaffName}}</view>
+					<view>单号：{{item.No}}</view>
 				</view>
-				<view class="subtitle">
-					<text>{{item.BillDate}}</text>
-					<view>消费总额：<text class="co-red fs28">￥{{item.Sum}}</text></view>
+				<view class="fs24 order_info_new flex jc_sb" style="margin-top: 26rpx;">
+					<view>收银员：{{ofil.for_mat_val(item.Operator)}}</view>
+					<view>{{item.BillDate}}</view>
 				</view>
-				<view wx:for="{{item.list}}" wx:for-item="i">
-					<view class="ellipsis-2 name">{{i.BarCode}} - {{i.WareName}}</view>
-					<view class="flex">
-						<view class="subitem">
-							<view class="key">数量</view>
-							<view class="val">{{i.Qty}}</view>
-						</view>
-						<view class="subitem">
-							<view class="key">单价</view>
-							<view class="val">￥{{i.Price}}(<text style="text-decoration: line-through;">{{i.PosPrice}}</text>)</view>
+				<view class="line_new" style="margin-top: 34rpx;"></view>
+				<!-- 中间商品 -->
+				<view class="flex fs24 tab_title">
+					<view class="subitem_n1">
+						名称/条码
+					</view>
+					<view class="flex subitem_n2">
+						<view class="subitem_nn">数量</view>
+						<view class="subitem_nn">单价</view>
+						<view class="subitem_nn">金额</view>
+					</view>
+				</view>
+				<view class="val_item flex ai_c" wx:for="{{item.list}}" wx:for-item="i">
+					<view class="subitem_n1">
+						<view class="ellipsis-2">{{i.WareName}}</view>
+						<view>
+							{{i.BarCode}}
+							<block wx:if="{{i.SpecName || i.UnitName}}">
+                                 ({{i.SpecName}}<text wx:if="{{i.SpecName && i.UnitName}}">/</text>{{i.UnitName}})
+							</block>
 						</view>
-						<view class="subitem">
-							<view class="key">金额</view>
-							<view class="val">￥{{i.Sum}}</view>
+					</view>
+					<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>
+				</view>
+				<view class="line_new" style="margin-top: 34rpx;"></view>
+				<!-- 底部金额 -->
+				<view style="margin-top: 16rpx;padding-bottom: 26rpx;">
+					<view class="more_info flex jc_sb ai_c fs24">
+						<text>商品总数</text>
+						<text>{{item.all_qty}}</text>
+					</view>
+					<view class="more_info flex jc_sb ai_c fs24">
+						<text>优惠金额</text>
+						<text class="je_color">{{ofil.toFix(item.all_yh,2)}}</text>
+					</view>
+					<view class="more_info flex jc_sb ai_c fs24">
+						<text>实付金额</text>
+						<text class="je_color">{{item.FactSum}}</text>
+					</view>
+					<view class="more_info flex jc_sb ai_c fs24">
+						<text>本次积分</text>
+						<text>{{ofil.for_mat_val(item.FactIntRepSum)}}</text>
+					</view>
+					<view class="more_info flex jc_sb ai_c fs24">
+						<text>会员卡号</text>
+						<text>{{item.VIPNo}}</text>
+					</view>
+					<view class="more_info flex jc_sb fs24">
+						<view>本次使用优惠券号</view>
+						<view wx:if="{{!item.quan_arr}}">-</view>
+						<view wx:else>
+							<view wx:for="{{item.quan_arr}}" wx:for-item="quan">{{quan}}</view>
 						</view>
 					</view>
 				</view>
@@ -538,7 +582,7 @@
 </view>
  
 <!-- 无订单 -->
-<view class="empty_order" wx:if="{{((!orderList||orderList.length==0) && is_get && currentIndex == 0) || (list2.length==0 && currentIndex == 1) || (cardList.length == 0 && currentIndex == 2 && is_get)}}">
+<view class="empty_order" wx:if="{{((!orderList||orderList.length==0) && is_get && currentIndex == 0) || (list2.length==0 && currentIndex == 1 && is_get) || (cardList.length == 0 && currentIndex == 2 && is_get)}}">
   <view class="flex-level">
     <image src="{{iurl}}miniapp/images/order/empty_order.png"></image>
   </view>
@@ -587,11 +587,19 @@ page {
 	border-radius: 16rpx;
 	margin-top: 20rpx;
 }
+.item.new_d {
+	background-color: white;
+	border-radius: 12rpx;
+	margin-top: 20rpx;
+}
+
 .subitem {
 	width: calc(100% / 3);
 	text-align: center;
 	font-size: 26rpx;
 }
+
+
 .name {
 	padding: 0 20rpx;
 	margin: 20rpx 0;
@@ -609,7 +617,7 @@ page {
 }
  
 .offline-container {
-	padding: 244rpx 20rpx 20rpx;
+	padding: 256rpx 18rpx 20rpx;
 }
  
 .search-btn2 {
@@ -622,3 +630,51 @@ page {
 }
  
  
+
+.sto_title{
+  line-height: 32rpx;font-weight: bolder;color: #000; text-align: center;padding-top: 38rpx;
+}
+
+.order_info_new{
+  line-height: 24rpx; color:#898585; padding: 0 30rpx; margin-top: 41rpx;
+}
+
+.line_new{
+   border-bottom:1rpx #a9a9a9 dashed;  
+   border-top:1rpx #a9a9a9 dashed;  
+   margin:  0rpx 30rpx;
+   height: 6rpx;
+}
+
+.subitem_n1 {
+	width:314rpx;
+	font-size: 24rpx;
+}
+
+
+.subitem_n2 {
+	width:358rpx;
+	font-size: 24rpx;
+}
+
+.tab_title{
+  padding: 0 30rpx;color: #000; line-height: 24rpx;margin-top: 31rpx; margin-bottom: 34rpx;
+}
+.val_item{
+  padding: 0 30rpx; line-height: 33rpx;
+}
+.val_item~.val_item{
+   margin-top: 38rpx;
+}
+.more_info{
+   min-height: 52rpx;padding: 0 30rpx;color: #898585;
+}
+
+.je_color{
+   color: #f87d27;
+}
+
+.subitem_nn {
+	width: calc(100% / 3);
+	text-align: center;
+}