Merge branch 'test' of http://git.vipzhuang.cn/wxd/MShopWeApp into qa

WXD-SEASON\season
2 parents 75d25d0a 879a397e
Showing 10 changed files with 173 additions and 20 deletions
components/add_purchase/add_purchase.js
components/add_purchase/add_purchase.wxml
packageA/pages/chongzhiDetails/chongzhiDetails.wxml
packageA/pages/chongzhiDetails/chongzhiDetails.wxss
pages/user/my_service/g_filter.wxs
pages/user/my_service/i_service.js
pages/user/my_service/i_service.wxml
pages/user/my_service/i_service.wxss
pages/user/order_detail/order_detail.js
pages/user/order_list/order_list.js
@@ -1489,7 +1489,8 @@ Component({
           });
         }
         wx.showLoading({
-          title: '加载中.'
+          title: '加载中.',
+          mask:true
         });
         //----------获取门店----------------
         getApp().request.promiseGet("/api/weshop/pickup/list", {
 <!--components/add_purchase/add_purchase.wxml-->
 <view >
-  <view bindtap="closeSpecModal" class="cover-layer"></view>
+  <view  class="cover-layer"></view>
   <view class="spec-model">
     <view class="pding">
       <icon bindtap="closeSpecModal" class="modal-close" color="black" size="22" type="cancel"></icon>
@@ -43,7 +43,7 @@
 						<view wx:if="{{item.GiveType=='0'}}">{{item.CouponSum}}元优惠券</view>
 						<view wx:elif="{{item.Integral>0}}">{{item.Integral}}积分</view>
 						<view wx:elif="{{item.GradeSum>0}}">{{item.GradeSum}}成长值</view>
-						<view wx:else>{{item.GiveName}}</view>
+						<view wx:else class="max_len_name ellipsis-2">{{item.GiveName}}</view>
 						<!-- <view class="fs28 pdv10 txt-justify">节日可免费享受专业美甲，可以享受1次。</view> -->
 						<view wx:if="{{item.Qty>0}}" class="fs24">数量：{{item.Qty}}</view>
 						<view  wx:if="{{item.GiveType=='2'}}" class="date fs24">{{'兑换截止日期' + ':' + item.BeginDate + '至' + (item.EndDate==''?'不限':item.EndDate) }}</view>
@@ -51,9 +51,12 @@
 						<!-- 优化显示二维码 -->
 						<view class="box_ware_code data-v-3a5b7e36" wx:if="{{item.GiveType=='2' && item.IsQrCode==1}}">
 							 <!-- <block wx:if="{{c_state==0}}"> -->
-							 <image src="{{url+'/miniapp/images/giftbag/gift06.png'}}" lazy-load="true" bindtap="getcode"
+							 <image wx:if="{{item.IsRetrieval}}" src="{{url+'/miniapp/images/hui-ewm.png'}}" lazy-load="true" bindtap="getcode"
 									data-index="{{index}}"
-									class="data-v-3a5b7e36 {{item.IsRetrieval?'imggray':''}} "></image>
+									class="data-v-3a5b7e36"></image>
+							<image wx:else src="{{url+'/miniapp/images/user_r_code.png'}}" lazy-load="true" bindtap="getcode"
+									data-index="{{index}}"
+									class="data-v-3a5b7e36 "></image>
 						</view>
 					</view>
@@ -169,7 +169,6 @@
 	height: 50rpx;
 }
-.imggray{
-	-webkit-filter: grayscale(1);
-	filter: grayscale(1);
+.max_len_name{
+	max-width: 480rpx;
 }
 \ No newline at end of file
+var is_acting = function(stime){
+   //判断结束时间减去当前时间 ，如果当前时间大于0则为True
+   if(stime=='') return true;
+   stime = stime.substring(0, 19);
+   var reg = getRegExp("-", "g");
+   stime = stime.replace(reg, '/');
+   var bijiao = getDate(stime) - getDate();
+   return bijiao >= 0 ? false : true;
+}
+module.exports = {
+	is_acting:is_acting  
+}
 \ No newline at end of file
@@ -71,10 +71,14 @@ Page({
       }
     }).then(res => {
       wx.hideLoading();
-      if (res.data.code == 0) {
+      if (res.data.code == 0 &&  res.data.data &&  res.data.data.pageData &&  res.data.data.pageData.length) {
         th.data.curpage++;
         var arr1 = th.data.service_List;
         var arr2 = res.data.data.pageData;
+
+
+
+
         var arr3 = [...arr1, ...arr2];
         var ismore = 0;
         if (arr3.length == res.data.data.total) ismore = 1
+<wxs module="s_filter" src="g_filter.wxs"></wxs>
 <com_top_nav title="服务项目"></com_top_nav>
 <!-- 背景图片 -->
@@ -52,9 +53,14 @@
 		  </view>
 		  <view class="flex-center fs28 functionMax">
-		    <view class="flex-level Use" bindtap="open_fw" data-ind="{{index}}" data-service_id="{{item.ServiceID}}">
+
+		    <view wx:if="{{s_filter.is_acting(item.BeginDate)}}" class="flex-level Use" bindtap="open_fw" data-ind="{{index}}" data-service_id="{{item.ServiceID}}">
 		      <view>立即使用</view>
 		    </view>
+			<view wx:else class="flex-level Use nostart"  data-ind="{{index}}" data-service_id="{{item.ServiceID}}">
+		      <view>未开始</view>
+		    </view>
+
 		    <!-- 可预约 -->
 		    <view wx:if="{{item.State>0}}" class="flex-level appointment yellow-b" data-url="/packageG/pages/user/my_service/appment_main?service_id={{item.ServiceID}}&BuyType={{item.BuyType}}&ProjectID={{item.ProjectID}}&Validay={{item.Validay}}" bindtap="correcting" data-service_id="{{item.ServiceID}}" data-project_id="{{item.ProjectID}}">
 		      <view>预约</view>
@@ -182,3 +182,7 @@ page {
 	align-items: center;
 	z-index: 999;
 }
+
+.nostart{
+ background-color:rgb(153,153,153)
+}
@@ -404,6 +404,68 @@ Page({
                 th.setData({ paying: 0 });
                 return false;
             }
+
+            var listform=[];
+            var adv_num=0;
+            order_goods.map(ite => {
+                //-- 不是赠品的时候 --
+                if(!ite.is_gift) {
+                    let obj = {
+                        wareno: ite.goods_sn,
+                        price: ite.first_account,   //account是平摊后的实收价格
+                        qty: ite.goods_num,
+                        sumprice: parseFloat(ite.account * ite.goods_num - ite.account_yu-(ite.quan_num?ite.quan_num:0)).toFixed(2)
+                    }
+
+                    adv_num+=ite.account * ite.goods_num - ite.account_yu-(ite.quan_num?ite.quan_num:0);
+                    listform.push(obj)
+                }
+            })
+
+            adv_num=parseFloat(adv_num).toFixed(2);
+            let res1 = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, {
+                data: {
+                    accdb: getApp().globalData.config.erpid,
+                    ApiName: 'api.pos.shop.advancesum.seek',
+                    usercode: "admin",
+                    vipid: getApp().globalData.userInfo.erpvipid,
+                    oddsum: "0",
+                    advancesum: adv_num,
+                    storageid: keyid,
+                    listform
+                },
+                is_json: 1
+            })
+            if(!res1 && res1.data.code!=0 ){
+                getApp().confirmBox("获取预存的金额失败");
+                th.setData({ paying: 0 });
+                return false;
+            }
+
+            if(res1.data.data.length<=0){
+                getApp().confirmBox("获取预存的金额失败");
+                th.setData({ paying: 0 });
+                return false;
+            }
+
+            var yck=0
+            let resData = res1.data.data
+            resData.map(ite => {
+                yck += ite.advancesum*1
+            })
+            if(yck<=0){
+                getApp().confirmBox("获取预存的金额失败");
+                th.setData({ paying: 0 });
+                return false;
+            }
+
+            if(pre_cut && yck!=pre_cut){
+                getApp().confirmBox("获取预存的金额不对");
+                th.setData({ paying: 0 });
+                return false;
+            }
+
+
         }
         // 幸运购检查库存量 api/weshop/activitylist/getActLen/{store_id}/{prom_type}/{prom_id}
         if (parseInt(order_goods['0']['prom_type']) == 9) {
@@ -708,16 +708,78 @@ Page({
     //如果使用预存的话，要重新效验下预存金额是否足够
     if(order.pre_cut && order.pre_json){
-      let pickup_id=order.pickup_id
-      let res = await r.promiseGet('/api/weshop/pickup/get/' + os.stoid + '/' + pickup_id, {})
-      let keyid = res.data.data.keyid
-      let resdata = await th.vipadvancesum(keyid,order.pre_cut,order.pre_json)
-      if(resdata.code !=0){
-        let msg=resdata.msg || "预存金额不足"
-        getApp().confirmBox(msg);
-        th.setData({ paying: 0 });
-        return false;
-      }
+        let pickup_id=order.pickup_id
+        let res = await r.promiseGet('/api/weshop/pickup/get/' + os.stoid + '/' + pickup_id, {})
+        let keyid = res.data.data.keyid
+        let resdata = await th.vipadvancesum(keyid,order.pre_cut,order.pre_json)
+        if(resdata.code !=0){
+          let msg=resdata.msg || "预存金额不足"
+          getApp().confirmBox(msg);
+          th.setData({ paying: 0 });
+          return false;
+        }
+
+        var listform=[];
+        var adv_num=0;
+        order_goods.map(ite => {
+          //-- 不是赠品的时候 --
+          if(!ite.is_gift) {
+            let obj = {
+              wareno: ite.goods_sn,
+              price: ite.first_account,   //account是平摊后的实收价格
+              qty: ite.goods_num,
+              sumprice: parseFloat(ite.account * ite.goods_num - ite.account_yu-(ite.quan_num?ite.quan_num:0)).toFixed(2)
+            }
+
+            adv_num+=ite.account * ite.goods_num - ite.account_yu-(ite.quan_num?ite.quan_num:0);
+            listform.push(obj)
+          }
+        })
+
+        adv_num=parseFloat(adv_num).toFixed(2);
+        let res1 = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, {
+            data: {
+              accdb: getApp().globalData.config.erpid,
+              ApiName: 'api.pos.shop.advancesum.seek',
+              usercode: "admin",
+              vipid: getApp().globalData.userInfo.erpvipid,
+              oddsum: "0",
+              advancesum: adv_num,
+              storageid: keyid,
+              listform
+            },
+            is_json: 1
+        })
+        if(!res1 && res1.data.code!=0 ){
+            getApp().confirmBox("获取预存的金额失败");
+            th.setData({ paying: 0 });
+            return false;
+        }
+
+        if(res1.data.data.length<=0){
+            getApp().confirmBox("获取预存的金额失败");
+            th.setData({ paying: 0 });
+            return false;
+        }
+
+        var yck=0
+        let resData = res1.data.data
+        resData.map(ite => {
+          yck += ite.advancesum*1
+        })
+        if(yck<=0){
+           getApp().confirmBox("获取预存的金额失败");
+           th.setData({ paying: 0 });
+           return false;
+        }
+
+        if(pre_cut && yck!=pre_cut){
+          getApp().confirmBox("获取预存的金额不对");
+          th.setData({ paying: 0 });
+          return false;
+        }
+
+
     }
     // 幸运购检查库存量 api/weshop/activitylist/getActLen/{store_id}/{prom_type}/{prom_id}