diff --git a/components/add_purchase/add_purchase.js b/components/add_purchase/add_purchase.js index b98bfec..88c941b 100644 --- a/components/add_purchase/add_purchase.js +++ b/components/add_purchase/add_purchase.js @@ -1489,7 +1489,8 @@ Component({ }); } wx.showLoading({ - title: '加载中.' + title: '加载中.', + mask:true }); //----------获取门店---------------- getApp().request.promiseGet("/api/weshop/pickup/list", { diff --git a/components/add_purchase/add_purchase.wxml b/components/add_purchase/add_purchase.wxml index 620b696..023b9f2 100644 --- a/components/add_purchase/add_purchase.wxml +++ b/components/add_purchase/add_purchase.wxml @@ -1,7 +1,7 @@ - + diff --git a/packageA/pages/chongzhiDetails/chongzhiDetails.wxml b/packageA/pages/chongzhiDetails/chongzhiDetails.wxml index 0dd0a6d..6629f42 100644 --- a/packageA/pages/chongzhiDetails/chongzhiDetails.wxml +++ b/packageA/pages/chongzhiDetails/chongzhiDetails.wxml @@ -43,7 +43,7 @@ {{item.CouponSum}}元优惠券 {{item.Integral}}积分 {{item.GradeSum}}成长值 - {{item.GiveName}} + {{item.GiveName}} 数量：{{item.Qty}} {{'兑换截止日期' + ':' + item.BeginDate + '至' + (item.EndDate==''?'不限':item.EndDate) }} @@ -51,9 +51,12 @@ - + class="data-v-3a5b7e36"> + diff --git a/packageA/pages/chongzhiDetails/chongzhiDetails.wxss b/packageA/pages/chongzhiDetails/chongzhiDetails.wxss index 50dcf32..136ff51 100644 --- a/packageA/pages/chongzhiDetails/chongzhiDetails.wxss +++ b/packageA/pages/chongzhiDetails/chongzhiDetails.wxss @@ -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 diff --git a/pages/user/my_service/g_filter.wxs b/pages/user/my_service/g_filter.wxs new file mode 100644 index 0000000..17a817b --- /dev/null +++ b/pages/user/my_service/g_filter.wxs @@ -0,0 +1,12 @@ +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 diff --git a/pages/user/my_service/i_service.js b/pages/user/my_service/i_service.js index baf0791..a222f93 100644 --- a/pages/user/my_service/i_service.js +++ b/pages/user/my_service/i_service.js @@ -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 diff --git a/pages/user/my_service/i_service.wxml b/pages/user/my_service/i_service.wxml index fb8d5a5..744f9a3 100644 --- a/pages/user/my_service/i_service.wxml +++ b/pages/user/my_service/i_service.wxml @@ -1,3 +1,4 @@ + @@ -52,9 +53,14 @@ - + + 立即使用 + + 未开始 + + 预约 diff --git a/pages/user/my_service/i_service.wxss b/pages/user/my_service/i_service.wxss index 071f783..427aa73 100644 --- a/pages/user/my_service/i_service.wxss +++ b/pages/user/my_service/i_service.wxss @@ -182,3 +182,7 @@ page { align-items: center; z-index: 999; } + +.nostart{ + background-color:rgb(153,153,153) +} diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js index 7706973..b342045 100644 --- a/pages/user/order_detail/order_detail.js +++ b/pages/user/order_detail/order_detail.js @@ -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) { diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index 9c83899..698afd8 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -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}