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

WXD-SEASON\season
2 parents 1977d71a a04aae7e
Showing 4 changed files with 36 additions and 8 deletions
components/diy_top_nav/diy_top_nav.js
components/diy_top_nav/diy_top_nav.wxml
pages/user/order_detail/order_detail.js
pages/user/order_list/order_list.js
@@ -137,7 +137,7 @@ Component({
       })
     },
     nav_search(){
-      getApp().goto('/pages/goods/search/search')
+      getApp().goto('/packageG/pages/goods/search/search')
     }
   }
 })
@@ -55,7 +55,7 @@
       </view>
       <view wx:if="{{!istop}}" catchtap="nav_search" class="navl_minddle ellipsis-1" style="margin: 0 {{navleft_pb}}px;display: block">
         <icon type="search" size="28rpx" color="#898989" class="sear_fangda" />
-        <text>搜索更多商品</text>
+        <text>搜索商品</text>
       </view>
       <view  wx:else ></view>
       <view wx:if="{{is_share}}" class="navl_right" catchtap="fenx_fn" style="height:{{mentButt_h}}px;width:{{mentButt_h}}px;">
@@ -177,6 +177,7 @@ Page({
                     if(res.data.code == 0 && res.data.data){
                         r.use_commission=res.data.data.use_commission;
                         r.pre_cut=res.data.data.pre_cut; //预存款
+                        r.pre_json=res.data.data.pre_json; //预存款
                     }
                 })
@@ -375,6 +376,33 @@ Page({
         });
     },
+    //-- 预存款判断 --
+    async vipadvancesum(keyid,pre_cut,pre_json){
+        let pre=JSON.parse(pre_json)
+        let listform=[]
+        pre.map(item=>{
+            let obj={
+                advancesum: item.advancesum,
+                advanceitemid: item.advanceitemid
+            }
+            listform.push(obj)
+        })
+        let res = await getApp().request.promisePost(`/api/weshop/delphiapi/saveErpApi`, {
+            data: {
+                accdb: getApp().globalData.config.erpid,
+                ApiName: 'api.pos.shop.vipadvancesum.list',
+                // usercode: "admin",
+                vipid: getApp().globalData.userInfo.erpvipid,
+                // oddsum: "0",
+                // advancesum: cartList.order_amount,
+                storageid: keyid,
+                listform
+            },
+            is_json: 1
+        })
+        return res.data
+    },
+
     //--------立即支付----------
     async jumpToCart4(e) {
@@ -443,7 +471,7 @@ Page({
             }
             if(res1.data.data.length<=0){
-                getApp().confirmBox("获取预存的金额失败");
+                getApp().confirmBox("每天每人仅能使用1次预存抵扣");
                 th.setData({ paying: 0 });
                 return false;
             }
@@ -454,12 +482,12 @@ Page({
                 yck += ite.advancesum*1
             })
             if(yck<=0){
-                getApp().confirmBox("获取预存的金额失败");
+                getApp().confirmBox("每天每人仅能使用1次预存抵扣");
                 th.setData({ paying: 0 });
                 return false;
             }
-            if(pre_cut && yck!=pre_cut){
+            if(order.pre_cut && yck!=order.pre_cut){
                 getApp().confirmBox("获取预存的金额不对");
                 th.setData({ paying: 0 });
                 return false;
@@ -757,7 +757,7 @@ Page({
         }
         if(res1.data.data.length<=0){
-            getApp().confirmBox("获取预存的金额失败");
+            getApp().confirmBox("每天每人仅能使用1次预存抵扣");
             th.setData({ paying: 0 });
             return false;
         }
@@ -768,12 +768,12 @@ Page({
           yck += ite.advancesum*1
         })
         if(yck<=0){
-           getApp().confirmBox("获取预存的金额失败");
+           getApp().confirmBox("每天每人仅能使用1次预存抵扣");
            th.setData({ paying: 0 });
            return false;
         }
-        if(pre_cut && yck!=pre_cut){
+        if(order.pre_cut && yck!=order.pre_cut){
           getApp().confirmBox("获取预存的金额不对");
           th.setData({ paying: 0 });
           return false;