diff --git a/components/diy_top_nav/diy_top_nav.js b/components/diy_top_nav/diy_top_nav.js
index 8700664..014ae36 100644
--- a/components/diy_top_nav/diy_top_nav.js
+++ b/components/diy_top_nav/diy_top_nav.js
@@ -137,7 +137,7 @@ Component({
})
},
nav_search(){
- getApp().goto('/pages/goods/search/search')
+ getApp().goto('/packageG/pages/goods/search/search')
}
}
})
diff --git a/components/diy_top_nav/diy_top_nav.wxml b/components/diy_top_nav/diy_top_nav.wxml
index e9812c6..618306b 100644
--- a/components/diy_top_nav/diy_top_nav.wxml
+++ b/components/diy_top_nav/diy_top_nav.wxml
@@ -55,7 +55,7 @@
- 搜索更多商品
+ 搜索商品
diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js
index b342045..a60fb0b 100644
--- a/pages/user/order_detail/order_detail.js
+++ b/pages/user/order_detail/order_detail.js
@@ -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;
diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js
index 698afd8..e10c404 100644
--- a/pages/user/order_list/order_list.js
+++ b/pages/user/order_list/order_list.js
@@ -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;