diff --git a/app.js b/app.js index ab59cec..44ce1a7 100644 --- a/app.js +++ b/app.js @@ -51,7 +51,7 @@ App({ config: null, //门店参数 config2: null, //门店配置 code: null, - user_id:null,// qa-6519858,// + user_id:null,// 6520352,// qa-6519858,// // user_id:6520314,// qa-6519858,// // user_id:14148118,// qa-6519858,// buy_now: null, @@ -928,7 +928,7 @@ App({ }); }, - user_tools_endTime(type) { + user_tools_endTime(type,func) { //调用接口判断商家工具有没有过期 return this.request.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=" + type + "", {}).then(res => { if (res.data.code == 0) { @@ -938,8 +938,18 @@ App({ if (item.is_sy == 0) { var now = Date.parse(new Date()); now = now / 1000; if (item.end_time < now) { + + if(func){ + func(0) + return false; + } return 0 } + if(func){ + func(1) + return false; + } + return 1; } } diff --git a/app.json b/app.json index 7b545a5..6396a49 100644 --- a/app.json +++ b/app.json @@ -37,7 +37,7 @@ "pages/user/grow_value/grow_value", "pages/payment/pay_success/pay_success", "pages/user/plus/plus", - "pages/user/cardinfo/cardinfo", + "pages/user/my_service/appment_main", "pages/user/my_service/i_service", "pages/user/my_service/cosmetology_list", @@ -209,7 +209,8 @@ "pages": [ "pages/togoin/togoin", "pages/user/Detailed/Detailed", - "pages/user/user_fw/user_fw" + "pages/user/user_fw/user_fw", + "pages/user/cardinfo/cardinfo" ] } diff --git a/app.wxss b/app.wxss index 08bca93..a37615e 100644 --- a/app.wxss +++ b/app.wxss @@ -380,7 +380,7 @@ button { .modal-close { position: absolute; right: 25rpx; - top:40rpx; + top:16rpx; } .no-data { width: 100%; diff --git a/components/cart_collect_temp/cart_collect_temp.js b/components/cart_collect_temp/cart_collect_temp.js new file mode 100644 index 0000000..8b9d265 --- /dev/null +++ b/components/cart_collect_temp/cart_collect_temp.js @@ -0,0 +1,57 @@ +Component({ + properties: { + // 这里定义了数据列表属性，列表显示数据 + all_collocation_list: { + type: Array, + value: null + }, + // 是不是购物车 + is_cart: { + type: Boolean, + value: false + }, + // 购物车的索引 + cart_index: { + type: Number, + value: 0 + } + + }, + /*** 页面的初始数据***/ + data: { + imgUrl: getApp().globalData.setting.imghost, + }, + methods: { + select_coll(e) { + var index = e.currentTarget.dataset.index; + var itr = this.properties.all_collocation_list[index]; + var ob = { + index: index, + selected: !itr.selected + } + + if(this.properties.is_cart){ + ob.is_cart =1; + ob.cart_index =this.properties.cart_index; + } + + var txt = "all_collocation_list[" + index + "].selected" + + this.setData({[txt]: ob.selected}) + this.triggerEvent('childFun', ob); + }, + + //图片失败，默认图片 + bind_bnerr3: function (e) { + var _errImg = e.target.dataset.errorimg; + var _Img = e.target.dataset.img; + if (_Img != undefined) { + var _errObj = {}; + _errObj[_errImg] = "/public/images/default_goods_image_240.gif"; + this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; + } + }, + + + } +}) \ No newline at end of file diff --git a/components/cart_collect_temp/cart_collect_temp.json b/components/cart_collect_temp/cart_collect_temp.json new file mode 100644 index 0000000..e8cfaaf --- /dev/null +++ b/components/cart_collect_temp/cart_collect_temp.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} +} \ No newline at end of file diff --git a/components/cart_collect_temp/cart_collect_temp.wxml b/components/cart_collect_temp/cart_collect_temp.wxml new file mode 100644 index 0000000..a73eaa0 --- /dev/null +++ b/components/cart_collect_temp/cart_collect_temp.wxml @@ -0,0 +1,26 @@ + + + 超值搭配 + + + + + + + + {{item.goods_name}} + + ￥{{item.price}} + + + + + + + + + diff --git a/components/cart_collect_temp/cart_collect_temp.wxss b/components/cart_collect_temp/cart_collect_temp.wxss new file mode 100644 index 0000000..650b3d8 --- /dev/null +++ b/components/cart_collect_temp/cart_collect_temp.wxss @@ -0,0 +1,3 @@ +@import '../../app.wxss'; +@import "../../pages/index/index/index.wxss"; + diff --git a/components/diy_advertising/diy_advertising.wxss b/components/diy_advertising/diy_advertising.wxss index 294d632..3785961 100644 --- a/components/diy_advertising/diy_advertising.wxss +++ b/components/diy_advertising/diy_advertising.wxss @@ -66,6 +66,14 @@ margin: 0rpx; } +.s8_gk2 image { + width: 100%; + height: 488rpx; + vertical-align: top; + padding: 0rpx; + margin: 0rpx; +} + .s7_gk7 image { width: 100%; height: 100%; diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js index 1ee8e01..5334302 100644 --- a/components/diy_goodsGroup/diy_goodsGroup.js +++ b/components/diy_goodsGroup/diy_goodsGroup.js @@ -56,6 +56,11 @@ Component({ title_class: "", is_no_plus: 1, container: null, + + //判断接口是不是调用完成 + is_get:0, + + is_retail_price:0 //是否显示零售价 }, lifetimes: { @@ -315,44 +320,10 @@ Component({ getApp().getConfig2(function (e) { var swithc_list = e.switch_list; var sw_arr = JSON.parse(swithc_list); - //---如果后台又开等级卡的开关--- - if (sw_arr.rank_switch && sw_arr.rank_switch == "2") { - th.setData({ - rank_switch: true - }); - //---回调卡的列表--- - th.getPlusCardType(function (ob) { - th.setData({ - card_list: ob.card_list - }); - var ti = setInterval(function () { - var user = getApp().globalData.userInfo; - if (!user) return false; - clearInterval(ti); - - if (user.card_field && user['card_expiredate']) { - var str = user['card_expiredate'].replace(/-/g, '/'); - var end = new Date(str); - end = Date.parse(end) / 1000; - var now = ut.gettimestamp(); - - //--- 判断是等级会员，且在有效期范围内 --- - if (user.card_field && now < end) { - var card_name = ob.name_map.get(user.card_field); - if (card_name && card_name.length > 4) card_name = card_name.substring(0, 4); - th.setData({ - card_field: user.card_field, - card_name: card_name, - card_list: ob.card_list - }); - } - - } - - }, 500) - }) - + if(sw_arr.is_retail_price){ + th.setData({is_retail_price:1}); } + ut.get_plus_name_price(sw_arr,th); }) } }) @@ -571,11 +542,12 @@ Component({ for (var i = 0; i < rData.length; i += 3) { arr.push(rData.slice(i, i + 3)); } - th.setData({ goods_array: arr, page: th.data.currentPage - 1, }); + th.setData({ goods_array: arr, page: th.data.currentPage - 1,is_get:1 }); } else { th.setData({ goods_array: th.data.requestData, page: th.data.currentPage - 1, + is_get:1 }); } diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxml b/components/diy_goodsGroup/diy_goodsGroup.wxml index dcf0dd8..98c1a79 100644 --- a/components/diy_goodsGroup/diy_goodsGroup.wxml +++ b/components/diy_goodsGroup/diy_goodsGroup.wxml @@ -25,7 +25,7 @@ - + @@ -67,7 +67,7 @@ + ￥{{item.prom_price}} - + ￥{{item.market_price}} @@ -89,10 +89,10 @@ - - - - + + ￥ + {{item.market_price}} + @@ -105,10 +105,10 @@ - - - - + + ￥ + {{item.market_price}} + @@ -122,10 +122,10 @@ {{filter.toFix(item.shop_price,2)}} - - - - + + ￥ + {{item.market_price}} + @@ -150,10 +150,10 @@ - - - - + + ￥ + {{item.market_price}} + @@ -161,7 +161,7 @@ ￥{{item.shop_price}} - + ￥{{item.market_price}} @@ -237,7 +237,7 @@ + ￥{{item.prom_price}} - + ￥{{item.market_price}} @@ -258,10 +258,10 @@ - - - - + + ￥ + {{item.market_price}} + @@ -274,10 +274,10 @@ - - - - + + ￥ + {{item.market_price}} + @@ -291,10 +291,10 @@ {{filter.toFix(item.shop_price,2)}} - - - - + + ￥ + {{item.market_price}} + @@ -319,17 +319,17 @@ - - - - + + ￥ + {{item.market_price}} + ￥{{item.shop_price}} - + ￥{{item.market_price}} @@ -406,7 +406,7 @@ + ￥{{item.prom_price}} - + ￥{{item.market_price}} @@ -427,10 +427,10 @@ - - - - + + ￥ + {{item.market_price}} + @@ -443,10 +443,10 @@ - - - - + + ￥ + {{item.market_price}} + @@ -460,10 +460,10 @@ {{filter.toFix(item.shop_price,2)}} - - - - + + ￥ + {{item.market_price}} + @@ -488,17 +488,17 @@ - - - - + + ￥ + {{item.market_price}} + ￥{{item.shop_price}} - + ￥{{item.market_price}} @@ -577,7 +577,7 @@ + ￥{{item.prom_price}} - + ￥{{item.market_price}} @@ -600,10 +600,10 @@ - - - - + + ￥ + {{item.market_price}} + @@ -616,10 +616,10 @@ - - - - + + ￥ + {{item.market_price}} + @@ -633,10 +633,10 @@ {{filter.toFix(item.shop_price,2)}} - - - - + + ￥ + {{item.market_price}} + @@ -660,10 +660,10 @@ - - - - + + ￥ + {{item.market_price}} + @@ -671,7 +671,7 @@ ￥{{item.shop_price}} - + ￥{{item.market_price}} @@ -772,7 +772,7 @@ + ￥{{aitem.prom_price}} - + ￥{{aitem.market_price}} @@ -793,10 +793,10 @@ - - - - + + ￥ + {{aitem.market_price}} + @@ -809,10 +809,10 @@ - - - - + + ￥ + {{aitem.market_price}} + @@ -826,10 +826,10 @@ {{filter.toFix(aitem.shop_price,2)}} - - - - + + ￥ + {{aitem.market_price}} + @@ -854,17 +854,17 @@ - - - - + + ￥ + {{aitem.market_price}} + ￥{{aitem.shop_price}} - + ￥{{aitem.market_price}} @@ -898,5 +898,8 @@ -暂无数据 +暂无数据 + + + \ No newline at end of file diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxss b/components/diy_goodsGroup/diy_goodsGroup.wxss index 616c4bf..496b5ff 100644 --- a/components/diy_goodsGroup/diy_goodsGroup.wxss +++ b/components/diy_goodsGroup/diy_goodsGroup.wxss @@ -912,6 +912,7 @@ top: 10rpx; text-align: center; } - - +.flex{ display: flex;} +.jcc{ justify-content: center;} +.loader{ width:750rpx; margin:20rpx 0} diff --git a/components/diy_groupbuy/diy_groupbuy.js b/components/diy_groupbuy/diy_groupbuy.js index c73b494..28466b5 100644 --- a/components/diy_groupbuy/diy_groupbuy.js +++ b/components/diy_groupbuy/diy_groupbuy.js @@ -59,7 +59,19 @@ Component({ init: function (g_id) { - var th = this, app = getApp(), goodsidlist = ""; + + var th=this; + getApp().getConfig2(function (e) { + var swithc_list = e.switch_list; + var sw_arr = JSON.parse(swithc_list); + + if(sw_arr.is_retail_price){ + th.setData({is_retail_price:1}); + } + }) + + + var app = getApp(), goodsidlist = ""; if (g_id.data && g_id.data.length > 0) { //--先把商品ID串起来-- g_id.data.forEach(function (val, ind) { diff --git a/components/diy_groupbuy/diy_groupbuy.wxml b/components/diy_groupbuy/diy_groupbuy.wxml index 796d0f7..e928d9e 100644 --- a/components/diy_groupbuy/diy_groupbuy.wxml +++ b/components/diy_groupbuy/diy_groupbuy.wxml @@ -39,7 +39,7 @@ {{aitem.goods_name}} ￥{{aitem.price}} - + ￥{{aitem.market_price}} + ￥{{aitem.market_price}} diff --git a/components/diy_luckyGo/diy_luckyGo.js b/components/diy_luckyGo/diy_luckyGo.js index c5a47ba..a40cf99 100644 --- a/components/diy_luckyGo/diy_luckyGo.js +++ b/components/diy_luckyGo/diy_luckyGo.js @@ -60,7 +60,18 @@ Component({ // 这里是一个自定义方法 customMethod: function () { }, init: function (g_id) { - var th = this, app = getApp(), goodsidlist = ""; + var th = this; + + getApp().getConfig2(function (e) { + var swithc_list = e.switch_list; + var sw_arr = JSON.parse(swithc_list); + + if(sw_arr.is_retail_price){ + th.setData({is_retail_price:1}); + } + }) + + var app = getApp(), goodsidlist = ""; if (g_id.data_type == 2) { if (g_id.data && g_id.data.length > 0) { //--先把商品ID串起来-- diff --git a/components/diy_luckyGo/diy_luckyGo.wxml b/components/diy_luckyGo/diy_luckyGo.wxml index 1ed81e2..60bb7bf 100644 --- a/components/diy_luckyGo/diy_luckyGo.wxml +++ b/components/diy_luckyGo/diy_luckyGo.wxml @@ -27,9 +27,9 @@ {{aitem.title}} - + {{filters.price(aitem.group_price)}} - + {{aitem.market_price}} diff --git a/components/diy_pingd_buy/diy_pingd_buy.js b/components/diy_pingd_buy/diy_pingd_buy.js index a33ca6c..1b5e23d 100644 --- a/components/diy_pingd_buy/diy_pingd_buy.js +++ b/components/diy_pingd_buy/diy_pingd_buy.js @@ -65,8 +65,22 @@ Component({ // 这里是一个自定义方法 customMethod: function() {}, init: function(g_id) { - var th = this, - app = getApp(), all_array = [], + + var th = this; + getApp().getConfig2(function (e) { + var swithc_list = e.switch_list; + var sw_arr = JSON.parse(swithc_list); + + if(sw_arr.is_retail_price){ + th.setData({is_retail_price:1}); + } + }) + + + + + + var app = getApp(), all_array = [], index = 0, goodsidlist=""; diff --git a/components/diy_pingd_buy/diy_pingd_buy.wxml b/components/diy_pingd_buy/diy_pingd_buy.wxml index 12a1769..7cb7dcd 100644 --- a/components/diy_pingd_buy/diy_pingd_buy.wxml +++ b/components/diy_pingd_buy/diy_pingd_buy.wxml @@ -46,7 +46,7 @@ {{aitem.title}} ￥{{aitem.price}} - + ￥{{aitem.market_price}} {{aitem.ct_num}}人团 @@ -91,7 +91,7 @@ ￥{{aitem.price}} - + ￥{{aitem.market_price}} diff --git a/components/diy_pregoods/diy_pregoods.js b/components/diy_pregoods/diy_pregoods.js index 3d2e424..29dfa98 100644 --- a/components/diy_pregoods/diy_pregoods.js +++ b/components/diy_pregoods/diy_pregoods.js @@ -33,7 +33,19 @@ Component({ methods: { // 这里是一个自定义方法 init: function(g_id) { - var th = this, app = getApp(), goodsidlist=""; + var th = this; + + getApp().getConfig2(function (e) { + var swithc_list = e.switch_list; + var sw_arr = JSON.parse(swithc_list); + + if(sw_arr.is_retail_price){ + th.setData({is_retail_price:1}); + } + }) + + + var app = getApp(), goodsidlist=""; if(g_id && g_id.length>0){ //--先把商品ID串起来-- g_id.forEach(function(val, ind) { diff --git a/components/diy_pregoods/diy_pregoods.wxml b/components/diy_pregoods/diy_pregoods.wxml index 7fb32e3..7a6dca5 100644 --- a/components/diy_pregoods/diy_pregoods.wxml +++ b/components/diy_pregoods/diy_pregoods.wxml @@ -57,7 +57,7 @@ {{aitem.act_name}} ￥{{aitem.presell_price}} - + ￥{{aitem.shop_price}} @@ -88,7 +88,7 @@ ￥{{aitem.presell_price}} - ￥{{aitem.market_price}} + ￥{{aitem.market_price}} diff --git a/components/diy_seckill/diy_seckill.js b/components/diy_seckill/diy_seckill.js index 512c645..04888f7 100644 --- a/components/diy_seckill/diy_seckill.js +++ b/components/diy_seckill/diy_seckill.js @@ -78,7 +78,19 @@ Component({ // 这里是一个自定义方法 customMethod: function () { }, init: function (g_id) { - var th = this, app = getApp(), goodsidlist = "", idlist = ""; + var th = this; + + getApp().getConfig2(function (e) { + var swithc_list = e.switch_list; + var sw_arr = JSON.parse(swithc_list); + + if(sw_arr.is_retail_price){ + th.setData({is_retail_price:1}); + } + }) + + + var app = getApp(), goodsidlist = "", idlist = ""; if (g_id.data_type == 2) { if (g_id.data && g_id.data.length > 0) { //--先把商品ID串起来-- diff --git a/components/diy_seckill/diy_seckill.wxml b/components/diy_seckill/diy_seckill.wxml index 48c4a72..7b3f902 100644 --- a/components/diy_seckill/diy_seckill.wxml +++ b/components/diy_seckill/diy_seckill.wxml @@ -82,7 +82,7 @@ {{aitem.goods_name}} ￥{{aitem.price}} - + ￥{{aitem.market_price}} diff --git a/components/goods_list/goods_list.js b/components/goods_list/goods_list.js index aef9210..24d651f 100644 --- a/components/goods_list/goods_list.js +++ b/components/goods_list/goods_list.js @@ -18,14 +18,29 @@ Component({ max_card_field: "", card_list: null, is_no_plus: 1, + + is_retail_price:0 + }, properties: { // 这⾥定义了innerText属性，属性值可以在组件使⽤时指定 }, - ready: function () { }, + ready: function () { + + var th=this; + getApp().getConfig2(function (e) { + var swithc_list = e.switch_list; + var sw_arr = JSON.parse(swithc_list); + if(sw_arr.is_retail_price){ + th.setData({is_retail_price:1}); + } + },1); + + }, pageLifetimes: { //要处理一下，游客登录后的界面的变化,主要还该是改变会员 show: function () { + this.init(); if (getApp().globalData.login_back == 1) { getApp().globalData.login_back == 0; @@ -48,39 +63,7 @@ Component({ getApp().getConfig2(function (e) { var swithc_list = e.switch_list; var sw_arr = JSON.parse(swithc_list); - //---如果后台有开等级卡的开关--- - if (sw_arr.rank_switch && sw_arr.rank_switch == "2") { - th.setData({ - rank_switch: true - }); - //---回调卡的列表--- - th.getPlusCardType(function (ob) { - th.setData({ - card_list: ob.card_list - }); - var ti = setInterval(function () { - var user = getApp().globalData.userInfo; - if (!user) return false; - clearInterval(ti); - if (user.card_field && user['card_expiredate']) { - var str = user['card_expiredate'].replace(/-/g, '/'); - var end = new Date(str); - end = Date.parse(end) / 1000; - var now = ut.gettimestamp(); - //--- 判断是等级会员，且在有效期范围内 --- - if (user.card_field && now < end) { - var card_name = ob.name_map.get(user.card_field); - if (card_name && card_name.length > 4) card_name = card_name.substring(0, 8); - th.setData({ - card_field: user.card_field, - card_name: card_name, - card_list: ob.card_list - }); - } - } - }, 500) - }) - } + ut.get_plus_name_price(sw_arr,th); }) } diff --git a/components/goods_list/goods_list.wxml b/components/goods_list/goods_list.wxml index 27a7ab7..e15421d 100644 --- a/components/goods_list/goods_list.wxml +++ b/components/goods_list/goods_list.wxml @@ -17,7 +17,7 @@ - + {{item.prom_integral}}积分 + @@ -26,13 +26,16 @@ {{item.prom_price}} - - - - - - - + + + + + + ￥ + {{item.market_price}} + + + @@ -54,15 +57,20 @@ - - - - - - - + + + + + + + ￥ + {{item.market_price}} + + + + - + @@ -70,14 +78,14 @@ {{filter.toFix(item.shop_price,2)}} - - - - - - - - + + + + ￥ + {{item.market_price}} + + + @@ -89,10 +97,10 @@ {{filter.toFix(item.shop_price,2)}} - - - - + + ￥ + {{item.market_price}} + @@ -114,13 +122,13 @@ {{filter.toFix(item.shop_price,2)}} - - - - - - - + + + + ￥ + {{item.market_price}} + + @@ -133,13 +141,13 @@ {{filter.toFix(item.shop_price,2)}} - - - - - - - + + + + ￥ + {{item.market_price}} + + diff --git a/components/qr_code/qr_code.js b/components/qr_code/qr_code.js index 812d7c8..2d4833d 100644 --- a/components/qr_code/qr_code.js +++ b/components/qr_code/qr_code.js @@ -35,7 +35,7 @@ Component({ this.setData({q_show: 1,object:e,barcode_canvas:list,qrcode_canvas:list,is_fw:e.is_fw }); var val=e.val; - barcode('barcode'+this.data.index,val, 620, 160,this); + barcode('barcode'+this.data.index,val+"", 620, 160,this); qrcode('qrcode'+this.data.index, val, 520, 520,this); } }, diff --git a/components/serviceCard_list/serviceCard_list.js b/components/serviceCard_list/serviceCard_list.js index 4098e2f..b4b3ff4 100644 --- a/components/serviceCard_list/serviceCard_list.js +++ b/components/serviceCard_list/serviceCard_list.js @@ -45,48 +45,7 @@ Component({ success: function (e) { if (e.data.code == 0 && e.data && e.data.data) { getApp().globalData.userInfo = e.data.data; - getApp().getConfig2(function (e) { - var swithc_list = e.switch_list; - var sw_arr = JSON.parse(swithc_list); - //---如果后台有开等级卡的开关--- - if (sw_arr.rank_switch && sw_arr.rank_switch == "2") { - th.setData({ - rank_switch: true - }); - //---回调卡的列表--- - th.getPlusCardType(function (ob) { - th.setData({ - card_list: ob.card_list - }); - var ti = setInterval(function () { - var user = getApp().globalData.userInfo; - if (!user) return false; - clearInterval(ti); - if (user.card_field && user['card_expiredate']) { - var str = user['card_expiredate'].replace(/-/g, '/'); - var end = new Date(str); - end = Date.parse(end) / 1000; - var now = ut.gettimestamp(); - //--- 判断是等级会员，且在有效期范围内 --- - if (user.card_field && now < end) { - var card_name = ob.name_map.get(user.card_field); - if (card_name && card_name.length > 4) card_name = card_name.substring(0, 8); - th.setData({ - card_field: user.card_field, - card_name: card_name, - card_list: ob.card_list - }); - } - } - }, 500) - }) - } - }) - } - - - } }) }, diff --git a/components/serviceCard_list/serviceCard_list.wxml b/components/serviceCard_list/serviceCard_list.wxml index 86919ed..ee7b346 100644 --- a/components/serviceCard_list/serviceCard_list.wxml +++ b/components/serviceCard_list/serviceCard_list.wxml @@ -37,95 +37,8 @@ - - - - - - - - - - ￥ - {{filter.toFix(item[card_field],2)}} - - - {{card_name}} - - - - - - - ￥ - {{item.market_price}} - - - - - - - - ￥ - {{filter.toFix(item.shop_price,2)}} - - - - - - ￥ - {{item.market_price}} - - - - - - - - - - - ￥ - {{filter.toFix(item.shop_price,2)}} - - - - ￥ - {{item.market_price}} - - - - - - ￥ - {{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}} - - - {{g_filter.get_card_price(item,card_list,1)}} - - - - - - - - - ￥ - {{filter.toFix(item.shop_price,2)}} - - - - - - ￥ - {{item.market_price}} - - - - - - + diff --git a/custom-tab-bar/index.js b/custom-tab-bar/index.js index 206902f..d3b87c1 100644 --- a/custom-tab-bar/index.js +++ b/custom-tab-bar/index.js @@ -20,6 +20,12 @@ Component({ } }) + //过滤掉分销到期的 + getApp().user_tools_endTime(2,function(e){ + if(!e) th.setData({is_no_distri:1}) + }); + + //购买的信息用全局缓存 if(getApp().globalData.dis_buy_obj){ var arr = getApp().globalData.dis_buy_obj; diff --git a/packageA/pages/distribution/goods/goods.wxml b/packageA/pages/distribution/goods/goods.wxml index ab59e8f..49b2c1a 100644 --- a/packageA/pages/distribution/goods/goods.wxml +++ b/packageA/pages/distribution/goods/goods.wxml @@ -83,7 +83,7 @@ {{item.goods_name}} - + {{item.prom_integral}}积分 + diff --git a/packageA/pages/distribution/shop/shop.wxml b/packageA/pages/distribution/shop/shop.wxml index 9ce235d..993b486 100644 --- a/packageA/pages/distribution/shop/shop.wxml +++ b/packageA/pages/distribution/shop/shop.wxml @@ -76,7 +76,7 @@ {{item.goods_name}} - + {{item.prom_integral}} diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js index 2032b38..0bb8c73 100644 --- a/packageA/pages/goodsInfo/goodsInfo.js +++ b/packageA/pages/goodsInfo/goodsInfo.js @@ -914,7 +914,7 @@ Page({ // 如果限购数量a<=redis可购买数量d, 当增加数量t>a，提示超出限购 let actInfo = th.data.sele_g; await th.get_buy_num2().then(function (data) { - let limited = actInfo.buy_limit; // 限购数量a + let limited = actInfo.buy_limit==0?100000:actInfo.buy_limit; // 限购数量a let promcardbuynum = data.data.data.promcardbuynum; let buyedNum = promcardbuynum; // 自己已经购买的数量b let canBuyNum = limited - buyedNum; // 自己还可购买的数量c @@ -1242,7 +1242,7 @@ Page({ // 如果限购数量a<=redis可购买数量d, 当增加数量t>a，提示超出限购 let actInfo = th.data.sele_g; await th.get_buy_num2().then(function (data) { - let limited = actInfo.buy_limit; // 限购数量a + let limited = actInfo.buy_limit==0?100000:actInfo.buy_limit; // 限购数量a let promcardbuynum = data.data.data.promcardbuynum; let buyedNum = promcardbuynum; // 自己已经购买的数量b let canBuyNum = limited - buyedNum; // 自己还可购买的数量c diff --git a/packageA/pages/profile/profile.js b/packageA/pages/profile/profile.js index 8b93286..cb444f8 100644 --- a/packageA/pages/profile/profile.js +++ b/packageA/pages/profile/profile.js @@ -586,6 +586,18 @@ Page({ this.setData({head_pic:uu.head_pic,nickname:uu.nickname}) } + if(getApp().globalData.first_leader){ + //--生成会员 -- + getApp().promiseGet("/api/weshop/users/get/" + r.stoid + "/" + getApp().globalData.first_leader,{}).then(res=>{ + if(res.data.code==0){ + //更新会员 + self.setData({ + fir_user:res.data.data + }) + } + }) + } + app.request.get(url1, { success:async function(res) { if(res.data.code == 0) { @@ -1132,7 +1144,7 @@ Page({ //-- 需要推荐人 -- if(this.data.reg_info.introducer_state){ - let tjrname = this.data.referee; + let tjrname = this.data.referee || this.data.fir_user.mobile; if (tjrname == "" || tjrname == null) { //app.my_warnning("请输入推荐人", 0, this); //return false; diff --git a/packageA/pages/profile/profile.wxml b/packageA/pages/profile/profile.wxml index cc2045e..d1ce6fb 100644 --- a/packageA/pages/profile/profile.wxml +++ b/packageA/pages/profile/profile.wxml @@ -29,8 +29,17 @@ 推荐人: + + + + + + + + - +{{reg_info.introducer}}积分 diff --git a/packageB/pages/zuhegou/index/index.js b/packageB/pages/zuhegou/index/index.js index dcc4b7f..1aae439 100644 --- a/packageB/pages/zuhegou/index/index.js +++ b/packageB/pages/zuhegou/index/index.js @@ -540,10 +540,12 @@ Page({ this.data.is_zuhe_addcart = 1; if (!haveAdded) { - - + //购买的商品的数量默认超量的数量 th.data.sele_g = this.data.list[index]; - if (!th.data.sele_g.num) th.data.goodsInputNum = 1; + if (!th.data.sele_g.num){ + th.data.goodsInputNum = 1; + if(th.data.sele_g.zhqty) th.data.goodsInputNum = th.data.sele_g.zhqty; + } //如果没有门店，活动商品的配送方式和门店的配送方式不一样 if (!th.data.def_pick_store || @@ -664,8 +666,11 @@ Page({ async check_pk_store_conut(func,is_no_msg,gd,by_num){ var th=this; if(this.data.sales_rules!=2){ - if(func) func(); - return false; + if(is_no_msg) return true; + else { + if(func) func(); + return false; + } } //门店库存no var pkno= gd && gd.pickup_no?gd.pickup_no:this.data.def_pick_store.pickup_no; @@ -784,9 +789,17 @@ Page({ this.data.sele_index = index; th.data.goodsInputNum = th.data.sele_g.num + 1; + //必须是组合购买的超量 + var is_zhqty=0; + if(th.data.goodsInputNum 1) { + if (th.data.list[index].num > 0) { var item = th.data.sele_g; if (th.data.goodsInputNum > o.store_count) { th.data.adding = 0; @@ -2000,6 +2013,13 @@ Page({ } var num = item.goods_num; + + var is_num_change=0; + if(num -1 && item.cbuy < item.goods_num) { num = item.cbuy; } @@ -2024,6 +2044,9 @@ Page({ updata['guide_id'] = getApp().globalData.guide_id; updata['guide_type'] = 0; } + if(is_num_change){ + updata['goods_num']=num; + } getApp().request.put("/api/weshop/cart/update", { data: updata, diff --git a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js index 65d3955..a80fb7a 100644 --- a/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js +++ b/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js @@ -6018,7 +6018,7 @@ Page({ }, go_card_info: function () { - getApp().goto("/pages/user/cardinfo/cardinfo"); + getApp().goto("/packageE/pages/user/cardinfo/cardinfo"); }, //-- 根据ID拿出门店 -- diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.js b/packageC/pages/presell/goodsInfo/goodsInfo.js index 32ff65a..0b018ba 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.js +++ b/packageC/pages/presell/goodsInfo/goodsInfo.js @@ -21,6 +21,9 @@ let self = null; Page({ data: { + type: 0, + a_btn_type: true, //测试底部按钮显示 + start_stop: 2, //秒杀开始 结束 的控制(1正在进行，2即将开始) color_type: 0, //线条控制 color_type_one: 0, @@ -2379,13 +2382,30 @@ Page({ countDown(time, prom_st) { if (!this.data.is_timer) return false; var th = this; + var {presellForm:{start_time,show_time,end_time},presellForm} = this.data; // 获取当前时间，同时得到活动结束时间数组 var endTime = time; var newTime = ut.gettimestamp(); // 对结束时间进行处理渲染到页面 var obj = null; - // 如果活动未结束，对时间进行处理 - if (endTime - newTime > 0) { + var type = 0; + + if ( show_time && newTime>=show_time && newTime 0) { + // 如果活动未结束，对时间进行处理 var time = (endTime - newTime); // 获取天、时、分、秒 var day = parseInt(time / (60 * 60 * 24)); @@ -2398,8 +2418,8 @@ Page({ min: this.timeFormat(min), sec: this.timeFormat(sec) } + type = 1 } else { - //活动已结束，全部设置为'00' obj = { day: '00', @@ -2407,19 +2427,20 @@ Page({ min: '00', sec: '00' } + th.setData({ prom_time_text: '活动已经结束:', - prom_st: 3 + prom_st: 3, + djs: obj, + type: 2 }) - th.setData({ - djs: obj - }); - return false; + return false; } th.setData({ - djs: obj + djs: obj, + type: type }); setTimeout(function () { th.countDown(endTime) @@ -4510,7 +4531,7 @@ Page({ getApp().goto("/pages/user/plus/plus"); }, go_card_info: function () { - getApp().goto("/pages/user/cardinfo/cardinfo"); + getApp().goto("/packageE/pages/user/cardinfo/cardinfo"); }, //-- 根据ID拿出门店 -- get_pick_from_list(pid) { @@ -4716,6 +4737,7 @@ Page({ presell_id: presell_id, goods_id: th.data.gid } + console.log('获取预售从表') //------获取预售从表---------- await getApp().request.promiseGet(url, { data: rd @@ -4730,6 +4752,7 @@ Page({ }) } else { + console.log('获取预售从表', 'pre_id', th.data.pre_id) //------获取预售从表---------- await getApp().request.promiseGet("/api/weshop/marketing/marketingPresellList/get/" + os.stoid + "/" + th.data.pre_id, {}).then(res => { if (res.data.code == 0 && res.data.data) { @@ -4798,12 +4821,13 @@ Page({ } if (act_data.start_time > ut.gettimestamp()) { - wx.showToast({ title: "活动还未开始", icon: 'none', duration: 3000 }); - setTimeout(function () { - ut.wx_back(); - }, 2000) - gnext = 0; - return false; + // wx.showToast({ title: "活动还未开始", icon: 'none', duration: 3000 }); + // setTimeout(function () { + // ut.wx_back(); + // }, 2000) + // gnext = 0; + th.setData({ show: true }); + // return false; } th.setData({ @@ -4838,11 +4862,12 @@ Page({ } }) if (!pre_arr) { - wx.showToast({ title: "当前会员身份不符或者时间已过期，无法参与", icon: 'none', duration: 3000 }); - setTimeout(function () { - ut.wx_back(); - }, 2000) - return false; + // wx.showToast({ title: "当前会员身份不符或者时间已过期，无法参与", icon: 'none', duration: 3000 }); + // setTimeout(function () { + // ut.wx_back(); + // }, 2000) + th.setData({ show: true }); + // return false; } if (func) { func(); diff --git a/packageC/pages/presell/goodsInfo/goodsInfo.wxml b/packageC/pages/presell/goodsInfo/goodsInfo.wxml index 9c34892..fda086f 100644 --- a/packageC/pages/presell/goodsInfo/goodsInfo.wxml +++ b/packageC/pages/presell/goodsInfo/goodsInfo.wxml @@ -74,7 +74,8 @@ - + + 预售价 @@ -88,28 +89,28 @@ - 距活动结束还有 + 距活动{{type==0?'开始':'结束'}}还有 - + {{djs.day}} - + 天 - + {{djs.hou}} - 时 - + 时 + {{djs.min}} - 分 - + 分 + {{djs.sec}} - 秒 + 秒 @@ -128,11 +129,11 @@ - 尾款：{{filters.format_time(presellForm.pay_begindate,1)}}-{{filters.format_time(presellForm.pay_enddate,1)}} + 尾款:{{filters.format_time(presellForm.pay_begindate,1)}}-{{filters.format_time(presellForm.pay_enddate,1)}} - 总数量：{{presellList.presell_sumqty+presellList.virtual_qty}}件 + 总数量:{{presellList.presell_sumqty+presellList.virtual_qty}}件 限购:{{presellList.vip_butyqty}}件 限购:不限 已购:{{presellList.buy_goodnum+presellList.virtual_qty}}件 @@ -209,7 +210,7 @@ - + @@ -219,7 +220,7 @@ {{item.is_anonymous!=1?item.username:'匿名'}} - + @@ -434,7 +435,7 @@ {{item.username==''||item.is_anonymous==1 ?'匿名用户':item.username}} - + @@ -450,12 +451,12 @@ - + - + @@ -474,7 +475,7 @@ 店家回复: - + {{r_item.content}} @@ -529,7 +530,8 @@ - + 即将开始 + {{filters.format_time(presellForm.end_time,2)}} 预售结束 @@ -721,7 +723,7 @@ {{sec_sto.name}}