diff --git a/app.js b/app.js index 7468cd6..cc2b2b6 100644 --- a/app.js +++ b/app.js @@ -40,7 +40,7 @@ App({ ], globalData: { - cartGoodsNum:0, //购物车总数量 + cartGoodsNum:0, //购物车总数量 isTabBar :false, isIpx: false, //适配IPhoneX url:"", @@ -165,8 +165,9 @@ App({ } } }) - - + + //获取一下门店的基本信息 + this.getConfig(); }, //---初始化第三方---- @@ -216,7 +217,7 @@ App({ return false; } if(this.globalData.config==undefined) this.globalData.config=null; - this.globalData.config ? "function" == typeof t && t(this.globalData.config) : e.request.get("/api/weshop/store/get/" + e.globalData.setting.stoid, { + this.globalData.config ? "function" == typeof t && t(this.globalData.config) : e.requestGet("/api/weshop/store/get/" + e.globalData.setting.stoid, { success: function(o) { console.log('getConfig'); if(o.data.code==0){ @@ -523,6 +524,7 @@ App({ //-------获取购物车数量---------- requestCardNum: function(th) { if(!this.globalData.user_id) return false; + var that=this; this.request.get("/api/weshop/cart/page", { isShoeLoading:false, data: { @@ -538,14 +540,30 @@ App({ num += e.data.data.pageData[i].goods_num; } } - getApp().globalData.cartGoodsNum=num; + /*--- wx.setTabBarBadge({ //tabbar右上角添加文本 index: 2, ////tabbar下标 text: '' + num //显示的内容 });--*/ - th.getTabBar().setData({cartGoodsNum:num}); - th.data.up_dating = 0 + + //-- 读取服务卡的数量 -- + that.promiseGet("/api/weshop/cartService/page",{ + data:{ + store_id: that.globalData.setting.stoid, + user_id: that.globalData.user_id, + } + }).then(res=>{ + + for (var i = 0; i < res.data.data.pageData.length; i++) { + num += res.data.data.pageData[i].goods_num; + } + + that.globalData.cartGoodsNum=num; + th.data.up_dating = 0 + th.getTabBar().setData({cartGoodsNum:num}); + }) + } }); }, @@ -660,6 +678,27 @@ App({ }) }) }, + + + //---promise的使用get---- + requestGet:function(url,data){ + if(url.indexOf("http")==-1) url=this.globalData.setting.url +url; + data.isShowLoading && wx.showLoading(); + wx.request({ + url, + method: 'GET', + header: {"content-type": "application/x-www-form-urlencoded" }, + data:data.data, + success(res) { + data.isShowLoading && wx.hideLoading(); + data.success(res); + }, + fail(err) { + data.isShowLoading && wx.hideLoading(); + if(data.fail) data.fail(err); + } + }) + }, // 判断是否登录 diff --git a/app.json b/app.json index 1a93be2..2a3e288 100644 --- a/app.json +++ b/app.json @@ -19,8 +19,7 @@ "pages/user/coupon/coupon", "pages/user/checkcoupon/checkcoupon", "pages/user/add_address/add_address", - "pages/user/withdrawals_list/withdrawals_list", - "pages/user/add_comment/add_comment", + "pages/user/withdrawals_list/withdrawals_list", "pages/user/return_goods_info/return_goods_info", "pages/user/return_goods/return_goods", "pages/user/withdrawals/withdrawals", @@ -50,8 +49,7 @@ "pages/user/integral/msg/msg", "pages/user/userqy/userqy", "pages/user/user_spsy/user_spsy", - "pages/user/user_fw/user_fw", - "pages/user/user_coupon/user_coupon", + "pages/user/user_fw/user_fw", "pages/user/grow_value/grow_value", "pages/payment/pay_success/pay_success", "pages/user/plus/plus", @@ -66,10 +64,8 @@ "pages/user/my_service/tment_eval", "pages/user/my_service/tment_order_list", "pages/user/my_service/beauty_deta", - "pages/user/labels/labels", - "pages/user/view_comment/view_comment", - "pages/giftpack/birthdaygift/birthdaygift", - "pages/user/comment/comment", + "pages/user/labels/labels", + "pages/giftpack/birthdaygift/birthdaygift", "pages/giftpack/evaluategift/evaluategift", "pages/giftpack/newvipgift/newvipgift", "pages/giftpack/payment/payment", @@ -88,7 +84,6 @@ "pages/cart/cart2_inte/cart2_inte", "pages/giftpack/festival/festival", "pages/team/team_more/team_more", - "pages/user/collect_list/collect_list", "pages/user/deposit/deposit", "pages/user/deposit/prepaid/msg/msg", "pages/user/deposit/prepaid/prepaid", @@ -96,7 +91,7 @@ ], "plugins": { "live-player-plugin": { - "version": "1.2.5", + "version": "1.3.0", "provider": "wx2b03c6e691cd7370" } }, @@ -109,42 +104,62 @@ "pages/quan_pro/quan_pro", "pages/liveStream/liveStream", "pages/liveStreamDetails/liveStreamDetails", - "pages/addCustomer/addCustomer", - "pages/goods_share/goods_share", - "pages/activity_share/activity_share", - "pages/live_share/live_share", - "pages/quan/quan", - "pages/chongzhi/chongzhi", - "pages/chongzhiDetails/chongzhiDetails", - "pages/jfbuy/jfbuy", - "pages/hongBao/hongBao", - "pages/hongBaoDetails/hongBaoDetails", - "pages/service_record/service_record", - "pages/checkin/checkin", - "pages/distribution/myteam/myteam", - "pages/distribution/order/order", - "pages/distribution/commision/commision", - "pages/distribution/rank/rank", - "pages/distribution/card/card", - "pages/distribution/goods/goods", - "pages/distribution/shop/shop", - "pages/distribution/rookie/rookie", - "pages/service_share/service_share", - "pages/cardList/cardList", - "pages/goodsInfo/goodsInfo", - "pages/my_service/appment_main", - "pages/my_service/i_service", - "pages/my_service/cosmetology_list", - "pages/my_service/hist_service", - "pages/my_service/tment_details", - "pages/my_service/tment_eval", - "pages/my_service/tment_order_list", - "pages/my_service/beauty_deta", - "pages/profile/profile", - "pages/parseHtml/parseHtml" + "pages/addCustomer/addCustomer", + "pages/goods_share/goods_share", + "pages/activity_share/activity_share", + "pages/live_share/live_share", + "pages/quan/quan", + "pages/chongzhi/chongzhi", + "pages/chongzhiDetails/chongzhiDetails", + "pages/jfbuy/jfbuy", + "pages/hongBao/hongBao", + "pages/hongBaoDetails/hongBaoDetails", + "pages/service_record/service_record", + "pages/checkin/checkin", + "pages/distribution/myteam/myteam", + "pages/distribution/order/order", + "pages/distribution/commision/commision", + "pages/distribution/rank/rank", + "pages/distribution/card/card", + "pages/distribution/goods/goods", + "pages/distribution/shop/shop", + "pages/distribution/rookie/rookie", + "pages/service_share/service_share", + "pages/cardList/cardList", + "pages/goodsInfo/goodsInfo", + "pages/my_service/appment_main", + "pages/my_service/i_service", + "pages/my_service/cosmetology_list", + "pages/my_service/hist_service", + "pages/my_service/tment_details", + "pages/my_service/tment_eval", + "pages/my_service/tment_order_list", + "pages/my_service/beauty_deta", + "pages/my_service2/appment_main", + "pages/profile/profile", + "pages/parseHtml/parseHtml", + "pages/myGift/myGift", + "pages/myGiftDetails/myGiftDetails", + "pages/cart2_ser/cart2_ser", + "pages/libao_payment/payment" ] - }], + }, + { + "root": "packageB/", + "name":"pack2", + "pages": [ + "pages/user/collect_list/collect_list", + "pages/user/comment/comment", + "pages/user/view_comment/view_comment", + "pages/user/add_comment/add_comment", + "pages/user/user_coupon/user_coupon", + "pages/user/buyDetails/buyDetails" + ] + +} + +], "permission": { "scope.userLocation": { "desc": "获取你的位置信息" diff --git a/app.wxss b/app.wxss index 775e097..552eb48 100644 --- a/app.wxss +++ b/app.wxss @@ -50,6 +50,11 @@ .pdr40 { padding-right: 40rpx; } + +.pdr80 { + padding-right: 80rpx; +} + .pdh10 { padding-left: 10rpx; padding-right: 10rpx; @@ -58,9 +63,13 @@ padding-left: 20rpx; padding-right: 20rpx; } +.pdv10 { + padding-top: 10rpx; + padding-bottom: 10rpx; +} .pdv20 { - padding-top: 30rpx; - padding-bottom: 30rpx; + padding-top: 20rpx; + padding-bottom: 20rpx; } .pdv30 { padding-top: 30rpx; @@ -132,6 +141,10 @@ background-color: #f0f0f0; } +.bg-f8 { + background-color: #f8f8f8; +} + .pr { position: relative; } @@ -140,6 +153,14 @@ font-weight: bold; } +.mgl10 { + margin-left: 10rpx; +} + +.mgb10 { + margin-bottom: 10rpx; +} + .mgl20 { margin-left: 20rpx; } @@ -604,7 +625,7 @@ background: #ffe3e2; font-size: 38rpx; } .fs40 { - font-size: 40rpx; + font-size: 40rpx !important; } .ai_c { align-items: center; @@ -635,6 +656,10 @@ background: #ffe3e2; line-height: 1; } +.lh { + line-height: 1.4; +} + @@ -645,13 +670,10 @@ background: #ffe3e2; /* 图标字体(ty) */ @font-face { - font-family: 'iconfont'; /* project id 2054717 */ - src: url('//at.alicdn.com/t/font_2054717_uapbrzlc8k.eot'); - src: url('//at.alicdn.com/t/font_2054717_uapbrzlc8k.eot?#iefix') format('embedded-opentype'), - url('//at.alicdn.com/t/font_2054717_uapbrzlc8k.woff2') format('woff2'), - url('//at.alicdn.com/t/font_2054717_uapbrzlc8k.woff') format('woff'), - url('//at.alicdn.com/t/font_2054717_uapbrzlc8k.ttf') format('truetype'), - url('//at.alicdn.com/t/font_2054717_uapbrzlc8k.svg#iconfont') format('svg'); + font-family: 'iconfont'; /* Project id 2054717 */ + src: url('//at.alicdn.com/t/font_2054717_f0lv6m3iryg.woff2?t=1621240949872') format('woff2'), + url('//at.alicdn.com/t/font_2054717_f0lv6m3iryg.woff?t=1621240949872') format('woff'), + url('//at.alicdn.com/t/font_2054717_f0lv6m3iryg.ttf?t=1621240949872') format('truetype'); } .iconfont { @@ -662,6 +684,14 @@ background: #ffe3e2; -moz-osx-font-smoothing: grayscale; } +.icon-sandian:before { + content: "\e665"; +} + +.icon-meirong:before { + content: "\e60e"; +} + .icon-yuanquan:before { content: "\e60d"; } diff --git a/components/diy_goodsGroup/diy_goodsGroup.js b/components/diy_goodsGroup/diy_goodsGroup.js index 785e8fe..7ac451a 100644 --- a/components/diy_goodsGroup/diy_goodsGroup.js +++ b/components/diy_goodsGroup/diy_goodsGroup.js @@ -101,16 +101,13 @@ Component({ } this.data.requestData = new Array(); - if(nav_item && nav_item.data) - { - this.data.g_id = nav_item.data; - var arr = []; - for (var i = 0; i < this.data.g_id.length; i += this.data.goodscount) { - arr.push(this.data.g_id.slice(i, i + this.data.goodscount)); - } - this.data.firist_type_data = arr; - } + this.data.g_id = nav_item.data; + var arr = []; + for (var i = 0; i < this.data.g_id.length; i += this.data.goodscount) { + arr.push(this.data.g_id.slice(i, i + this.data.goodscount)); + } + this.data.firist_type_data = arr; this.init(this.data.classstyle_id, this.data.wgroup); }, detached: function() { @@ -130,11 +127,12 @@ Component({ // 这里是一个自定义方法 init:async function (classstyle_id, wgroup) { - this.setData({classstyle_id:classstyle_id}) + this.setData({classstyle_id:classstyle_id}) + var th = this; var g_id = this.data.g_id; - var len=this.data.firist_type_data?this.data.firist_type_data.length:0; - if (classstyle_id == 1 && this.data.firist_type_data) { + var len=this.data.firist_type_data.length; + if (classstyle_id == 1) { //---手动选择的时候--- g_id = this.data.firist_type_data[th.data.firist_type_curr]; th.data.firist_type_curr++; diff --git a/components/diy_goodsGroup/diy_goodsGroup.wxml b/components/diy_goodsGroup/diy_goodsGroup.wxml index e57fa8c..4d6aede 100644 --- a/components/diy_goodsGroup/diy_goodsGroup.wxml +++ b/components/diy_goodsGroup/diy_goodsGroup.wxml @@ -624,11 +624,12 @@ - - + + - - + + { + //判断是不是有全屏广告 + if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0){ + th.setData({ + is_full_screen_show:1, + full_ad:res.data.data.pageData[0], + }) + //--定时关闭-- + th.data.full_screen=setInterval(function(){ + if(!th.data.sec_show) { + clearInterval(th.data.full_screen); + th.close_full_screen(); + return false; + } + th.data.sec_show--; + th.setData({sec_show:th.data.sec_show}); + },1000) + + } + }) + } + }, + +}) \ No newline at end of file diff --git a/components/full_screen/full_screen.json b/components/full_screen/full_screen.json new file mode 100644 index 0000000..a88fc2f --- /dev/null +++ b/components/full_screen/full_screen.json @@ -0,0 +1,4 @@ +{ + "component": true, + "usingComponents": {} +} \ No newline at end of file diff --git a/components/full_screen/full_screen.wxml b/components/full_screen/full_screen.wxml new file mode 100644 index 0000000..ce01065 --- /dev/null +++ b/components/full_screen/full_screen.wxml @@ -0,0 +1,7 @@ + + + 跳过 {{sec_show}} + + + + diff --git a/components/full_screen/full_screen.wxss b/components/full_screen/full_screen.wxss new file mode 100644 index 0000000..f5220b9 --- /dev/null +++ b/components/full_screen/full_screen.wxss @@ -0,0 +1,16 @@ +.full_screen{ + position: fixed;left: 0;top: 0; + z-index: 1000000000000; + background-color: rgba(0,0,0,0.4); + width: 100%; + height: 100%; + background-position: center; + background-size: 100% 100%; + background-repeat: no-repeat; +} +.skip_box{ + float: right; margin-top: 10rpx; margin-right: 10rpx; + background-color: gainsboro; width: 120rpx; + height: 48rpx; font-size: 28rpx; line-height: 48rpx; + text-align: center; border-radius: 20rpx; + } \ No newline at end of file diff --git a/components/qr_code/qr_code.wxss b/components/qr_code/qr_code.wxss index 50d62ba..084783b 100644 --- a/components/qr_code/qr_code.wxss +++ b/components/qr_code/qr_code.wxss @@ -57,10 +57,11 @@ left: 0rpx; .barcode { height:150rpx; width: 620rpx; - text-align:center; position:absolute; - left: 30rpx + left: 30rpx; + top: -6rpx; + } canvas{ width:100%; @@ -83,6 +84,7 @@ display:flex; flex-direction:column; position: absolute; left: 75rpx; +top: 5rpx; } .qrcode{ diff --git a/packageA/pages/cardList/cardList.wxml b/packageA/pages/cardList/cardList.wxml index a836617..efb3a19 100644 --- a/packageA/pages/cardList/cardList.wxml +++ b/packageA/pages/cardList/cardList.wxml @@ -10,13 +10,13 @@ {{item.serviceName}} - 有效天数：{{item.validDays?item.validDays:'不限'}} + 有效天数：{{item.validDays?item.validDays:0}} {{item.money}} @@ -36,7 +36,7 @@ style="margin-bottom: 20rpx;"> + src="{{imghost}}{{item.imgUrl && item.imgUrl!=''?item.imgUrl:'/miniapp/images/default_g_img.gif'}}" mode="aspectFill"/> {{item.serviceName}} @@ -58,11 +58,9 @@ - - - - - + + + diff --git a/packageA/pages/cart2_ser/cart2_ser.js b/packageA/pages/cart2_ser/cart2_ser.js index fb3c9e9..bc24789 100644 --- a/packageA/pages/cart2_ser/cart2_ser.js +++ b/packageA/pages/cart2_ser/cart2_ser.js @@ -38,8 +38,8 @@ Page({ bn_pickname: "", //选择的门店名称 /*------------------------*/ - //判断页面是返回回来的还是 首次进入的 yuer:0, + is_cart:0, //是不是购物车进来的购买 }, onLoad: function(t) { wx.setNavigationBarTitle({ @@ -48,7 +48,11 @@ Page({ var appD=getApp().globalData.service_now; this.data.postdata=appD; - this.data.param=t; + this.data.param=t; + if(t.is_cart){ + this.setData({is_cart:1}); + } + var th=this; getApp().promiseGet("/api/wx/weappSendlist/page", { @@ -71,7 +75,6 @@ Page({ to.auth.get_u(func); }, - //----------------展示页面,是再获取用户信息之后-------------- show_page:function(){ var th=this; @@ -84,7 +87,15 @@ Page({ getApp().globalData.userInfo = e.data.data; th.setData({userinfo:e.data.data}); //获取立即购买的商品信息 - th.get_buy_goods(); + if(th.data.is_cart){ + //读取门店 + to.get_allsto(function (e) { + th.setData({ allsto: e }); + th.get_cart(); + }) + }else{ + th.get_buy_goods(); + } //获取提现金额 getApp().request.get("/api/weshop/withdrawals/summoney", { @@ -101,6 +112,75 @@ Page({ }); }, + //-----获取购物车,入口-------- + get_cart: function () { + var th = this,app=getApp(); + a.get("/api/weshop/cartService/page", { + data: { + user_id: to.globalData.user_id, selected:1, + store_id: oo.stoid, pageSize: 600 }, + success:async function (su) { + //按门店分类的数组 + var arr = new Array(); + var carr = su.data.data.pageData; + th.data.cartlist_y = carr; //存储原始购物车列表 + + //---是不是购买等级卡成功的返回---等级卡显示的判断--- + var is_card_back=getApp().globalData.is_card_back; + + + //在分组的时候，就不要再调用接口，await + for (var i = 0; i < carr.length; i++) { + var good=null; + var item = carr[i]; + await getApp().request.promiseGet("/api/weshop/serviceCard/get/" + oo.stoid + "/" + item.service_id, {}).then(res => { + good = res.data.data; + }) + + item.img_url = oo.imghost + good.imgUrl; + item.erpItemID=good.erpItemID; + + /*----接口要弄出来的，先顶着-----*/ + var pcid = item.pick_id; + var find = 0; + //----如果有就加进去，没有就新增一个---- + //-----------循环查找门店------------- + if (arr.length > 0) { + for (var j = 0; j < arr.length; j++) { + if (arr[j].pickup_id == pcid) { + arr[j].goods.push(item); + find = 1;break; + } + } + } + //------如果没有找到----- + if (find == 0) { + var pikname = '',sto=null; + //----找到门店名称----- + for (var k = 0; k < th.data.allsto.length; k++) { + if (pcid == th.data.allsto[k].pickup_id) { + pikname = th.data.allsto[k].pickup_name; sto = th.data.allsto[k]; break; + } + } + var narr = new Array(); narr.push(item); + var ie = { + pickup_id: pcid, pname: pikname, goods: narr,keyid:sto.keyid, + goods_price: 0, shipping_price: 0, user_money: 0, total_amount: 0, order_amount: 0}; + arr.push(ie); + + } + } + + //深拷贝 + th.data.old_cartlist= JSON.parse(JSON.stringify(arr)); + th.setData({ + cartlist: arr, + }); + th.calculatePrice(); + } + }); + }, + //-----获取立即购买的商品信息---- get_buy_goods: function (){ var th=this,a=getApp().request; @@ -147,7 +227,117 @@ Page({ invoiceToggle: !this.data.invoiceToggle }); }, - + + + //-------------------计算购物车订单价格------------------- + calculatePrice: function() { + var th = this; + to.getConfig2(async function(ee){ + wx.showLoading({ + title:"处理中." + }) + var all_price=0; //所有的商品总价 + var all_shipping_m= 0; //所有的物流总价 + var all_total_m = 0; //所有的订单应付总价 + var all_order_m = 0; //所有的订单应付总价 + var all_user_m=0; //所有的订单用户使用金额 + var all_coupon_price_m=0; //所有的订单用户使用优惠券价格 + var all_cutprice=0; //所有的优惠减件 + var all_order_prom=0; //所有的订单优惠 + + var umoney = th.data.userinfo.user_money - th.data.txmon - (th.data.userinfo.frozen_money?th.data.userinfo.frozen_money:0); + var freight_free = ee.freight_free; //全场满多少包邮 + var no_ex_id=ee.no_ex_id; + var no_ex_good=null; + var by_qc={}; + var c_arr=JSON.parse(JSON.stringify(th.data.old_cartlist)); + + //---循环购物车--- + for(var i in c_arr){ + + var cart_item=c_arr[i]; //就是每一单的意思 + var pickid=cart_item.pickup_id; + var o_price=0; + var o_shipping_price=0,goods_weight=-1, goods_piece=-1; + var item=c_arr[i].goods; //就是每一单的从表的意思 + + //---如果有选择优惠券的情况下--- + var quan_price=0; + var coupon_price=0; + var quan_no= null; + + //--------循环计算总价----------- + for(var j=0;j cart_item.order_amount) { + cart_item.user_money = cart_item.order_amount; + umoney = umoney - cart_item.order_amount; + }else { + cart_item.user_money = umoney; + umoney=0; + } + + }else{ + //--------------如果使用余额,购物车购买--------------------- + if (th.data.js_use_money == 1) { + if (umoney > cart_item.order_amount) { + cart_item.user_money = cart_item.order_amount; + umoney = umoney - cart_item.order_amount; + }else { + cart_item.user_money = umoney; + umoney=0; + } + }else{ + cart_item.user_money=0; + } + } + all_price += parseFloat(f_o_price); + all_total_m += parseFloat(cart_item.total_amount); + all_shipping_m += parseFloat(cart_item.shipping_price); + all_order_m += parseFloat(cart_item.order_amount); + } + + + all_total_m = parseFloat(all_total_m).toFixed(2); + all_order_m = parseFloat(all_order_m).toFixed(2); + all_price = parseFloat(all_price).toFixed(2); + all_total_m = parseFloat(all_total_m).toFixed(2); + + var atxt = "formData.total_amount"; + var atxt1 = "formData.order_amount"; + var atxt2 = "formData.all_price"; + + th.setData({ [atxt]: all_total_m, [atxt1]: all_order_m, + [atxt2]: all_price,show_submit:1 + }) + th.data.order_prom_list_cart=c_arr; + wx.hideLoading(); + }); + }, //---------计算立即购买---------- calculatePrice2: function () { @@ -186,38 +376,73 @@ Page({ if(this.data.is_summit_ing==1) return false; //--提交中退出-- this.data.is_summit_ing=1; var th=this,pdata=new Array(); - var ff=true; + var item={ - 'user_id': to.globalData.user_id, - 'account': th.data.formData.order_amount, //使用余额 - 'store_id':oo.stoid, //商家 - 'list':new Array(), - }; - var gg = getApp().globalData.service_now; - var goods={ - 'card_id': th.data.bn_goods.id, - 'itemid': th.data.bn_goods.erpItemID, - 'qty': gg.goods_num, - 'price': th.data.formData.order_amount, - 'pickup_id':gg.pick_id, - 'pickup_keyid':gg.keyid, - }; - - //--导购分享过来的id-- - if(gg.guide_id){ - goods.guide_id=gg.guide_id; - goods.guide_type=gg.guide_type; - //调用接口判断是不是会员 - await getApp().request.promiseGet("/api/weshop/shoppingGuide/getId/"+oo.stoid+"/"+gg.guide_id,{}).then(res=>{ - if(res.data.code==0){ - goods.guide_name=res.data.data.salesman; - goods.guide_sn=res.data.data.salesman_no; - } - }) + 'user_id': to.globalData.user_id, + 'account': th.data.formData.order_amount, //使用余额 + 'store_id':oo.stoid, //商家 + 'list':new Array(), + }; + + //判断是不是购物车购买还是立即购买 + if(this.data.is_cart){ + var list= th.data.cartlist; + for(var i in list){ + var gglist = list[i].goods; + for(var j in gglist){ + var gg=gglist[j]; + var goods={ + 'card_id': gg.service_id, + 'itemid': gg.erpItemID, + 'qty': gg.goods_num, + 'price': gg.money, + 'pickup_id':gg.pick_id, + 'pickup_keyid':list[i].keyid, + }; + //--导购分享过来的id-- + if(gg.guide_id){ + goods.guide_id=gg.guide_id; + goods.guide_type=gg.guide_type; + //调用接口判断是不是会员 + await getApp().request.promiseGet("/api/weshop/shoppingGuide/getId/"+oo.stoid+"/"+gg.guide_id,{}).then(res=>{ + if(res.data.code==0){ + goods.guide_name=res.data.data.salesman; + goods.guide_sn=res.data.data.salesman_no; + } + }) + } + item.list.push(goods); + } + } + }else{ + + var gg = getApp().globalData.service_now; + var goods={ + 'card_id': th.data.bn_goods.id, + 'itemid': th.data.bn_goods.erpItemID, + 'qty': gg.goods_num, + 'price': th.data.formData.order_amount, + 'pickup_id':gg.pick_id, + 'pickup_keyid':gg.keyid, + }; + + //--导购分享过来的id-- + if(gg.guide_id){ + goods.guide_id=gg.guide_id; + goods.guide_type=gg.guide_type; + //调用接口判断是不是会员 + await getApp().request.promiseGet("/api/weshop/shoppingGuide/getId/"+oo.stoid+"/"+gg.guide_id,{}).then(res=>{ + if(res.data.code==0){ + goods.guide_name=res.data.data.salesman; + goods.guide_sn=res.data.data.salesman_no; + } + }) + } + item.list.push(goods); } - item.list.push(goods); + + pdata=item; - var str = JSON.stringify(pdata); console.log("支付数据"); console.log(str); @@ -236,7 +461,13 @@ Page({ if (res.statusCode == 200) { var data=res.data; if(data.code==0){ - + if(th.data.is_cart){ + var list = th.data.cartlist_y; + for (var i = 0; i < list.length; i++) { + //删除购物车 + a.delete("/api/weshop/cartService/del/" + oo.stoid + "/" + list[i].id, {}); + } + } var order_amount = pdata.account; //要进行判断，如果是用微信支付，就要跳转到支付界面 if (order_amount > 0) { @@ -254,7 +485,7 @@ Page({ getApp().showWarning("购买成功"); setTimeout(function () { wx.reLaunch({ - url: "/packageA/pages/cardList/cardList", + url: "/pages/user/my_service/i_service", }) },1000) }, function () { diff --git a/packageA/pages/cart2_ser/cart2_ser.wxml b/packageA/pages/cart2_ser/cart2_ser.wxml index 4fe080a..45890cd 100644 --- a/packageA/pages/cart2_ser/cart2_ser.wxml +++ b/packageA/pages/cart2_ser/cart2_ser.wxml @@ -1,9 +1,36 @@
- + + + + + + + + {{item.pname}} + + + + + + + + + + {{items.service_name}} + + + ￥{{filters.toFix(items.money,2)}} + x{{items.goods_num}} + + + + + + - + {{bn_pickname}} @@ -24,14 +51,12 @@ - - + + + + + + diff --git a/packageA/pages/goodsInfo/goodsInfo.js b/packageA/pages/goodsInfo/goodsInfo.js index 8233b89..6d796be 100644 --- a/packageA/pages/goodsInfo/goodsInfo.js +++ b/packageA/pages/goodsInfo/goodsInfo.js @@ -400,8 +400,9 @@ Page({ 'data.goods_id': t.data.data.id, 'data.id': t.data.data.id, 'data.sales_sum': t.data.data.sales_sum, - 'data.storageId':t.data.data.storageId - }); + 'data.storageId':t.data.data.storageId, + 'data.service_sn':t.data.data.serviceSn, + }); //-----商品详情--- @@ -522,9 +523,77 @@ Page({ newd['pick_name'] = th.data.sto_sele_name; newd['guide_id'] = getApp().globalData.guide_id; newd['guide_type']=0; - th.buyNow(newd); - } + }else{ + + var newd = { + service_id: th.data.data.id, + service_sn:th.data.data.service_sn, + service_name:th.data.data.goods_name, + goods_num: th.data.goodsInputNum, + pick_id: th.data.sto_sele_id, + user_id:oo.user_id, + store_id:os.stoid, + money:th.data.data.shop_price + }; + if(getApp().globalData.guide_id){ + newd['guide_id'] = getApp().globalData.guide_id; + newd['guide_type']=0; + } + + //----先看会员在购物车中是否加入了该商品----- + getApp().request.get("/api/weshop/cartService/page", { + data: { + store_id: os.stoid, + user_id: oo.user_id, + service_id: th.data.data.id, + pick_id: th.data.sto_sele_id, + }, + success: function(re) { + + //-------如果购物车中有相关的数据--------- + if (re.data.data.total > 0) { + var item = re.data.data.pageData[0]; + var updata = { + id: item.id, + goods_num: th.data.goodsInputNum + item.goods_num, + money: th.data.data.shop_price, + store_id: os.stoid, + }; + + if (getApp().globalData.guide_id) { + updata['guide_id'] = getApp().globalData.guide_id; + updata['guide_type'] = 1; + } + getApp().request.put("/api/weshop/cartService/update", { + data: updata, + success: function(t) { + getApp().my_warnning('加入购物车成功', 1, th, 450); + var c_num = th.data.cartGoodsNum + th.data.goodsInputNum; + th.setData({ + cartGoodsNum: c_num + }); + th.closeSpecModal(); + } + }); + } else { + + getApp().request.post("/api/weshop/cartService/save", { + data: newd, + success: function(t) { + getApp().my_warnning('加入购物车成功', 1, th, 450); + var c_num = th.data.cartGoodsNum + th.data.goodsInputNum; + th.setData({ + cartGoodsNum: c_num + }); + th.closeSpecModal(); + } + }); + } + } + }); + + } }, @@ -682,9 +751,26 @@ Page({ for (var i = 0; i < e.data.data.pageData.length; i++) { num += e.data.data.pageData[i].goods_num; } + + /*-- t.setData({ cartGoodsNum: num - }); + });--*/ + + //-- 读取服务卡的数量 -- + getApp().promiseGet("/api/weshop/cartService/page",{ + data:{ + store_id: s.globalData.setting.stoid, + user_id: s.globalData.user_id, + } + }).then(res=>{ + for (var i = 0; i < res.data.data.pageData.length; i++) { + num += res.data.data.pageData[i].goods_num; + } + t.setData({cartGoodsNum:num}); + }) + + } }); }, diff --git a/packageA/pages/goodsInfo/goodsInfo.wxml b/packageA/pages/goodsInfo/goodsInfo.wxml index 5488444..fe21a4e 100644 --- a/packageA/pages/goodsInfo/goodsInfo.wxml +++ b/packageA/pages/goodsInfo/goodsInfo.wxml @@ -76,7 +76,7 @@ (未找到门店) - (该门店无此项目) + (配送不匹配) @@ -160,8 +160,8 @@ - - 立即购买 + 加入购物车 + 立即购买 @@ -211,7 +211,7 @@ (库存不足) - (该门店无此项目) + (配送不匹配) (库存不足) @@ -234,7 +234,7 @@ 该门店无此项目 + style="background-color: #dcdcdc;color: #999;">配送不匹配 diff --git a/packageA/pages/hongBao/hongBao.js b/packageA/pages/hongBao/hongBao.js index b02e4b0..32bd064 100644 --- a/packageA/pages/hongBao/hongBao.js +++ b/packageA/pages/hongBao/hongBao.js @@ -34,9 +34,15 @@ Page({ .then(function(data) { self.data.hongBaoData = data.data.data; self.countDown(); - self.setData({ - storeName: app.globalData.config.store_name - }); + setTimeout(function (){ + if(app.globalData.config && app.globalData.config.store_name){ + self.setData({ + storeName: app.globalData.config.store_name + }); + } + + },1000) + }); }); diff --git a/packageA/pages/libao_payment/payment.js b/packageA/pages/libao_payment/payment.js new file mode 100644 index 0000000..81ca483 --- /dev/null +++ b/packageA/pages/libao_payment/payment.js @@ -0,0 +1,29 @@ +var e = getApp(); +var regeneratorRuntime = require('../../../utils/runtime.js'); +Page({ + /** + * 页面的初始数据 + */ + data: { + url: e.globalData.setting.imghost, + resourceUrl: e.globalData.setting.resourceUrl, + iurl: e.globalData.setting.imghost, + type:0 + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + wx.setNavigationBarTitle({ + title: '支付成功', + }); + this.setData({type:options.type}); + + }, + + goto: function () { + var url = '/pages/index/index/index'; + getApp().goto(url) + }, +}) \ No newline at end of file diff --git a/packageA/pages/libao_payment/payment.json b/packageA/pages/libao_payment/payment.json new file mode 100644 index 0000000..1111654 --- /dev/null +++ b/packageA/pages/libao_payment/payment.json @@ -0,0 +1,4 @@ +{ + "navigationBarTitleText": "支付成功", + "usingComponents": {} +} \ No newline at end of file diff --git a/packageA/pages/libao_payment/payment.wxml b/packageA/pages/libao_payment/payment.wxml new file mode 100644 index 0000000..1833e81 --- /dev/null +++ b/packageA/pages/libao_payment/payment.wxml @@ -0,0 +1,34 @@ + + + + + + + + + + + + 积分兑换成功，点击我的礼包查看！ + 购买成功，点击我的礼包查看！ + + + + + + + + + + + 我的礼包 + + + + + 回到首页 + + + + + \ No newline at end of file diff --git a/packageA/pages/libao_payment/payment.wxss b/packageA/pages/libao_payment/payment.wxss new file mode 100644 index 0000000..bb012f8 --- /dev/null +++ b/packageA/pages/libao_payment/payment.wxss @@ -0,0 +1,63 @@ +page { + border-top: 2rpx solid rgb(245, 245, 245); +} +.line { + border-top: 2rpx solid rgb(245, 245, 245); + width: 700rpx; +} + +.payradio .Success_box { + padding-top: 45rpx; + padding-bottom: 45rpx; +} + +.payradio .Success_box .Success_box_title { + margin-top: 45rpx; + color: rgb(8, 8, 8); +} + +.payradio image { + width: 140rpx; + height: 140rpx; + display: flex; +} + +.payitem_max { + padding: 0rpx 55rpx; + color: rgb(104, 104, 104); + padding-bottom: 30rpx; +} + +.payitem_max .payitem { + margin-top: 30rpx; +} + +.payitem_max .payitem .pay_nam { + width: 200rpx; +} + +.payitem_max .payitem view { + margin-right: 50rpx; +} +.pay_order { + margin-top: 15rpx; + color: rgb(104, 104, 104); + width: 560rpx; + height: 62rpx; + border-radius: 30rpx; + border: 3rpx solid rgb(209, 209, 209); +} + +.pay_home { + margin-top: 35rpx; + color: rgb(255, 255, 255); + width: 566rpx; + height: 68rpx; + border-radius: 30rpx; + background-color: rgb(219, 27, 52); +} +.address{ + width: 470rpx; +} + +.show_title{ margin-top: 90rpx; font-size: 34rpx;} \ No newline at end of file diff --git a/packageA/pages/myGift/myGift.js b/packageA/pages/myGift/myGift.js new file mode 100644 index 0000000..593a01c --- /dev/null +++ b/packageA/pages/myGift/myGift.js @@ -0,0 +1,316 @@ +// packageA//pages/myGift/myGift.js +const app = getApp(); +let self = null; +var os = app.globalData.setting; + +Page({ + + /** + * 页面的初始数据 + */ + data: { + tabArr: ['礼包列表', '我的礼包'], + currentIndex: 0, + + list: null, + isLoading: false, // 检测是否已经发送请求,防止重复发送请求 + noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据 + pageNum: 1, // 当前页数 + }, + + clickTab(e) { + let index = e.target.dataset.index; + let url = ''; + let data = { + store_id: app.globalData.setting.stoid, + user_id: app.globalData.user_id, + }; + + this.setData({ + list: null, + pageNum: 1, + noMore: false, + currentIndex: index, + }); + + if(index == 0) { + url = '/api/weshop/libao/libaoForm/page'; + } else if(index == 1) { + url = '/api/weshop/libao/libaoFormvip/page'; + }; + + this.getData(true, url, data); + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + self = this; + if(options.index){ + this.setData({currentIndex:1}); //查看我的礼包 + } + app.isLogin().then(function(data) {//进入页面前已经授权登录成功 + self.setData({ + userInfo: data, + }); + }); + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () {}, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + if(app.globalData.userInfo) { + if(!this.data.isLogin) { + this.setData({ + userInfo: app.globalData.userInfo, + imghost: app.globalData.setting.imghost, + isLogin: true, + }); + + var index=this.data.currentIndex; + let url = ''; + let data = { + store_id: app.globalData.setting.stoid, + user_id: app.globalData.user_id, + }; + this.setData({ + list: null, + pageNum: 1, + noMore: false, + }); + + if(index == 0) { + url = '/api/weshop/libao/libaoForm/page'; + } else if(index == 1) { + url = '/api/weshop/libao/libaoFormvip/page'; + }; + + this.getData(true, url, data); + }; + }; + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + this.scrollToLower('/api/weshop/libao/libaoFormvip/page', { + store_id: app.globalData.setting.stoid, + user_id: app.globalData.user_id, + }); + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + }, + + /** + * 请求数据 + */ + getData: function(isInit, url, data) { + app.request.promiseGet(url, { + data: data, + isShowLoading: true, + }) + .then(function(res) { + if(res.data.code == 0) { + + self.setData({ + isLoading: false + }); + + if(isInit) {// 第一次加载 + self.setData({ + list: res.data.data + }); + } else { + self.setData({ + 'list.pageData': self.data.list.pageData.concat(res.data.data.pageData) + }); + }; + + if((res.data.data.pageData.length == 0) || (res.data.data.pageSize * res.data.data.page >= res.data.data.total)) { + self.setData({ + noMore: true + }); + }; + + } else { + self.setData({ + 'list.pageData': [] + }); + }; + + }) + .catch(function(err) { + console.log('出错拉！！！！',err); + self.setData({ + 'list.pageData': [] + }); + }); + }, + + + /** + * 上拉加载 + */ + scrollToLower(url, requestData) { + // 数据总量 + let total = this.data.list.total; + // 单页最大数据量 + let pageSize = this.data.list.pageSize; + // 如果数据总量不为0且小于或等于单页最大数据量，说明数据已全部加载，显示‘没有更多了’ + if((total != 0)&&(total <= pageSize)) { + this.setData({ + noMore: true + }); + }; + + if(!this.data.isLoading && !this.data.noMore) { + this.setData({ + isLoading: true, + pageNum: this.data.pageNum + 1 + }); + requestData.page = this.data.pageNum; + this.getData(false, url, requestData); + }; + }, + + /** + * 点击跳转 + */ + goto(e) { + let url = ''; + if(e.target.dataset.url) { + url = e.target.dataset.url; + } else { + url = e.currentTarget.dataset.url; + } + app.goto(url); + }, + + + //-- 礼包购买 -- + GetBuyPrice: function(e) { + var th = this,that=th; + var index=e.currentTarget.dataset.index; + var item=that.data.list.pageData[index]; + + var id = item.id; //活动id + var my_confirm = th.selectComponent("#my_confirm"); //组件的id + var user=getApp().globalData.userInfo; + + my_confirm.open( + "是否确定购买该礼包", + "取消", + "确定", + function() { + my_confirm.open_cancel(0); + }, + function() { + my_confirm.open_cancel(0); + var json = { + "lbid": id, //活动Id + "paytype": 2, //1=积分兑换 2=购买 + "store_id": os.stoid, //商家Id + "user_id": user.user_id, //用户ID + }; + var url = "/api/weshop/libao/libaoFormvip/libaoOrder"; + getApp().request.post(url, + { + data:json, + success:function(res) { + if (res.data.code == 0 && res.data.data) { + res = res.data.data; + wx.requestPayment({ + timeStamp: String(res.timeStamp), + nonceStr: res.nonceStr, + package: res.packageValue, + signType: res.signType, + paySign: res.paySign, + success: function(res) { + getApp().my_warnning("支付成功", 1, th); + }, + fail: function(res) { + getApp().my_warnning("取消支付", 0, th); + } + }); + } else { + getApp().my_warnning(res.data.msg, 0, th); + } + } + }) + }) + }, + + //-- 积分兑换 -- + GetBuyIntegral: function(e) { + var th = this,that=th; + var index=e.currentTarget.dataset.index; + var item=that.data.list.pageData[index]; + + var id = item.id; //活动id + var my_confirm = th.selectComponent("#my_confirm"); //组件的id + var user=getApp().globalData.userInfo; + my_confirm.open( + "是否确定兑换该礼包", + "取消", + "确定", + function() { + my_confirm.open_cancel(0); + }, + function() { + my_confirm.open_cancel(0); + var json = { + "lbid": id, //活动Id + "paytype": 1, //1=积分兑换 2=购买 + "store_id": os.stoid, //商家Id + "user_id": user.user_id, //用户ID + }; + var url = "/api/weshop/libao/libaoFormvip/libaoOrder"; + getApp().request.post(url,{ + data:json, + success:function(res) { + if (res.data.code == 0) { + getApp().my_warnning("兑换成功！", 1, th); + } else { + getApp().my_warnning(res.data.msg, 0, th); + } + }, + }) + + }) + }, + +}) \ No newline at end of file diff --git a/packageA/pages/myGift/myGift.json b/packageA/pages/myGift/myGift.json new file mode 100644 index 0000000..c52f0b2 --- /dev/null +++ b/packageA/pages/myGift/myGift.json @@ -0,0 +1,10 @@ +{ + "navigationBarTitleText": "我的礼包", + "enablePullDownRefresh": false, + "usingComponents": { + "warn": "/components/long_warn/long_warn", + "nav_b": "/components/nav_b/nav_b", + "my_confirm": "/components/my_confirm/my_confirm", + "nodata": "/components/nodata/nodata" + } +} \ No newline at end of file diff --git a/packageA/pages/myGift/myGift.wxml b/packageA/pages/myGift/myGift.wxml new file mode 100644 index 0000000..4912c01 --- /dev/null +++ b/packageA/pages/myGift/myGift.wxml @@ -0,0 +1,58 @@ + + + + {{item}} + + + + + + + + + + {{item.lbtitle}} + + + + {{item.lbprice}}/{{item.lbintegral}}积分 + 零售价{{item.oldprice}} + + 已售{{item.salenum}}件 + + + 活动截止日期 {{filter.format_time(item.expdate)}} + + + + + 立即兑换 + 立即购买 + + + + + + + + + + + {{item.lbtitle}} + + 活动截止日期 {{filter.format_time(item.endtime)}} + + + *请到线下门店兑换 + + + + + + + + + + + + diff --git a/packageA/pages/myGift/myGift.wxss b/packageA/pages/myGift/myGift.wxss new file mode 100644 index 0000000..72f8959 --- /dev/null +++ b/packageA/pages/myGift/myGift.wxss @@ -0,0 +1,166 @@ +@charset "utf-8"; + +.c-a4 { + color: #a4a4a4; +} + +.c-red { + color: #FF6768; +} + +.h88 { + height: 88rpx; +} + + +page { + background-color: #f0f0f0; +} + +.tab-title { + display: flex; + position: sticky; + background-color: white; + top: 0; + font-size: 30rpx; + z-index: 999; +} + +.tab-title::after { + position: absolute; + content: ''; + width: 2rpx; + height: 40%; + background-color: #f0f0f0; + top: 0; + bottom: 0; + left: 0; + right: 0; + margin: auto; +} + +.tab-title-item { + flex: 1; + text-align: center; + padding-top: 20rpx; + padding-bottom: 20rpx; + position: relative; +} + +.tab-title-item.active { + color: #FF6768; + font-weight: bold; + +} + +.tab-title-item::after { + position: absolute; + content: ''; + left: 100%; + bottom: 0; + width: 0; + border-bottom: 2rpx solid #FF6768; + /* height: 3rpx; */ + transition: 0.2s all linear; +} + +.tab-title-item.active::after { + /* left: 100%; */ + width: 100%; + left: 0; + /* background-color: #FF6768; */ + /* transition-delay: 0.1s; */ +} + +.tab-title-item.active ~ .tab-title-item::after { + /* width: 100%; */ + left: 0; +} + +.tab-content { + padding-top: 20rpx; + padding-left: 20rpx; + padding-right: 20rpx; +} + +.tab-item { + background-color: white; + border-radius: 10rpx; + overflow: hidden; +} + +.tab-item ~ .tab-item { + margin-top: 20rpx; +} + +.img-container { + background-color: #dedede; + /* height: 300rpx; */ +} + +.img-container2 { + width: 200rpx; + height: 200rpx; + background-color: #dedede; + margin-right: 20rpx; + flex-shrink: 0; + display: flex; + align-items: center; + position: relative; +} + +.img-container2.error::before { + font-family: iconfont; + position: absolute; + content: '\e8c1'; +} + +.img { + display: block; + width: 100%; + height: 100%; +} + +.desc-container { + padding: 20rpx; +} + + + +.rmb::before { + content: '￥'; +} + +.date { + color: #a4a4a4; + font-size: 24rpx; +} + +.btn-container { + display: flex; + justify-content: space-around; + font-size: 26rpx; +} + +.btn { + padding: 20rpx; + flex: 1; + text-align: center; +} + +.btn.red { + background-color: #FF6768; + color: white; +} + +.btn.pink { + background-color: #FACAD6; + color: #FF6768; +} + +.noMore { + padding: 20rpx; + color: #bbb; + text-align: center; + font-size: 22rpx; +} \ No newline at end of file diff --git a/packageA/pages/myGiftDetails/myGiftDetails.js b/packageA/pages/myGiftDetails/myGiftDetails.js new file mode 100644 index 0000000..f0f4798 --- /dev/null +++ b/packageA/pages/myGiftDetails/myGiftDetails.js @@ -0,0 +1,273 @@ +// packageA//pages/myGiftDetails/myGiftDetails.js +const app = getApp(); +let self = null; +var os = app.globalData.setting; + +Page({ + + /** + * 页面的初始数据 + */ + data: { + qr_code_object: { + val: "12121", + content: "请将二维码展示给核销员，服务更快捷！" + }, + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + self = this; + this.setData({ + id: options.id, + index: options.index, + }) + + // console.log('options', options); + app.isLogin().then(function(data) {//进入页面前已经授权登录成功 + self.setData({ + userInfo: data, + }); + }); + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + if(app.globalData.userInfo) { + if(!this.data.isLogin) { + this.setData({ + userInfo: app.globalData.userInfo, + imghost: app.globalData.setting.imghost, + isLogin: true, + }); + + let url = ''; + // let data = { + // store_id: app.globalData.setting.stoid, + // user_id: app.globalData.user_id, + // }; + + if(this.data.index == 0) { + // data.lbid = this.data.id; + // 请求数据 + app.request.promiseGet('/api/weshop/libao/libaoForm/page', { + data: { + store_id: app.globalData.setting.stoid, + id: this.data.id, + }, + isShowLoading: true, + }).then(function(res) { + self.setData({ + details: res.data.data.pageData[0], + }); + }); + + app.request.promiseGet('/api/weshop/libao/libaoList/page', { + data: { + store_id: app.globalData.setting.stoid, + lbid: this.data.id, + }, + isShowLoading: true, + }).then(function(res) { + self.setData({ + list: res.data.data.pageData, + }); + }); + } else if(this.data.index == 1) { + app.request.promiseGet('/api/weshop/libao/libaoFormvip/page', { + data: { + store_id: app.globalData.setting.stoid, + user_id: app.globalData.user_id, + id: this.data.id, + }, + isShowLoading: true, + }).then(function(res) { + // console.log('res3-->', res); + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ + self.setData({ + details: res.data.data.pageData[0], + }); + } + }); + + app.request.promiseGet('/api/weshop/libao/libaoListvip/page', { + data: { + store_id: app.globalData.setting.stoid, + lbvipid: this.data.id, + }, + isShowLoading: true, + }).then(function(res) { + // console.log('res4-->', res); + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0) { + var list_arr=res.data.data.pageData; + for(var i in list_arr){ + list_arr[i].alsonum= list_arr[i]['goods_num'] - list_arr[i]['usenum'];//剩余次数 + } + self.setData({ + list: res.data.data.pageData, + }); + } + }); + }; + + + }; + }; + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + }, + + //-- 礼包购买 -- + GetBuyPrice: function(e) { + var th = this,that=th; + var item=th.data.details; + var id = item.id; //活动id + var my_confirm = th.selectComponent("#my_confirm"); //组件的id + var user=getApp().globalData.userInfo; + + my_confirm.open( + "是否确定购买该礼包", + "取消", + "确定", + function() { + my_confirm.open_cancel(0); + }, + function() { + my_confirm.open_cancel(0); + var json = { + "lbid": id, //活动Id + "paytype": 2, //1=积分兑换 2=购买 + "store_id": os.stoid, //商家Id + "user_id": user.user_id, //用户ID + }; + var url = "/api/weshop/libao/libaoFormvip/libaoOrder"; + getApp().request.post(url, + { + data:json, + success:function(res) { + if (res.data.code == 0 && res.data.data) { + res = res.data.data; + wx.requestPayment({ + timeStamp: String(res.timeStamp), + nonceStr: res.nonceStr, + package: res.packageValue, + signType: res.signType, + paySign: res.paySign, + success: function(res) { + getApp().my_warnning("支付成功", 1, th); + setTimeout(function (){ + getApp().goto("/packageA/pages/libao_payment/payment?type=2"); + },1000) + }, + fail: function(res) { + getApp().my_warnning("取消支付", 0, th); + } + }); + } else { + getApp().my_warnning(res.data.msg, 0, th); + } + } + }) + }) + }, + + //-- 积分兑换 -- + GetBuyIntegral: function(e) { + var th = this,that=th; + var item=th.data.details; + + var id = item.id; //活动id + var my_confirm = th.selectComponent("#my_confirm"); //组件的id + var user=getApp().globalData.userInfo; + my_confirm.open( + "是否确定兑换该礼包", + "取消", + "确定", + function() { + my_confirm.open_cancel(0); + }, + function() { + my_confirm.open_cancel(0); + var json = { + "lbid": id, //活动Id + "paytype": 1, //1=积分兑换 2=购买 + "store_id": os.stoid, //商家Id + "user_id": user.user_id, //用户ID + }; + var url = "/api/weshop/libao/libaoFormvip/libaoOrder"; + getApp().request.post(url,{ + data:json, + success:function(res) { + if (res.data.code == 0) { + getApp().my_warnning("兑换成功！", 1, th); + setTimeout(function (){ + getApp().goto("/packageA/pages/libao_payment/payment?type=1"); + },1000) + } else { + getApp().my_warnning(res.data.msg, 0, th); + } + }, + }) + + }) + }, + + //显示二维码，进行核销 + show_hxm:function (e){ + var th=this; + var type=e.currentTarget.dataset.type; + var data={}; + data.store_id=os.stoid; + data.user_id=getApp().globalData.user_id; + + if(type && parseInt(type)==1){ + data.id=this.data.id; + data.type=1; + }else{ + var index=e.currentTarget.dataset.index; + var item=this.data.list[index]; + data.id=item.id; + data.type=2; + } + + //获取二维码 + getApp().request.get("/api/weshop/libao/libaoListvip/getLibaoCode",{ + data:data, + success:function (res){ + if(res.data.code==0){ + th.data.qr_code_object.val=res.data.data; + var qc_com = th.selectComponent("#qrcode"); //组件的id + qc_com.open(th.data.qr_code_object) + }else{ + wx.showToast({ + title: res.data.msg, + icon: 'none', + duration: 2000 + }) + + + + } + } + }) + + } + + +}) \ No newline at end of file diff --git a/packageA/pages/myGiftDetails/myGiftDetails.json b/packageA/pages/myGiftDetails/myGiftDetails.json new file mode 100644 index 0000000..454ab13 --- /dev/null +++ b/packageA/pages/myGiftDetails/myGiftDetails.json @@ -0,0 +1,10 @@ +{ + "navigationBarTitleText": "礼包详情", + "enablePullDownRefresh": false, + "usingComponents": { + "warn": "/components/long_warn/long_warn", + "nav_b": "/components/nav_b/nav_b", + "my_confirm": "/components/my_confirm/my_confirm", + "qrcode":"/components/qr_code/qr_code" + } +} \ No newline at end of file diff --git a/packageA/pages/myGiftDetails/myGiftDetails.wxml b/packageA/pages/myGiftDetails/myGiftDetails.wxml new file mode 100644 index 0000000..1dfade2 --- /dev/null +++ b/packageA/pages/myGiftDetails/myGiftDetails.wxml @@ -0,0 +1,70 @@ + + + + + + + + {{details.lbtitle}} + + + + {{details.lbprice}}/{{details.lbintegral}}积分 + 零售价{{details.oldprice}} + + 已售{{details.salenum}}件 + + + 活动截止日期 {{details.expdate ? filter.format_time(details.expdate):filter.format_time(details.endtime)}} + + + + 可到线下门店兑换以下单品 + + + 单品名称 + 总数量 + 剩余数量 + + + + {{item.goods_name}} + x{{item.goods_num}} + x{{item.alsonum}} + + 使用 + + + 已领 + + + + + + + + 单品名称 + 数量 + + + {{item.goods_name}} + x{{item.goods_num}} + + + + + + + + 立即兑换 + 立即购买 + + 立即使用 + + + + + + + + diff --git a/packageA/pages/myGiftDetails/myGiftDetails.wxss b/packageA/pages/myGiftDetails/myGiftDetails.wxss new file mode 100644 index 0000000..2431c64 --- /dev/null +++ b/packageA/pages/myGiftDetails/myGiftDetails.wxss @@ -0,0 +1,84 @@ +@charset "utf-8"; + +.c-a4 { + color: #a4a4a4; +} + +.c-red { + color: #FF6768; +} + +page { + background-color: #f0f0f0; +} + +.pdb80 { + padding-bottom: 80rpx; +} + +.img-container { + background-color: #dedede; +} + +.img { + display: block; + width: 100%; +} + + +.desc-container { + padding: 20rpx; + background-color: white; +} + + +.rmb::before { + content: '￥'; +} + + +.date { + color: #a4a4a4; + font-size: 24rpx; +} + + +.goods-container { + margin-top: 20rpx; + background-color: white; + font-size: 28rpx; +} + + + + + + +.btn-container { + position: fixed; + width: 100%; + bottom: 0; + display: flex; + font-size: 30rpx; +} + +.btn { + padding: 20rpx; + flex: 1; + text-align: center; +} + +.btn.red { + background-color: #FF6768; + color: white; +} + +.btn.pink { + background-color: #FACAD6; + color: #FF6768; +} + +.ling_btn{ background: #c0283a; color: #fff; width: 100rpx; height: 50rpx; + display: inline-block; line-height: 50rpx; border-radius: 10rpx} + +.ling_btn.c_a{ background: darkgrey} \ No newline at end of file diff --git a/packageA/pages/my_service/i_service.js b/packageA/pages/my_service/i_service.js index d3dfbd8..e820f39 100644 --- a/packageA/pages/my_service/i_service.js +++ b/packageA/pages/my_service/i_service.js @@ -50,11 +50,8 @@ Page({ */ onShow: function() { var th = this; - setTimeout(function (){ - var my_confirm = th.selectComponent("#my_confirm"); //组件的id - my_confirm.open_cancel(0); - },1000); - + var my_confirm = th.selectComponent("#my_confirm"); //组件的id + my_confirm.open_cancel(0); }, onReachBottom: function() { diff --git a/packageA/pages/my_service2/appment_main.js b/packageA/pages/my_service2/appment_main.js new file mode 100644 index 0000000..db8bc9b --- /dev/null +++ b/packageA/pages/my_service2/appment_main.js @@ -0,0 +1,912 @@ +var e = getApp(), + a = e.globalData.setting, + os = a, + t = e.request, + d = e.globalData; +Page({ + + /** + * 页面的初始数据 + */ + data: { + inurl: a.url, //接口网址 + iurl: a.imghost, //服务器网址 + store: 0, //是否显示服务门店列表 + beautician: 0, //是否显示美容师列表 + beautician_name: "", //选中的美容师名称 + beauticianID: "", //美容师id + bea_index: "", //美容师列表下标 + placeholder: "填写备注", //备注为空的placeholder + store_list: [], //门店列表 + beautician_list: [], //美容师列表 + store_name: "", //选择的服务门店 + fir_pick_index: 0, //选择的门店下标 + curpage: 1, //当前分页数 + pageSize: 8, //页大小 + total: 0, + ismore: 0, //是否加载完毕 + itemId: "", //服务id + project_id: "", //项目id + isScroll: true, //scroll-y是否可以滑动 + key_word: "", //是否按门店文字查询 + is_service_read: 0, //是否调用过门店接口 + is_search: 0, //是否通过key_word调用接口 + is_success: 0, //是否提交成功 + remarks: "", //备注 + storageId: "", //线下门店id + url: "/packageA/pages/my_service/appment_main", //本页面地址路径用于选择时间页面跳转回来 + buyType: "", //项目类型 + time: "", //选择预约时间 + tment_count: "", //可预约人数 + lat: "", //纬度坐标 + lon: "", //经度坐标 + is_gps: 1, //是否开启gps + validay: "", //服务项目有效期 + is_sub: 0, //判断是否重复提交 + is_textea: 1, //备注是否是可输入 + + // 拖拽参数 + writePosition: [], //默认定位参数 + writesize: [0, 0],// X Y 定位 + window: [0, 0], //屏幕尺寸 + write: [0, 0], //定位参数 + scrolltop: 0,//据顶部距离 + v:{}, + + project: ['项目1', '项目2', '项目3', '项目4', '项目5', '项目6', '项目7'], + md: [{name:'美导1',time:'08:30-22:00'},{name:'美导2',time:'09:30-18:00'},], + timeList: [], + deltaX: 0, + col_arr:[], + }, + //控制备注输入 + check_text: function() { + var th = this; + var is_textea = th.data.is_textea; + th.setData({ + is_textea: 1, + beautician: 0 + }) + }, + onclickstore: function() { + var th = this; + var store = th.data.store; + if (store) { + th.setData({ + store: 0, + is_textea: 1 + }) + } else { + th.setData({ + beautician: 0, + store: 1, + is_textea: 0 + }) + if (th.data.store_list.length < 1) { + wx.showLoading({ + title: '加载中', + }) + th.query_store(); + } + } + }, + //输入的备注 + input_remarks: function(e) { + var remarks = e.detail.value; + this.setData({ + remarks: remarks + }) + }, + //提交成功及发送模版代码 + success: function() { + var th = this; + var store = th.data.store_name; //门店名称 + var bea_name = th.data.beautician_name; //美容师名称 + var time = th.data.time; //预约时间 + var is_sub = th.data.is_sub; //是否重复提交 + var url = th.data.inurl + "/api/weshop/marketing/reservation/reservation/insert"; //接口路径 + var serviceId = th.data.itemId; //服务id + var beauticianID = th.data.beauticianID; //美容师id + var buyType = th.data.buyType; //服务项目类型 + var storeId = a.stoid; //商家id + var storageId = th.data.storageId; //门店id + var userId = th.data.options.userid; //用户id + var remarks = th.data.remarks; //用户备注 + var project_id = th.data.project_id; //项目id + var validay = th.data.validay; + var json = { + "arrangeTime": time + ":00", + "beauticianId": beauticianID, + "buyType": buyType, + "effectiveDay": "", + "number": "", + "projectId": project_id, + "remark": remarks, + "serviceId": serviceId, + "states": 0, + "storageId": storageId, + "storeId": storeId, + "userId": userId, + "validay": validay, + "isxz": 1 + + } + var data = JSON.stringify(json); + wx.request({ + url: url, + data: json, + method: 'post', + header: { + 'content-type': 'application/json' + }, // 设置请求的 header + success: function(res) { + th.setData({ + is_sub: 0 + }) + wx.hideLoading(); + if (res.data.code == 0) { + getApp().my_warnning("预约成功", 1, th); + // var store_name = th.data.store_name; //预约门店 + var number = res.data.data.Number; + // var temp_url = "/api/wx/open/app/user/sendSubscribeMsg"; //模版接口 + //var userinfo = getApp().globalData.userInfo; + //var name = d.userInfo.nickname; + // var json = { + // // "formId": formid, + // "keyWord": [{ + // "keyword": res.data.data.ServiceName + // }, + // { + // "keyword": time.substring(0, 16) + // }, { + // "keyword": res.data.data.BeauticianName + // }, { + // "keyword": res.data.data.StorageName + // }, { + // "keyword": res.data.data.Address + // } + // ], + // "page": "/packageA/pages/my_service/tment_details?number=" + number+"&userid="+th.data.options.userid, + // "storeId": a.stoid, + // "typeId": "1011", + // "userId": th.data.options.userid + // }; + // var data = JSON.stringify(json); + // //调用发送预约成功模版接口 + // wx.request({ + // url: th.data.inurl + temp_url, + // data: data, + // method: 'post', + // header: { + // 'content-type': 'application/json' + // }, // 设置请求的 header + // success: function(data) {} + // }) + + wx.redirectTo({ + url: "/packageA/pages/my_service/tment_details?number=" + number+"&userid="+th.data.options.userid, + }); + + } else { + getApp().my_warnning(res.data.msg, 0, th); + th.settime(); + } + } + }) + + }, + //定时显示texteat + settime: function() { + var th = this; + setTimeout(function() { + th.setData({ + is_textea: 1 + }) + }, 2000); + }, + //提交预约 + sub_success: function(e) { + var th = this; + var temp_url = th.data.inurl + "/api/wx/weappSendlist/page"; + var template_id = ""; + if (th.data.is_sub == 1) { + return false; + } + var store = th.data.store_name; //门店名称 + var bea_name = th.data.beautician_name; //美容师名称 + var time = th.data.time; //预约时间 + var is_sub = th.data.is_sub; //是否重复提交 + th.setData({ + is_textea: 0, + is_sub: 1 + }) + //提交预约前的判断 + if (store == "") { + getApp().my_warnning("请选择服务门店", 0, th); + th.setData({ + is_sub: 0 + }) + th.settime(); + return false; + } else if (bea_name == "") { + getApp().my_warnning("请选择美容师", 0, th); + th.setData({ + is_sub: 0 + }) + th.settime(); + return false; + } else if (time == undefined || time == '') { + getApp().my_warnning("请选择预约时间", 0, th); + th.setData({ + is_sub: 0 + }) + th.settime(); + return false; + } else { + var version =""; + //判断微信版本是否达到预约成功订阅的要求 + wx.getSystemInfo({ + success(res) { + version = res.version; + } + }) + wx.showLoading({ + title: '加载中', + }) + + th.success(); + // if (th.ver(version, '7.0.4') >= 0) { + // //获取模版id + // getApp().request.promiseGet(temp_url, { + // data: { + // store_id: a.stoid, + // typeid: "1011" + // } + // }).then(res => { + // if (res.data.code == 0 && res.data.data.pageData.length > 0) { + // template_id = res.data.data.pageData[0].template_id; + // // //授权订阅 + // wx.requestSubscribeMessage({ + // tmplIds: [template_id], + // success(res) { + // th.success(); + // }, + // fail(res) { + // th.success(); + // } + // }) + // } else { + // th.success(); + // } + // }) + // } else { + // // 如果希望用户在最新版本的客户端上体验您的小程序，可以这样子提示 + // wx.showModal({ + // title: '提示', + // content: '当前微信版本过低，无法使用该功能，请升级到最新微信版本后重试。' + // }) + // th.setData({ + // is_sub: 0 + // }) + // } + + } + }, + //版本判断 + ver:function(v1,v2){ + v1 = v1.split('.') + v2 = v2.split('.') + var num1 = "" ; + var num2 = ""; + var len = Math.max(v1.length, v2.length) + + while (v1.length < len) { + v1.push('0') + } + while (v2.length < len) { + v2.push('0') + } + + for (let i = 0; i < len; i++) { + num1 = parseInt(v1[i]) + num2 = parseInt(v2[i]) + + if (num1 > num2) { + return 1 + } else if (num1 < num2) { + return -1 + } + } + return 0 + }, + goto: function(e) { + var th = this; + th.setData({ + beautician: 0, + is_textea: 0 + }) + if (th.data.store_name == "") { + getApp().my_warnning("请选择服务门店", 0, th); + th.settime(); + } else if (th.data.beautician_name == "") { + getApp().my_warnning("请选择美容师", 0, th); + th.settime(); + } else { + th.setData({ + is_textea: 1 + }) + var url = e.currentTarget.dataset.url; + getApp().goto(url); + } + }, + //点击选择门店 + choose_for_store: function(e) { + var th = this; + var index_c = e.currentTarget.dataset.ind; + var fir_pick_index = th.data.fir_pick_index; + //判断是否点击选中的门店，防止重复点击重复设置选中下标 + if (index_c == fir_pick_index) { + return false; + } else { + th.setData({ + fir_pick_index: index_c, + beautician_name: "", + time: "", + tment_count: "" + }) + } + }, + //确认选择门店 + choice_store: function() { + var th = this; + var index = th.data.fir_pick_index; + var store_name = th.data.store_list[index].StorageName; + var Id = th.data.store_list[index].Id; + th.setData({ + store: 0, + store_name: store_name, + storageId: Id, + is_textea: 1 + }) + }, + onReachBottom: function() { + var th = this; + if (this.data.total <= th.data.pageSize) return; + if (this.data.ismore) return; + + wx.showLoading({ + title: '加载中...', + }) + th.query_store(); + }, + //分页查询门店信息 + query_store: function() { + var th = this; + th.setData({ + is_textea: 0 + }) + var itemId = th.data.itemId; //服务id + var url = "/api/weshop/marketing/reservation/storage/pagenew"; + var key_word = th.data.key_word; + key_word = key_word.replace(/\s+/g, ""); + getApp().request.promiseGet(url, { + data: { + userId: th.data.options.userid, + storeId: a.stoid, + serviceId: itemId, + latitude: th.data.lat, + longitude: th.data.lon, + page: th.data.curpage, + pageSize: th.data.pageSize, + keyWord: key_word + } + }).then(res => { + wx.hideLoading(); + if (res.data.code == 0) { + th.data.curpage++; + var arr1 = th.data.store_list; + var arr2 = res.data.data.pageData; + var arr3 = [...arr1, ...arr2]; + var ismore = 0; + if (arr3.length == res.data.data.total) ismore = 1 + th.setData({ + store_list: arr3, + total: res.data.data.total, + ismore: ismore, + is_service_read: 1, + }), wx.stopPullDownRefresh(); //停止下拉刷新 + if (key_word != "" && res.data.data.pageData.length < 1) { + th.setData({ + is_search: 1 + }) + } + } else { + getApp().my_warnning(res.data.msg, 0, th); + th.settime(); + } + }) + }, + //查询 + query_beautician: function() { + var th = this; + th.setData({ + is_textea: 0 + }); + + if (th.data.store_name == "") { + getApp().my_warnning("请选择服务门店", 0, th); + th.settime(); + } else { + wx.showLoading({ + title: '加载中', + }) + var itemid = th.data.itemId; //正式使用的项目id + var storageId = th.data.storageId; //正式使用的线下门店id + var url = "/api/weshop/marketing/reservation/staff/pagenew"; //接口地址 + + getApp().request.promiseGet(url, { + data: { + storeId: a.stoid, + userId: th.data.options.userid, + serviceId: itemid, + storageId: storageId + } + }).then(res => { + wx.hideLoading(); + if (res.data.code == 0) { + th.setData({ + beautician_list: res.data.data + }) + if (res.data.data.length < 1) { + getApp().my_warnning("暂无美容师", 0, th); + th.settime(); + } else { + if (th.data.beautician == 0) { + th.setData({ + beautician: 1, + }) + } else { + th.setData({ + beautician: 0, + }) + } + } + } else { + getApp().my_warnning(res.data.msg, 0, th); + th.settime(); + } + }) + } + }, + + choice_beautician: function(e) { + var th = this; + var bea_index = e.currentTarget.dataset.baaindex; + var bea_name = th.data.beautician_list[bea_index].StaffName; + var BeauticianID = th.data.beautician_list[bea_index].staffid; + var StorageId=th.data.beautician_list[bea_index].StorageId + + th.setData({ + beautician_name: bea_name, + beautician: 0, + bea_index: bea_index, + beauticianID: BeauticianID, + time: "", + tment_count: "", + is_textea: 1, + StorageId:StorageId + }) + + }, + //获取搜索门店输入的值 + input_store: function(e) { + this.setData({ + key_word: e.detail.value + }) + }, + //搜索门店 + search_store: function() { + var th = this; + var key_word = th.data.key_word; + var store_list = th.data.store_list; + th.setData({ + curpage: 1, + is_search: 0, + store_list: [] + }) + wx.showLoading({ + title: '加载中', + }) + th.query_store(); + }, + //美容师预约跳转页面 + nav_bea: function() { + var th = this; + th.setData({ + beautician: 0 + }) + var storageId = th.data.storageId; //线下门店id + var itemId = th.data.itemId; //服务id + var project_id = th.data.project_id; + if (storageId == "") { + getApp().my_warnning("请选择服务门店", 0, th); + th.settime(); + } else { + th.setData({ + is_textea: 1 + }) + console.log('optionsxxx===>', this.data.options); + // console.log('1-->', "/pages/user/my_service/cosmetology_list?userid=" + th.data.options.userid + 'storageId=' + storageId + '&' + 'itemId=' + itemId + '&' + "projectId=" + project_id); + wx.navigateTo({ + url: "/packageA/pages/my_service/cosmetology_list?userid=" + this.data.options.userid + '&storageId=' + storageId + '&itemId=' + itemId + "&projectId=" + project_id + }); + + } + }, + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function(options) { + + this.getTimeList(23, 30); + var th = this; + th.setData({ + options, + itemId: options.service_id, + buyType: options.BuyType, + project_id: options.ProjectID, + validay: options.Validay + }); + wx.getLocation({ + type: 'gcj02', + success: function(res) { + th.data.lat = res.latitude; + th.data.lon = res.longitude; + th.data.is_get_local_ok = 1; + th.setData({ + is_gps: 1 + }); + }, + fail: function(res) { + if (res.errCode == 2) { + th.setData({ + is_gps: 0 + }); + if (th.data.is_gps == 0) { + getApp().confirmBox("请开启GPS定位", null, 25000, !1); + th.settime(); + } + } else { + th.setData({ + is_gps: "3" + }); + } + + th.data.is_get_local_ok = 1; + } + }); + + // 获取当前默认导购信息及归属门店信息 + if(options.firstleader) { + getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+a.stoid+"/"+options.firstleader,{}).then(res=>{ + if(res.data.code==0){ + getApp().globalData.guide_id=res.data.data.id; + + getApp().request.promiseGet('/api/weshop/shoppingGuide/geIdStaffInfo', { + data: { + store_id: a.stoid, + guide_id: e.globalData.guide_id, + UserCode: th.data.options.usercode, + } + }).then(res => { + console.log('res==>', a.stoid, e.globalData.guide_id, th.data.options.usercode); + if(res.data.data.Tech) { + + var data={ + store_name: res.data.data.StorageName, + beautician_name: res.data.data.StaffName, + beauticianID: res.data.data.StaffId, + StorageId: res.data.data.StorageId, + } + th.check_firleader(data); + } + }); + + + }; + }); + }; + + + }, + //查询剩下可预约人数 + query_more: function() { + var th = this; + var url = "/api/weshop/marketing/reservation/can/reservation/countnew"; + var beauticianID = th.data.beauticianID; //美容师id + var projectID = th.data.itemId; //服务id + var seekTime = th.data.time; //预约日期 + var storageId = th.data.storageId; //门店id + var storeId = a.stoid; //商家id + getApp().request.promiseGet(url, { + data: { + beauticianId: beauticianID, + seekTime: seekTime, + serviceId: projectID, + storageId: storageId, + storeId: storeId + } + }).then(res => { + if (res.data.code == 0) { + var tment_count = res.data.data.CanReservation; + th.setData({ + tment_count: tment_count + }) + } else { + getApp().my_warnning(res.data.msg, 0, th); + th.settime(); + } + }) + + }, + /** + * 生命周期函数--监听页面显示 + */ + onShow: function() { + var th = this; + var seekTime = th.data.time; //预约日期 + if (seekTime != "") { + th.query_more(); + } + th.setData({ + time: th.data.time.substring(0, 16), + is_textea: 1 + }) + th.query_project(); + + th.queryMultipleNodes(); + }, + //获取单个服务项目信息 + query_project: function() { + var th = this; + var url = "/api/weshop/marketing/reservation/sm/page"; //获取服务项目接口 + var project_id = th.data.project_id; //服务项目id + getApp().request.promiseGet(url, { + data: { + storeId: a.stoid, + userId: th.data.options.userid, + projectId: project_id + } + }).then(res => { + if (res.data.code == 0) { + th.setData({ + validay: res.data.data.pageData[0].Validay + }) + } else { + getApp().my_warnning(res.data.msg, 0, th); + th.settime(); + } + }) + }, + //关闭导航 + // close: function() { + // var th = this; + // var nav_b = th.selectComponent("#nav_b"); //组件的id + // nav_b.close_box(); + // } + + //判断分享的导购是不是有门店，是不是该门店下又该会员 + check_firleader(data){ + var th=this; + var itemId = this.data.itemId; //服务id + var url = "/api/weshop/marketing/reservation/storage/pagenew"; + var key_word = data.store_name; + key_word = key_word.replace(/\s+/g, ""); + getApp().request.promiseGet(url, { + data: { + userId: th.data.options.userid, + storeId: os.stoid, + serviceId: itemId, + latitude: th.data.lat, + longitude: th.data.lon, + page: 1, + pageSize: 1000, + keyWord: key_word + } + }).then(res => { + //-- 如果是门店的话 -- + if (res.data.code == 0 && res.data.data && res.data.data.pageData) { + var store_data=null; + for(var i in res.data.data.pageData){ + var it=res.data.data.pageData[i]; + if(it.Id==data.StorageId){ + store_data={ + store_name: data.store_name, + StorageId: data.StorageId, + }; + break; + } + } + if(!store_data) return false; + th.setData(store_data) + + }else{ + return false; + } + + //导购接口地址 + var url = "/api/weshop/marketing/reservation/staff/pagenew"; + return getApp().request.promiseGet(url, { + isShowLoading:1, + data: { + storeId: os.stoid, + userId: th.data.options.userid, + serviceId: itemId, + storageId: data.StorageId + } + }) + }).then(res=>{ + if (res && res.data && res.data.code == 0) { + var beautician_list=res.data.data; + for(var i in beautician_list){ + var item=beautician_list[i]; + if(item.staffid==data.beauticianID){ + th.setData({ + beautician_name:data.beautician_name, + beauticianID:data.beauticianID, + }) + break; + } + } + + } + }) + }, + + + //开始拖拽 + touchmove: function (e) { + if(!this.data.copy_btn) return false; + var that = this; + var position = [e.touches[0].pageX + this.data.deltaX-15, e.touches[0].pageY-15]; + that.setData({ + write: position + }); + }, + touchend:function(e){ + var that = this,th=that; + if(!that.data.copy_btn) return false; + var position =th.data.write; + var arr=th.data.col_arr; + for(var i=0;i1?new Date(d_str+d_arr[1]):0; + + for(var j=0; jt2 && t2>0) continue; + //如果坐标在网格内 + if( position[0]>th.data.f_x+i*th.data.f_width && position[0]th.data.f_y +j*th.data.f_hei && position[1] { + console.log(res); + th.data.f_x=res[0].left; + th.data.f_y=res[0].top; + th.data.f_hei=res[0].height; + th.data.f_width=res[0].width; + + }) + }, + + getcopy(e) { + var that=this; + console.log('e', e); + var x=e.currentTarget.dataset.offsetLeft; + var y=e.currentTarget.dataset.offsetTop; + var position = [x, y]; + that.setData({ + write: position,copy_btn:1 + }); + + }, + + getName(e) { + // console.log('e1', e); + let name = e.currentTarget.dataset.name; + this.setData({ + projectName: name, + }); + }, + + + // 生成时间段 + getTimeList(hours,step) { + var minutes=60; + var timeArr = []; + hours = hours; + step = step; + + for(var i = 8; i < hours; i++){ + var str = ''; + if(i < 10) { + str = 0 + '' + i; + } else { + str = '' + i; + }; + + for(var j = 0; j < minutes; j++) { + if(j % step == 0){ + var s = j < 10 ? ':' + 0 + '' + j : ':' + j; + s = str + s; + timeArr.push(s); + }; + }; + }; + + // console.log('timeArr', timeArr); + this.setData({ + timeArr, + }); + + }, + + + + scroll(e) { + // console.log('e', e.detail.deltaX); + let deltaX = e.detail.deltaX; + // if(deltaX < 0) { + // deltaX = -deltaX; + // }; + this.data.deltaX = -deltaX; + }, + + + + +}) \ No newline at end of file diff --git a/packageA/pages/my_service2/appment_main.json b/packageA/pages/my_service2/appment_main.json new file mode 100644 index 0000000..d6e82a4 --- /dev/null +++ b/packageA/pages/my_service2/appment_main.json @@ -0,0 +1,8 @@ +{ + "navigationBarTitleText": "预约服务", + "enablePullDownRefresh": false, + "usingComponents": { + "warn": "/components/long_warn/long_warn", + "nav_b": "/components/nav_b/nav_b" + } +} \ No newline at end of file diff --git a/packageA/pages/my_service2/appment_main.wxml b/packageA/pages/my_service2/appment_main.wxml new file mode 100644 index 0000000..27c9dc0 --- /dev/null +++ b/packageA/pages/my_service2/appment_main.wxml @@ -0,0 +1,213 @@ + + + + + + + + + + + + + {{item}} + + + + + + + + + + + + 门 + 店 + + + + + {{store_name==""?'选择服务门店':store_name}} + ∟ + + + + + + 时间 + 美导 + + {{item}} + + + + + + {{item.name}} + + + + {{v[index][subindex]?v[index][subindex]:''}} + × + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 我的预约 + + + + + + + + + + + 选择服务门店 + + + + + + 搜索 + + + + + + + + + + + + + + {{item.StorageName}} + + 距您:{{item.Distance}}km + + + {{item.Address}} + + + + + 没有找到{{key_word}}门店 + + + + + 数据加载完毕 + + + + + + 确定 + + + + + + + + + + + + + {{projectName}} + \ No newline at end of file diff --git a/packageA/pages/my_service2/appment_main.wxss b/packageA/pages/my_service2/appment_main.wxss new file mode 100644 index 0000000..e9fedbe --- /dev/null +++ b/packageA/pages/my_service2/appment_main.wxss @@ -0,0 +1,445 @@ +page, +.area { + width: 100%; + height: 100%; +} + + + + +/* .container { + border-top: 7rpx solid rgb(245, 245, 245); + justify-content: baseline; +} */ + +.main { + width: 100%; + height: 305rpx; +} + +.angle { + transform: rotate(-45deg); + margin-right: 15rpx; + margin-bottom: 10rpx; + font-size: 26rpx; + color: rgb(142, 142, 142); +} +.StaffName{ + max-width: 350rpx; +} +.angler { + transform: rotate(227deg); + margin-bottom: 0rpx; +} + +.users { + background-color: rgb(255, 255, 255); +} + +.user { + width: 40rpx; + height: 40rpx; + margin-left: 15rpx; +} + +.Fram { + padding: 0rpx 60rpx; + margin-top: 60rpx; + background-color: rgb(255, 255, 255); +} + +.subSuccess { + position: fixed; + z-index: 3; + top: 420rpx; + left: 110rpx; + width: 540rpx; + height: 315rpx; + background-color: rgb(155, 155, 155); + text-align: center; + border-radius: 20rpx; + color: rgb(255, 255, 255); + font-weight: bold; +} + +.Success { + width: 110rpx; + height: 110rpx; + margin-top: 70rpx; + margin-bottom: 30rpx; +} + +.appment, .sub_appment { + width: 270rpx; + height: 60rpx; + line-height: 55rpx; + border-radius: 40rpx; +} + +button { + height: 100%; + background-color: rgb(214, 1, 33); +} + +.appment { + background-color: rgb(238, 238, 238); +} + +.sub_appment { + background-color: rgb(214, 1, 33); + color: rgb(255, 255, 255); +} + +.head { + width: 122rpx; + margin-right: 40rpx; + height: 50rpx; + line-height: 50rpx; +} + +.textarea { + width: 420rpx; + background-color: rgb(238, 238, 238); + border-radius: 6rpx; + height: 130rpx; + padding-left: 40rpx; + padding-right: 15rpx; + padding-top: 15rpx; + padding-bottom: 15rpx; +} + +.mabot { + margin-bottom: 35rpx; +} + +.select { + width: 420rpx; + height: 55rpx; + line-height: 55rpx; + background-color: rgb(238, 238, 238); + border-radius: 6rpx; + padding-left: 40rpx; + padding-right: 15rpx; +} + +.Cosmetology { + padding-left: 40rpx; + padding-right: 15rpx; + width: 365rpx; + background-color: rgb(238, 238, 238); + height: 50rpx; + line-height: 50rpx; + border-radius: 6rpx; +} + +.beauticians { + width: 407rpx; + z-index: 3; + top: 45rpx; + left: -1rpx; + padding: 0rpx 5rpx; + border: 2rpx solid rgb(238, 238, 238); + background-color: rgb(255, 255, 255); + padding-bottom: 5rpx; + height: 279rpx; + overflow-x: scroll; + overflow-y: scroll; +} + +.beautician { + height: 70rpx; + border-bottom: 2rpx solid rgb(238, 238, 238); + padding-left: 25rpx; +} + +.beaclone { + border-bottom: 0rpx; +} + +.notes { + margin-top: 15rpx; + margin-bottom: 60rpx; + margin-right: 8rpx; +} + +.color { + color: rgb(172, 172, 172); +} + +.submitMax { + margin-top: 50rpx; + padding: 0rpx 15rpx; +} + +.Remarks { + margin-top: 15rpx; +} + +/* 蒙尘 */ + +.disgraceful { + position: fixed; + z-index: 4; + width: 100%; + height: 100%; + top: 0rpx; + left: 0rpx; + background-color: rgba(0, 0, 0, 0.4); +} + +.storeList { + z-index: 5; + left: 0rpx; + border-top-left-radius: 25rpx; + border-top-right-radius: 25rpx; + background-color: rgb(255, 255, 255); + width: 100%; + padding: 45rpx 0rpx; +} + +.storeListpadd { + padding: 0rpx 31rpx; +} + +.choice { + margin-bottom: 5rpx; +} + +.inputstore { + width: 510rpx; + height: 43rpx; + line-height: 43rpx; + border-radius: 30rpx; + border: 2rpx solid rgb(238, 238, 238); + padding-left: 30rpx; +} + +.searchbar { + height: 95rpx; + border-bottom: 2rpx solid rgb(238, 238, 238); +} + +.search { + width: 125rpx; + height: 45rpx; + line-height: 45rpx; + background-color: rgb(219, 27, 52); + border-radius: 30rpx; + color: rgb(255, 255, 255); +} + +.stores { + height: 500rpx; + overflow-y: scroll; +} + +.store { + margin: 0rpx 16rpx; + padding-right: 15rpx; + border-bottom: 2rpx solid rgb(238, 238, 238); + padding: 20rpx 0rpx; +} + +.icon { + padding: 0rpx 15rpx; +} + +.circular { + width: 37rpx; + height: 37rpx; + border-radius: 50%; + border: 2rpx solid rgb(52, 52, 52); + margin: 0rpx 15rpx; +} + +.store_name_dis { + width: 90%; +} + +.name_dis { + margin-bottom: 5rpx; +} + +.store_name { + max-width: 420rpx; +} + +.store_dis { + height: 30rpx; + line-height: 30rpx; + padding: 5rpx 15rpx; + background-color: rgb(227, 227, 227); + border-radius: 25rpx; + margin-right: 20rpx; + color: rgb(159, 159, 159); + max-width: 200rpx; +} + +.store_address { + color: rgb(159, 159, 159); +} + +.determine { + background-color: rgb(196, 24, 26); + width: 500rpx; + border-radius: 35rpx; + height: 60rpx; + color: rgb(255, 255, 255); + margin: 20rpx 0rpx; +} + +.value { + max-width: 300rpx; +} + +.notstore { + height: 80rpx; + color: rgb(159, 159, 159); +} + + +.table { + background-color: white; + /* border-top: 2rpx solid rgba(218, 217, 217, 1); + border-left: 2rpx solid rgba(218, 217, 217, 1); */ +} +.blue { + background: rgba(241, 252, 255, 1); +} +.bg-pink { + background-color: #FFDEF0; +} +.td { + width: 140rpx; + height: 120rpx; + display: flex; + align-items: center; + justify-content: center; + border-right: 2rpx solid rgba(218, 217, 217, 1); + border-bottom: 2rpx solid rgba(218, 217, 217, 1); + position: relative; +} + +.td.active { + background-color: #FFE5F5 !important; +} +.td.notactive { + background-color: #f0f0f0; +} + +.left { + box-shadow: 4px 0px 6px #e7e9eb; +} + +.right { + width: calc(100% - 102rpx); + /* padding-right: 102rpx; */ + box-sizing: border-box; +} + +.card { + position: fixed; + width: 110rpx; + top: 50%; + right: 0; + /* min-height: 400rpx; */ + max-height: 700rpx; + overflow-y: auto; + transform: translateY(-50%); + background-color: white; + border-radius: 10rpx; + box-shadow: -2px 0px 6px #aaa; + z-index: 1000; +} + +.icon-meirong { + color: pink; +} + + + +.time-box { + width: 0; + height: 0; + border-width: 50rpx; + border-style: solid; + border-color: transparent transparent white white; + position: absolute; + left: 0; + bottom: 0; +} +.time { + position: absolute; + bottom: -22px; + width: 53rpx; + z-index: 999; + left: -22px; + font-size: 12px; +} + +.md-box { + width: 0; + height: 0; + border-width: 62rpx; + border-style: solid; + border-color: #FFDEF0 #FFDEF0 transparent transparent; + position: absolute; + right: 0; + top: 0; +} +.md { + position: absolute; + top: -30rpx; + width: 53rpx; + z-index: 999; + right: -52rpx; + font-size: 24rpxpx; +} + +.hover { + background-color: #e0e0e0; +} + +.copy { + padding: 10rpx; + text-align: center; + background-color: #f0f0f0; + z-index: 9999; +} + +.btn-container { + position: absolute; + width: 100%; + display: flex; + justify-content: space-between; + padding: 20rpx; + box-sizing: border-box; +} + +.btn { + color: white; + background-color: transparent; + line-height: 1; + font-size: 26rpx; +} +.close_this{ position: absolute; width: 40rpx; display: flex;right: 0; top: 0; border-radius: 50%; + justify-content: center;align-items: center; + height: 40rpx; border: 1rpx solid #adadad; } + + +.btn-box { + background-color: white; + position: fixed; + bottom: 0; + width: 100%; + display: flex; + justify-content: space-around; + padding: 20rpx 0; + box-shadow: 1px 0px 6px #aaa; +} + +.pdb100 { + padding-bottom: 100rpx; +} + + diff --git a/packageA/pages/my_service2/g_filter.wxs b/packageA/pages/my_service2/g_filter.wxs new file mode 100644 index 0000000..4353715 --- /dev/null +++ b/packageA/pages/my_service2/g_filter.wxs @@ -0,0 +1,34 @@ +var g_filters = { + is_no_time:function(item,subindex,timeArr){ + var t_time=timeArr[subindex]; + var time_arr=item.time.split("-"); + + var t_date=getDate(); + var t_date_str=t_date.getFullYear()+"-"+(t_date.getMonth() + 1)+"-"+t_date.getDate()+" " + + var this_time =t_date_str+t_time.substring(0, 19); + var reg = getRegExp("-", "g"); + this_time = this_time.replace(reg, '/'); + var t1 = getDate(this_time); + + var fmt1 =t_date_str+time_arr[0].substring(0, 19); + var reg = getRegExp("-", "g"); + var fmt2 = fmt1.replace(reg, '/'); + var t2 = getDate(fmt2); + + if(t11){ + var ft1 =t_date_str+time_arr[1].substring(0, 19); + var reg = getRegExp("-", "g"); + var ft2 = ft1.replace(reg, '/'); + var t3 = getDate(ft2); + if(t1>t3) return true; + } + return false; + }, + +} +module.exports = { + is_no_time: g_filters.is_no_time, + +} \ No newline at end of file diff --git a/packageA/pages/profile/profile.js b/packageA/pages/profile/profile.js index b8dcc73..f9a751b 100644 --- a/packageA/pages/profile/profile.js +++ b/packageA/pages/profile/profile.js @@ -93,21 +93,16 @@ Page({ }).then(res => { if (res.data.code == 0) { var data = res.data.data; - var VipLabel = th.data.VipLabel; //通过id标签找到已选择的标签 - if(VipLabel){ - var dateList = data.VipLabel.split(","); - var arr=[]; - for (var i in dateList) { - if (dateList[i] != "") { - arr.push(dateList[i]); - } - } - th.setData({ - check_label: arr - }) + var VipLabel = th.data.check_label; //通过id标签找到已选择的标签 + var dateList = data.VipLabel.split(","); + for (var i in dateList) { + if (dateList[i] != "") { + VipLabel.push(dateList[i]); + } } - - + th.setData({ + check_label: VipLabel + }) } else { getApp().my_warnning("系统繁忙，请稍后再试", 0, th); } @@ -536,6 +531,10 @@ Page({ if(!user) return false; //-- 赋予默认值 -- + if(user['idcard']) this.data.id=user['idcard']; + if(user['vipname']) this.data.name=user['vipname']; + if(user['address']) this.data.address=user['address']; + app.request.get(url1, { success: function(res) { console.log('x-->', res.data.code, res.data.data.reg_type, res.data.data.reg_info); @@ -568,13 +567,18 @@ Page({ if(res.data.code == 0) { console.log('url3', res.data.data.birthday); let data = res.data.data; - if(data['idcard']) self.data.id=data['idcard']; - if(data['vipname']) self.data.name=data['vipname']; - if(data['address']) self.data.address=data['address']; - + if(data.birthday){ data.birthday= ut.formar_no_full(data.birthday); } + + if(user['sex'] && !data.sex){ + data.sex=user['sex']; + } + if(user['birthday'] && !data.birthday){ + data.birthday= ut.formar_no_full(user['birthday']); + } + if(!data.pickup_name){ data.pickup_name=""; } @@ -582,21 +586,44 @@ Page({ data.pickup_id=0; } //-- 获取门店 -- - self.setData({ - isGender: data.sex, - isLunar: data.islunar, - datet: data.birthday, - stoname: data.pickup_name, - sto_sele_id: data.pickup_id, - vip_user:data - }); - + if(user['pickup_id'] && !data.pickup_id){ + getApp().promiseGet("/api/weshop/pickup/get/"+r.stoid+"/"+user['pickup_id']).then(res=>{ + if(res.data.code==0 && res.data.data){ + data.pickup_name=res.data.data.pickup_name; + data.pickup_id=res.data.data.pickup_id; + + self.setData({ + isGender: data.sex, + isLunar: data.islunar, + datet: data.birthday, + stoname: data.pickup_name, + sto_sele_id: data.pickup_id, + }); + } + else{ + self.setData({ + isGender: data.sex, + isLunar: data.islunar, + datet: data.birthday, + stoname: data.pickup_name, + sto_sele_id: data.pickup_id, + }); + } + }) + }else{ + self.setData({ + isGender: data.sex, + isLunar: data.islunar, + datet: data.birthday, + stoname: data.pickup_name, + sto_sele_id: data.pickup_id, + }); + } }; } }); - if(user){ - getApp().promiseGet("/api/weshop/users/getAndUpdateUser/" + r.stoid + "/" + user.user_id,{}); + if(user){ self.setData({user:user}) } diff --git a/packageA/pages/profile/profile.wxml b/packageA/pages/profile/profile.wxml index 4c589c9..359f88d 100644 --- a/packageA/pages/profile/profile.wxml +++ b/packageA/pages/profile/profile.wxml @@ -28,9 +28,9 @@ 推荐人: - + - + +{{reg_info.introducer}}积分 +{{reg_info.introducer}}成长值 @@ -39,8 +39,8 @@ 姓名: - - + + +{{reg_info.name}}积分 +{{reg_info.name}}成长值 @@ -69,7 +69,7 @@ - + +{{reg_info.sex}}积分 +{{reg_info.sex}}成长值 @@ -92,7 +92,7 @@
- + +{{reg_info.birthday}}积分 +{{reg_info.birthday}}成长值 @@ -101,8 +101,8 @@ 身份证: - - + + +{{reg_info.idcard}}积分 +{{reg_info.idcard}}成长值 @@ -111,8 +111,8 @@ 地址: - - + + +{{reg_info.address}}积分 +{{reg_info.address}}成长值 @@ -127,7 +127,7 @@ ∟ - + +{{reg_info.pick}}积分 +{{reg_info.pick}}成长值 diff --git a/packageA/pages/quan_list/quan_list.js b/packageA/pages/quan_list/quan_list.js index 57210d8..3187c68 100644 --- a/packageA/pages/quan_list/quan_list.js +++ b/packageA/pages/quan_list/quan_list.js @@ -25,26 +25,21 @@ Page({ onLoad: function(t) { var th=this; getApp().getConfig2(function (conf) { - if(conf.couponset) - conf.couponset=conf.couponset.replace(/\ { - th.data.loading=0; - if(res.data.code==0){ - if(!th.data.dataList) th.data.dataList=new Array(); - th.data.dataList=th.data.dataList.concat(res.data.data.pageData); - th.data.curpage++; - th.setData({dataList:th.data.dataList}); - } + console.log("onShow:4"); + var data={store_id:os.stoid,type:1,pageSize:10,page:th.data.curpage,user_id:user_id,is_share:0}; + console.log(data); + getApp().request.get("/api/weshop/prom/coupon/pageCouponList", { + data:data, + success:function (res){ + console.log("onShow:5"); + console.log(res); + th.data.loading=0; + if(res.data.code==0){ + if(!th.data.dataList) th.data.dataList=new Array(); + th.data.dataList=th.data.dataList.concat(res.data.data.pageData); + th.data.curpage++; + th.setData({dataList:th.data.dataList}); + } + }, + fail:function (e){ + console.log("onShow:6"); + console.log(e); + } }); }, diff --git a/packageA/pages/quan_list/quan_list.wxml b/packageA/pages/quan_list/quan_list.wxml index 1eb28bc..3c2473d 100644 --- a/packageA/pages/quan_list/quan_list.wxml +++ b/packageA/pages/quan_list/quan_list.wxml @@ -2,9 +2,11 @@ - - - + + + + + diff --git a/packageA/pages/service_share/service_share.js b/packageA/pages/service_share/service_share.js index cf0a136..dde7006 100644 --- a/packageA/pages/service_share/service_share.js +++ b/packageA/pages/service_share/service_share.js @@ -145,7 +145,7 @@ Page({ var item=this.data.share_good; var price = item.money; var title= item.serviceName; - var img=this.data.url+item.imgUrl; + var img=this.data.url+item.original_img; var url="/packageA/pages/goodsInfo/goodsInfo?goods_id=" + item.id; if(getApp().globalData.user_id){ @@ -777,7 +777,7 @@ Page({ var ee = this; //获取商品是分享图信息 wx.getImageInfo({ - src: ee.data.url+ee.data.share_good.imgUrl, + src: ee.data.url+ee.data.share_good.original_img, success: function(res) { //res.path是网络图片的本地地址 ee.data.share_goods_img = res.path; diff --git a/packageA/pages/service_share/service_share.wxml b/packageA/pages/service_share/service_share.wxml index 70a6fea..d55e18f 100644 --- a/packageA/pages/service_share/service_share.wxml +++ b/packageA/pages/service_share/service_share.wxml @@ -45,7 +45,7 @@ {{item.serviceName}} - 有效天数：{{item.validDays?item.validDays:'不限'}} + 有效天数：{{item.validDays}} ￥{{item.money}} 已售：{{item.sales_sum}} diff --git a/packageA/pages/user/my_service2/appment_main.js b/packageA/pages/user/my_service2/appment_main.js new file mode 100644 index 0000000..0f3039e --- /dev/null +++ b/packageA/pages/user/my_service2/appment_main.js @@ -0,0 +1,66 @@ +// packageA//pages/user/my_service2/appment_main.js +Page({ + + /** + * 页面的初始数据 + */ + data: { + + }, + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + } +}) \ No newline at end of file diff --git a/packageA/pages/user/my_service2/appment_main.json b/packageA/pages/user/my_service2/appment_main.json new file mode 100644 index 0000000..8835af0 --- /dev/null +++ b/packageA/pages/user/my_service2/appment_main.json @@ -0,0 +1,3 @@ +{ + "usingComponents": {} +} \ No newline at end of file diff --git a/packageA/pages/user/my_service2/appment_main.wxml b/packageA/pages/user/my_service2/appment_main.wxml new file mode 100644 index 0000000..3be22de --- /dev/null +++ b/packageA/pages/user/my_service2/appment_main.wxml @@ -0,0 +1,2 @@ + +packageA//pages/user/my_service2/appment_main.wxml diff --git a/packageA/pages/user/my_service2/appment_main.wxss b/packageA/pages/user/my_service2/appment_main.wxss new file mode 100644 index 0000000..af9c849 --- /dev/null +++ b/packageA/pages/user/my_service2/appment_main.wxss @@ -0,0 +1 @@ +/* packageA//pages/user/my_service2/appment_main.wxss */ \ No newline at end of file diff --git a/pages/user/add_comment/add_comment.js b/packageB/pages/user/add_comment/add_comment.js index 2d02b6b..859847a 100644 --- a/pages/user/add_comment/add_comment.js +++ b/packageB/pages/user/add_comment/add_comment.js @@ -1,6 +1,6 @@ -var t = getApp(), oo = t.globalData, a = t.globalData.setting, os = a, e = t.request, s = require("../../../utils/util.js"), - i = require("../../../utils/selectFiles.js"); -var regeneratorRuntime = require('../../../utils/runtime.js'); +var t = getApp(), oo = t.globalData, a = t.globalData.setting, os = a, e = t.request, s = require("../../../../utils/util.js"), + i = require("../../../../utils/selectFiles.js"); +var regeneratorRuntime = require('../../../../utils/runtime.js'); Page({ data: { @@ -88,8 +88,8 @@ Page({ var a = this; if (!a.data.service_rank || !a.data.goods_rank || !a.data.deliver_rank) return getApp().my_warnning("请先打分",0,a); - if(a.data.content=="") - return getApp().my_warnning("请填写评价内容",0,a); + // if(a.data.content=="") + // return getApp().my_warnning("请填写评价内容",0,a); //this.uploadPhotos(function () { var p_data= { diff --git a/pages/user/add_comment/add_comment.json b/packageB/pages/user/add_comment/add_comment.json index 401e4e6..401e4e6 100644 --- a/pages/user/add_comment/add_comment.json +++ b/packageB/pages/user/add_comment/add_comment.json diff --git a/pages/user/add_comment/add_comment.wxml b/packageB/pages/user/add_comment/add_comment.wxml index 71d1232..aecfbcd 100644 --- a/pages/user/add_comment/add_comment.wxml +++ b/packageB/pages/user/add_comment/add_comment.wxml @@ -106,7 +106,7 @@ - 提交评价 + 提交评价 diff --git a/pages/user/add_comment/add_comment.wxss b/packageB/pages/user/add_comment/add_comment.wxss index 43c1670..43c1670 100644 --- a/pages/user/add_comment/add_comment.wxss +++ b/packageB/pages/user/add_comment/add_comment.wxss diff --git a/packageB/pages/user/buyDetails/buyDetails.js b/packageB/pages/user/buyDetails/buyDetails.js new file mode 100644 index 0000000..78ec393 --- /dev/null +++ b/packageB/pages/user/buyDetails/buyDetails.js @@ -0,0 +1,113 @@ +const app = getApp(); +let self = null; + +Page({ + + /** + * 页面的初始数据 + */ + data: { + tabArr: ['购买', '续费'], + currentIndex: 0, + + list: null, + isLoading: false, // 检测是否已经发送请求,防止重复发送请求 + noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据 + pageNum: 1, // 当前页数 + }, + + + /** + * 生命周期函数--监听页面加载 + */ + onLoad: function (options) { + self = this; + app.isLogin().then(function(data) {//进入页面前已经授权登录成功 + self.setData({ + userInfo: data, + }); + }); + }, + + /** + * 生命周期函数--监听页面初次渲染完成 + */ + onReady: function () { + + }, + + /** + * 生命周期函数--监听页面显示 + */ + onShow: function () { + if(app.globalData.userInfo) { + if(!this.data.isLogin) { + this.setData({ + userInfo: app.globalData.userInfo, + imghost: app.globalData.setting.imghost, + isLogin: true, + }); + + // this.getData(true, '/api/weshop/plus/vip/mem/listBuyRecord', { + // storeId: app.globalData.setting.stoid, + // userId: app.globalData.user_id, + // }); + + + app.request.promiseGet('/api/weshop/plus/vip/mem/listBuyRecord', { + data: { + storeId: app.globalData.setting.stoid, + userId: app.globalData.user_id, + }, + isShowLoading: true, + }).then(function(res) { + self.setData({ + list: res.data.data, + }); + }); + + + + }; + }; + }, + + /** + * 生命周期函数--监听页面隐藏 + */ + onHide: function () { + + }, + + /** + * 生命周期函数--监听页面卸载 + */ + onUnload: function () { + + }, + + /** + * 页面相关事件处理函数--监听用户下拉动作 + */ + onPullDownRefresh: function () { + + }, + + /** + * 页面上拉触底事件的处理函数 + */ + onReachBottom: function () { + this.scrollToLower('/api/weshop/plus/vip/mem/listBuyRecord', { + store_id: app.globalData.setting.stoid, + user_id: app.globalData.user_id, + }); + }, + + /** + * 用户点击右上角分享 + */ + onShareAppMessage: function () { + + }, + +}) \ No newline at end of file diff --git a/packageB/pages/user/buyDetails/buyDetails.json b/packageB/pages/user/buyDetails/buyDetails.json new file mode 100644 index 0000000..e9e3b32 --- /dev/null +++ b/packageB/pages/user/buyDetails/buyDetails.json @@ -0,0 +1,7 @@ +{ + "navigationBarTitleText": "购卡明细", + "enablePullDownRefresh": false, + "usingComponents": { + "nodata": "/components/nodata/nodata" + } +} \ No newline at end of file diff --git a/packageB/pages/user/buyDetails/buyDetails.wxml b/packageB/pages/user/buyDetails/buyDetails.wxml new file mode 100644 index 0000000..b519d3e --- /dev/null +++ b/packageB/pages/user/buyDetails/buyDetails.wxml @@ -0,0 +1,33 @@ + + + + + 支付流水号 {{item.PayNo}} + + + + PLUS卡名 + {{item.CardName}} + + + 有效期 + {{filter.show_default(item.EffectiveDate)}} + + + 提交时间 + {{item.BillDate}} + + + + 类型：{{item.Buytype == 1 ? '购买':'续费'}} + {{item.CardFee}} + + + + + + + + + + diff --git a/packageB/pages/user/buyDetails/buyDetails.wxss b/packageB/pages/user/buyDetails/buyDetails.wxss new file mode 100644 index 0000000..fa8d22b --- /dev/null +++ b/packageB/pages/user/buyDetails/buyDetails.wxss @@ -0,0 +1,39 @@ +@charset "utf-8"; + +.noMore { + padding: 20rpx; + color: #bbb; + text-align: center; + font-size: 22rpx; +} + +.c-a4 { + color: #a4a4a4; +} + +.c-red { + color: #FF6768; +} + +page { + background-color: #f0f0f0; +} + + +.list { + padding: 20rpx 20rpx 0 20rpx; +} + +.item { + background-color: white; + border-radius: 8rpx; + overflow: hidden; +} + +.item ~ .item { + margin-top: 20rpx; +} + +.rmb::before { + content: '￥'; +} \ No newline at end of file diff --git a/pages/user/collect_list/collect_list.js b/packageB/pages/user/collect_list/collect_list.js index cc53c36..ea786ae 100644 --- a/pages/user/collect_list/collect_list.js +++ b/packageB/pages/user/collect_list/collect_list.js @@ -2,13 +2,13 @@ var t = function(t) { return t && t.__esModule ? t : { default: t }; - }(require("../../../utils/LoadMore.js")), + }(require("../../../../utils/LoadMore.js")), e = getApp(), a = e.request, o = new t.default(); var oo = e.globalData.setting, app_d = e.globalData; -var ut = require('../../../utils/util.js'); +var ut = require('../../../../utils/util.js'); Page({ data: { @@ -29,6 +29,7 @@ Page({ isdelete: 0 }, onLoad: function() { + o.init(this, "", "collects"), this.requestCollectList(); }, @@ -50,8 +51,11 @@ Page({ is_goods: 1 }) var goods_list = th.selectComponent("#goods_recommend"); //组件的id - goods_list.init(); - setTimeout(function () { goods_list.get_list(); }, 300) + if (goods_list) + { + goods_list.init(); + setTimeout(function () { goods_list.get_list(); }, 300) + } } }); }, @@ -130,9 +134,8 @@ Page({ goto: function(ee) { - wx.navigateTo({ - url: '/pages/index/index/index', - }) + getApp().goto("/pages/index/index/index"); + }, //编辑商品显示 editcollects: function() { diff --git a/pages/user/collect_list/collect_list.json b/packageB/pages/user/collect_list/collect_list.json index 64db42e..64db42e 100644 --- a/pages/user/collect_list/collect_list.json +++ b/packageB/pages/user/collect_list/collect_list.json diff --git a/pages/user/collect_list/collect_list.wxml b/packageB/pages/user/collect_list/collect_list.wxml index 00f5f3b..00f5f3b 100644 --- a/pages/user/collect_list/collect_list.wxml +++ b/packageB/pages/user/collect_list/collect_list.wxml diff --git a/pages/user/collect_list/collect_list.wxss b/packageB/pages/user/collect_list/collect_list.wxss index efd2d00..efd2d00 100644 --- a/pages/user/collect_list/collect_list.wxss +++ b/packageB/pages/user/collect_list/collect_list.wxss diff --git a/pages/user/comment/comment.js b/packageB/pages/user/comment/comment.js index 051d8fa..9922c98 100644 --- a/pages/user/comment/comment.js +++ b/packageB/pages/user/comment/comment.js @@ -1,16 +1,16 @@ -var ut = require("../../../utils/util.js"); +var ut = require("../../../../utils/util.js"); var t = function(t) { return t && t.__esModule ? t : { default: t }; - }(require("../../../utils/LoadMore.js")), + }(require("../../../../utils/LoadMore.js")), e = getApp(), rq = e.request, a = new t.default(), - s = require("../../../utils/util.js"), + s = require("../../../../utils/util.js"), oo = e.globalData, os = e.globalData.setting; -var regeneratorRuntime = require('../../../utils/runtime.js'); +var regeneratorRuntime = require('../../../../utils/runtime.js'); Page({ data: { @@ -117,7 +117,7 @@ Page({ var n = "?order_id=" + a[s].order_id; n += "&goods_id=" + a[s].goods_id, n += "&price=" + a[s].goods_price; wx.navigateTo({ - url: "/pages/user/add_comment/add_comment" + n + url: "/packageB/pages/user/add_comment/add_comment" + n }); } }, diff --git a/pages/user/comment/comment.json b/packageB/pages/user/comment/comment.json index 2b3db22..2b3db22 100644 --- a/pages/user/comment/comment.json +++ b/packageB/pages/user/comment/comment.json diff --git a/pages/user/comment/comment.wxml b/packageB/pages/user/comment/comment.wxml index 4e77fe1..35ced4c 100644 --- a/pages/user/comment/comment.wxml +++ b/packageB/pages/user/comment/comment.wxml @@ -1,4 +1,4 @@ - + @@ -110,11 +110,11 @@ 查看订单 - + 查看评价 - + 去评价 diff --git a/pages/user/comment/comment.wxss b/packageB/pages/user/comment/comment.wxss index 3ca00d8..3ca00d8 100644 --- a/pages/user/comment/comment.wxss +++ b/packageB/pages/user/comment/comment.wxss diff --git a/pages/user/user_coupon/c_filter.wxs b/packageB/pages/user/user_coupon/c_filter.wxs index b1d896d..b1d896d 100644 --- a/pages/user/user_coupon/c_filter.wxs +++ b/packageB/pages/user/user_coupon/c_filter.wxs diff --git a/packageB/pages/user/user_coupon/filter.wxs b/packageB/pages/user/user_coupon/filter.wxs new file mode 100644 index 0000000..c0e8d13 --- /dev/null +++ b/packageB/pages/user/user_coupon/filter.wxs @@ -0,0 +1,11 @@ +var format = function (text) { + if (!text) { + return + } + var reg = getRegExp('\\\\n', 'g') + return text.replace(reg, '\n') +} + +module.exports = { + format: format +} diff --git a/pages/user/user_coupon/user_coupon.js b/packageB/pages/user/user_coupon/user_coupon.js index cb47790..fa5d7a4 100644 --- a/pages/user/user_coupon/user_coupon.js +++ b/packageB/pages/user/user_coupon/user_coupon.js @@ -1,7 +1,6 @@ -// pages/user/user_coupon/user_coupon.js var e = getApp(),os = e.globalData.setting; -var utils = require('../../../utils/util.js'); -var regeneratorRuntime = require('../../../utils/runtime.js'); +var utils = require('../../../../utils/util.js'); +var regeneratorRuntime = require('../../../../utils/runtime.js'); Page({ /** diff --git a/pages/user/user_coupon/user_coupon.json b/packageB/pages/user/user_coupon/user_coupon.json index 31d3bbc..31d3bbc 100644 --- a/pages/user/user_coupon/user_coupon.json +++ b/packageB/pages/user/user_coupon/user_coupon.json diff --git a/pages/user/user_coupon/user_coupon.wxml b/packageB/pages/user/user_coupon/user_coupon.wxml index 7b6df4a..7b6df4a 100644 --- a/pages/user/user_coupon/user_coupon.wxml +++ b/packageB/pages/user/user_coupon/user_coupon.wxml diff --git a/pages/user/user_coupon/user_coupon.wxss b/packageB/pages/user/user_coupon/user_coupon.wxss index 53b47d6..53b47d6 100644 --- a/pages/user/user_coupon/user_coupon.wxss +++ b/packageB/pages/user/user_coupon/user_coupon.wxss diff --git a/pages/user/view_comment/view_comment.js b/packageB/pages/user/view_comment/view_comment.js index 95e3fc3..0764c07 100644 --- a/pages/user/view_comment/view_comment.js +++ b/packageB/pages/user/view_comment/view_comment.js @@ -1,4 +1,4 @@ -var i = require("../../../utils/util.js"), +var i = require("../../../../utils/util.js"), ut = i; var e = getApp(), a = e.globalData.setting, diff --git a/pages/user/view_comment/view_comment.json b/packageB/pages/user/view_comment/view_comment.json index eacc6fa..eacc6fa 100644 --- a/pages/user/view_comment/view_comment.json +++ b/packageB/pages/user/view_comment/view_comment.json diff --git a/pages/user/view_comment/view_comment.wxml b/packageB/pages/user/view_comment/view_comment.wxml index 793444c..c74b53f 100644 --- a/pages/user/view_comment/view_comment.wxml +++ b/packageB/pages/user/view_comment/view_comment.wxml @@ -93,7 +93,7 @@ - 评价其他 + 评价其他 点击领取礼品 diff --git a/pages/user/view_comment/view_comment.wxss b/packageB/pages/user/view_comment/view_comment.wxss index ed974d5..ed974d5 100644 --- a/pages/user/view_comment/view_comment.wxss +++ b/packageB/pages/user/view_comment/view_comment.wxss diff --git a/pages/cart/cart/cart.js b/pages/cart/cart/cart.js index 9b49260..d4c1754 100644 --- a/pages/cart/cart/cart.js +++ b/pages/cart/cart/cart.js @@ -29,6 +29,8 @@ Page({ card_field:"", bconf:null, btn_click:1, + + service_data:null, }, onLoad: function() { var a = this,ee=a; @@ -124,10 +126,7 @@ Page({ } }) - - - - + }, onHide(){ @@ -147,9 +146,11 @@ Page({ allsto: e }); th.get_cart(); + th.get_ser_cart(); }) } else { th.get_cart(); + th.get_ser_cart(); } //要获取会员是不是等级会员 @@ -172,10 +173,18 @@ Page({ } } }) - - + if( (!this.data.requestData || this.data.requestData.length==0) && (!this.data.service_data || this.data.service_data.length==0)) { + setTimeout(function () { + var goods_list = th.selectComponent("#goods_list"); //组件的id + if(goods_list){ + goods_list.init(); + goods_list.get_list(); + } + }, 800) + } }, - //-----真的获取购物车-------- + + //-----真的获取购物车-------- get_cart: function() { var th = this; var rd = Math.random().toString(36).substr(2, 15); @@ -328,13 +337,7 @@ Page({ } } - if(arr.length==0) { - setTimeout(function () { - var goods_list = th.selectComponent("#goods_list"); //组件的id - goods_list.init(); - goods_list.get_list(); - }, 800) - } + if(th.data.is_open_offline && th.data.is_open_offline>0){ //-- 此时要实时更新线下取价价格 -- @@ -357,6 +360,106 @@ Page({ }); }, + //-----真的获取购物车-------- + get_ser_cart: function() { + var th = this; + var rd = Math.random().toString(36).substr(2, 15); + getApp().request.get("/api/weshop/cartService/page", { + data: { + user_id: app.globalData.user_id, + rd: rd, + store_id: oo.stoid, + pageSize: 600, + }, + success:async function(su) { + //按门店分类的数组 + var arr = new Array(), + carr = su.data.data.pageData; + var all_num = 0; + + if(carr && carr.length>0) { + for (var i = 0; i < carr.length; i++) { + var item = carr[i]; + var good = null; + + await getApp().request.promiseGet("/api/weshop/serviceCard/get/" + oo.stoid + "/" + item.service_id, {}).then(res => { + good = res.data.data; + }) + if(!good){ + var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; + getApp().request.delete(url, { + success: function (t) { + } + }); + continue; + } + + + //如果商品下架了，或者商品是赠品，一开始都要清除 + if (good.is_show == 0) { + var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; + getApp().request.delete(url, { + success: function (t) { + } + }); + //商品已经下架 + continue; + } + + all_num += item.goods_num; + item.img_url = oo.imghost + good.imgUrl; + item.selected = 0; + + + var pcid = item.pick_id; + var find = 0; + //---------循环查找门店--- + if (arr.length > 0) { + for (var j = 0; j < arr.length; j++) { + if (arr[j].pid == pcid) { + arr[j].goods.push(item); + find = 1; + break; + } + } + } + + //------如果没有找到----- + if (find == 0) { + var pikname = ''; + //找到门店名称 + for (var k = 0; k < th.data.allsto.length; k++) { + if (pcid == th.data.allsto[k].pickup_id) { + pikname = th.data.allsto[k].pickup_name; + break; + } + } + var narr = new Array(); + narr.push(item); + var ie = { + pid: pcid, + pname: pikname, + goods: narr, + selected: 0 + }; + arr.push(ie); + } + } + } + + + th.setData({ + service_data: arr, + all_num2: all_num, + is_edit: 0 + }), + th.doCheckAll(), wx.stopPullDownRefresh(); + + } + }); + }, + + //设置莫个门店的所有线下价格 async set_offline(list){ var th=this; @@ -444,7 +547,6 @@ Page({ }; th.postCardList(s, t.currentTarget.dataset.item, t.currentTarget.dataset.pitems); } - }, //-------------加数量--------------------- @@ -464,7 +566,6 @@ Page({ goods_id: a.goods_id, store_id: oo.stoid }; - isShowLoading: 0; this.postCardList(e, t.currentTarget.dataset.item, t.currentTarget.dataset.pitems); } else { wx.showModal({ @@ -500,66 +601,180 @@ Page({ this.postCardList(e, t.currentTarget.dataset.item, t.currentTarget.dataset.pitems); } }, - //---------------全选,全选的时候要判断是否门店的匹配方式一致-------------- + + + //-----------------点击输入修改商品数量--------------- + valueToNum_ser: function(t) { + if(!this.data.is_load) return false; + //控制住，避免事件响应冲突，只有input有输入的时候，才刷新 + if(this.data.btn_click){ + return false; + } + this.data.btn_click=1; + + var a = t.currentTarget.dataset.item; + var b = t.currentTarget.dataset.pitems; + a = this.data.service_data[b].goods[a]; + var e = a; + var th=this; + + if (a = isNaN(t.detail.value) || t.detail.value < 1 ? 1 : parseInt(t.detail.value)) { + var s = { + goods_num: a, + goods_id: e.goods_id, + id: e.id, + store_id: oo.stoid + }; + th.postCardList_ser(s, t.currentTarget.dataset.item, t.currentTarget.dataset.pitems); + } + }, + //-------------加数量--------------------- + addNum_ser: function(t) { + if(!this.data.is_load) return false; + if (this.data.up_dating == 1) return false; + this.data.up_dating = 1; + + var a = t.currentTarget.dataset.item; + var b = t.currentTarget.dataset.pitems; + a = this.data.service_data[b].goods[a]; + + var e = { + goods_num: a.goods_num + 1, + id: a.id, + goods_id: a.goods_id, + store_id: oo.stoid + }; + this.postCardList_ser(e, t.currentTarget.dataset.item, t.currentTarget.dataset.pitems); + + }, + //-------------减数量--------------------- + subNum_ser: function(t) { + if(!this.data.is_load) return false; + if (this.data.up_dating == 1) return false; + this.data.up_dating = 1; + + var a = t.currentTarget.dataset.item; + var b = t.currentTarget.dataset.pitems; + a = this.data.service_data[b].goods[a]; + this.data.btn_click=1; + + if (a.goods_num - 1 < 0){ + this.data.up_dating = 0; + return false; + } + + if (1 != a.goods_num) { + var e = { + goods_num: a.goods_num - 1, + id: a.id, + goods_id: a.goods_id, + store_id: oo.stoid + }; + this.postCardList_ser(e, t.currentTarget.dataset.item, t.currentTarget.dataset.pitems); + } + }, + + + //---------------全选,全选的时候要判断是否门店的匹配方式一致-------------- checkAll: function() { var e = this, dda = e.data.requestData, + sdda = e.data.service_data, tfeel = 0, t_num = 0, text_arr = ""; + + if(e.data.requestData && e.data.requestData.length>0 + && e.data.service_data && e.data.service_data.length>0){ + wx.showModal({ + title: '提示', + content: '服务卡项目不能和商品一起选择' + }); + return false; + } + this.data.btn_click=1; - for (var i = 0; i < dda.length; i++) { - var item = dda[i].goods; - if (!e.data.checkAllToggle) { - var txt = "requestData[" + i + "].selected"; - e.setData({ - [txt]: 0, - }); - } - var fir = 0; - for (var j = 0; j < item.length; j++) { - if(item[j].is_gift) continue; - if (fir == 0) { - fir = item[j].distr_type; - } else { - //如果同一门店有不同门店的商品，不能同一配送 - if (fir != item[j].distr_type && !e.data.checkAllToggle && item[j].distr_type != 0) { - text_arr += item[j].goods_name + " "; - break; + if(dda && dda.length>0){ + for (var i = 0; i < dda.length; i++) { + var item = dda[i].goods; + if (!e.data.checkAllToggle) { + var txt = "requestData[" + i + "].selected"; + e.setData({ + [txt]: 0, + }); + } + var fir = 0; + for (var j = 0; j < item.length; j++) { + if(item[j].is_gift) continue; + if (fir == 0) { + fir = item[j].distr_type; + } else { + //如果同一门店有不同门店的商品，不能同一配送 + if (fir != item[j].distr_type && !e.data.checkAllToggle && item[j].distr_type != 0) { + text_arr += item[j].goods_name + " "; + break; + } + } + var txt = "requestData[" + i + "].goods[" + j + "].selected" + e.setData({ + [txt]: !e.data.checkAllToggle, + }) + if (!e.data.checkAllToggle) { + tfeel += item[j].goods_num * item[j].goods_price; + t_num += item[j].goods_num; } } - var txt = "requestData[" + i + "].goods[" + j + "].selected" + } + + if (text_arr != "") { + wx.showModal({ + title: '提示', + content: text_arr + '不能与门店中其他商品一起结算，配送方式不一致' + }); + return false; + } else { e.setData({ - [txt]: !e.data.checkAllToggle, - }) - if (!e.data.checkAllToggle) { - tfeel += item[j].goods_num * item[j].goods_price; - t_num += item[j].goods_num; + checkAllToggle: !e.data.checkAllToggle, + total_fee: tfeel.toFixed(2), + total_num: t_num, + }); + + for(var i in e.data.requestData){ + e.check_prom_activity(i) } } } - if (text_arr != "") { - wx.showModal({ - title: '提示', - content: text_arr + '不能与门店中其他商品一起结算，配送方式不一致' - }); - return false; - } else { + if(sdda && sdda.length>0){ + for (var i = 0; i < sdda.length; i++) { + var item = sdda[i].goods; + if (!e.data.checkAllToggle) { + var txt = "service_data[" + i + "].selected"; + e.setData({ + [txt]: 0, + }); + } + var fir = 0; + for (var j = 0; j < item.length; j++) { + var txt = "service_data[" + i + "].goods[" + j + "].selected" + e.setData({ + [txt]: !e.data.checkAllToggle, + }) + if (!e.data.checkAllToggle) { + tfeel += item[j].goods_num * item[j].money; + t_num += item[j].goods_num; + } + } + } e.setData({ checkAllToggle: !e.data.checkAllToggle, total_fee: tfeel.toFixed(2), total_num: t_num, }); - - for(var i in e.data.requestData){ - e.check_prom_activity(i) - } - } - }, + }, //------门店全选按钮，要判断是否门店的匹配方式一致--------- check_th_all_item:async function(ele) { var e = this, @@ -567,10 +782,32 @@ Page({ item = this.data.requestData[pitems].goods, sele = this.data.requestData[pitems].selected; this.data.btn_click=1; + var garr=e.data.service_data; var isok = 1, fir = 0, iarr = item; + + if(!sele){ + var check_is_service_selected=0; + for (var ii in garr){ + for (var ij in garr[ii].goods){ + if( garr[ii].goods[ij].selected){ + check_is_service_selected=1; + break; + } + } + } + + if(check_is_service_selected){ + wx.showModal({ + title: '提示', + content: '服务卡项目不能和商品一起选择' + }); + return false; + } + } + if (!sele && item.length > 0) { for (var i = 0; i < iarr.length; i++) { if(iarr[i].is_gift==1) continue; @@ -612,7 +849,6 @@ Page({ } this.doCheckAll(); }, - //---------------单选，也要判断门店的配送方式是否一致-------------- check_th_item: async function(t) { var e = this, @@ -622,13 +858,32 @@ Page({ var isok = 1,fir = 0; var iarr = e.data.requestData[pitems].goods; this.data.btn_click=1; - + var garr= e.data.service_data; + + if (!a.selected) { + var check_is_service_selected = 0; + for (var ii in garr) { + for (var ij in garr[ii].goods) { + if (garr[ii].goods[ij].selected) { + check_is_service_selected = 1; + break; + } + } + } + if (check_is_service_selected) { + wx.showModal({ + title: '提示', + content: '服务卡项目不能和商品一起选择' + }); + return false; + } + } //当数量大于1，且是选择的时候 if (iarr.length > 1 && !a.selected) { + for (var i = 0; i < iarr.length; i++) { if(iarr[i].is_gift==1) continue; - //---当不是本身选择项目---- var sel = iarr[i].selected; if (iarr[i].distr_type != 0 && (sel || iarr[i].id == a.id)) { @@ -662,10 +917,93 @@ Page({ if(i!=pitems) await e.check_prom_activity(i); } } - this.doCheckAll(); } }, + + //------门店全选按钮，要判断是否门店的匹配方式一致--------- + check_th_all_item_ser:async function(ele) { + var e = this, + pitems = ele.currentTarget.dataset.pitems, + item = this.data.service_data[pitems].goods, + sele = this.data.service_data[pitems].selected; + this.data.btn_click=1; + var garr= e.data.requestData; + + var isok = 1, + fir = 0, + iarr = item; + + if(!sele){ + var check_is_goods_selected=0; + for (var ii in garr){ + for (var ij in garr[ii].goods){ + if( garr[ii].goods[ij].selected){ + check_is_goods_selected=1; + break; + } + } + } + if(check_is_goods_selected){ + wx.showModal({ + title: '提示', + content: '服务卡项目不能和商品一起选择' + }); + return false; + } + } + + for (var i = 0; i < item.length; i++) { + var txt = "service_data[" + pitems + "].goods[" + i + "].selected"; + e.setData({ + [txt]: Number(!sele), + }); + } + var txt = "service_data[" + pitems + "].selected"; + e.setData({ + [txt]: Number(!sele), + }); + this.doCheckAll(); + }, + //---------------单选，也要判断门店的配送方式是否一致-------------- + check_th_item_ser: async function(t) { + var e = this, + item = t.currentTarget.dataset.item, + pitems = t.currentTarget.dataset.pitems; + a = this.data.service_data[pitems].goods[item]; + var isok = 1,fir = 0; + var iarr = e.data.service_data[pitems].goods; + this.data.btn_click=1; + + var garr= e.data.requestData; + + if(!a.selected){ + var check_is_goods_selected=0; + for (var ii in garr){ + for (var ij in garr[ii].goods){ + if( garr[ii].goods[ij].selected){ + check_is_goods_selected=1; + break; + } + } + } + + if(check_is_goods_selected){ + wx.showModal({ + title: '提示', + content: '服务卡项目不能和商品一起选择' + }); + return false; + } + } + + var txt = "service_data[" + pitems + "].goods[" + item + "].selected"; + e.setData({ + [txt]: Number(!a.selected), + }); + this.doCheckAll(); + }, + //----------检查是否全选--------- doCheckAll: function() { var th = this, @@ -673,49 +1011,80 @@ Page({ t_num = 0, ischeck = 1, car = this.data.requestData, + car2 = this.data.service_data, all_num = 0; - for (var a = 0; a < car.length; a++) { - var c_item=car[a]; - var item = car[a].goods, - is_s_sele = 1; - var offline_price=0; - var offline_num=0; - for (var c = 0; c < item.length; c++) { - if(item[c].is_gift) continue; - all_num += item[c].goods_num; - if (item[c].selected == 0) { - ischeck = 0; - is_s_sele = 0; - } else { - tfeel += item[c].goods_num * item[c].goods_price; - t_num += item[c].goods_num; + //-- 购物车 -- + if(car && car.length>0){ + for (var a = 0; a < car.length; a++) { + var c_item=car[a]; + var item = car[a].goods, + is_s_sele = 1; + var offline_price=0; + var offline_num=0; + for (var c = 0; c < item.length; c++) { + if(item[c].is_gift) continue; + all_num += item[c].goods_num; + if (item[c].selected == 0) { + ischeck = 0; + is_s_sele = 0; + } else { + tfeel += item[c].goods_num * item[c].goods_price; + t_num += item[c].goods_num; + } + + //-- 如果这个商品是线下取价的时候 -- + if(item[c].is_offline){ + offline_price+= (item[c].goods_price-item[c].offline_price)*item[c].goods_num; + offline_num+=item[c].goods_num; + } + } - //-- 如果这个商品是线下取价的时候 -- - if(item[c].is_offline){ - offline_price+= (item[c].goods_price-item[c].offline_price)*item[c].goods_num; - offline_num+=item[c].goods_num; + var txt = "requestData[" + a + "].selected"; + th.setData({ + [txt]: Number(is_s_sele) + }); + + //当有线下取价的时候 + if(offline_price){ + var txt1= "requestData[" + a + "].offline_price"; + var txt2= "requestData[" + a + "].offline_num"; + th.setData({ + [txt1]: offline_price.toFixed(2), + [txt2]: offline_num, + }); } } + } - var txt = "requestData[" + a + "].selected"; - th.setData({ - [txt]: Number(is_s_sele) - }); + //-- 服务卡 -- + if(car2 && car2.length>0){ + for (var a = 0; a < car2.length; a++) { + var c_item=car2[a]; + var item = car2[a].goods, is_s_sele = 1; + + for (var c = 0; c < item.length; c++) { + if(item[c].is_gift) continue; + all_num += item[c].goods_num; + if (item[c].selected == 0) { + ischeck = 0; + is_s_sele = 0; + } else { + tfeel += item[c].goods_num * item[c].money; + t_num += item[c].goods_num; + } + + } - //当有线下取价的时候 - if(offline_price){ - var txt1= "requestData[" + a + "].offline_price"; - var txt2= "requestData[" + a + "].offline_num"; + var txt = "service_data[" + a + "].selected"; th.setData({ - [txt1]: offline_price.toFixed(2), - [txt2]: offline_num, + [txt]: Number(is_s_sele) }); } - } + this.setData({ checkAllToggle: ischeck, total_fee: tfeel.toFixed(2), @@ -904,6 +1273,20 @@ Page({ }); }, + //----------------------更新购物数量，加减,调用接口--------------------- + postCardList_ser: function(t, item, pitem) { + var e = this,th=e; + var user_id = getApp().globalData.user_id; + var txt = "service_data[" + pitem + "].goods[" + item + "].goods_num"; + e.setData({ + [txt]: t.goods_num + }); + e.doCheckAll(); + e.update_cart_ser(t, pitem, item); + }, + + + //---检验线下库存的数量--- async check_down_line(t, pitem, item,erpwareid){ var ob={},th=this; @@ -993,6 +1376,25 @@ Page({ }); }, + //--更新购物车--- + update_cart_ser: function(t, pitem, item) { + var e = this; + getApp().request.put("/api/weshop/cartService/update", { + data: t, + success:async function(ee) { + var txt = "service_data[" + pitem + "].goods[" + item + "].goods_num"; + e.setData({ + [txt]: t.goods_num, + }); + e.doCheckAll(); + getApp().requestCardNum(e); + } + }); + }, + + + + //-------下拉刷新--------- onPullDownRefresh: function(t) { this.getCardList(); @@ -1008,259 +1410,293 @@ Page({ }) } - var glist = ""; //用逗号隔开的 - var map = new Map(); //使用map值键进行运算 - var map_limit = new Map(); //使用map值键进行存储限购 - var g_arr = new Array(); //已选的商品列表 - var user_id = getApp().globalData.user_id; - var th = this; - //用于判断是不是积分购的普通购买 - var normal_arr={}; - var ab = 0; //选中 - wx.showLoading(); - for (var i = 0; i < this.data.requestData.length; i++) { - var i_arr = this.data.requestData[i].goods; - for (var j = 0; j < i_arr.length; j++) { - if (i_arr[j].selected && i_arr[j].is_gift!=1) { - - if(i_arr[j].is_pd_normal) { - normal_arr[i_arr[j].goods_id]=1; - } - //map 的key是不会重复，会覆盖，， - var ie = { - goods_id: i_arr[j].goods_id, - id: i_arr[j].id, - goods_price: i_arr[j].goods_price, - }; - //判断是不是线下取价 - if(i_arr[j].is_offline){ - ie.is_offline=i_arr[j].is_offline; - ie.offline_price=i_arr[j].offline_price; - ie.pricing_type=i_arr[j].pricing_type; - } - g_arr.push(ie); - - if (map.has(i_arr[j].goods_id + "")) { - var num11 = map.get(i_arr[j].goods_id + ""); - var num22 = parseInt(i_arr[j].goods_num) + parseInt(num11); - map.set(i_arr[j].goods_id + "", num22); - } else { - map.set(i_arr[j].goods_id + "", i_arr[j].goods_num); + var garr=this.data.requestData; + var check_is_goods_selected=0; + if(garr) { + for (var ii in garr) { + for (var ij in garr[ii].goods) { + if (garr[ii].goods[ij].selected) { + check_is_goods_selected = 1; + break; } - glist += i_arr[j].goods_id + ","; - ab = 1; - //--普通商品，如果有开启线下库存的功能，要调用线下库存进行计算,赠品不要进行调用线下库存--- - if((i_arr[j].prom_type==0 || i_arr[j].prom_type==3 || i_arr[j].prom_type==5) && th.data.sales_rules==2 && i_arr[j].is_gift!=1){ - //--获取商品的线下商品ID-- - var gd=null; - await getApp().request.promiseGet("/api/weshop/goods/get/" + oo.stoid + "/" + i_arr[j].goods_id,{}).then(res=>{ - if(res.data.code==0) gd=res.data.data; - }) - //--判断商品是线下库存-- - var ob={} - await th.check_down_line_next(i_arr[j],i,j,gd.erpwareid,function(rs){ - ob=rs; - }); - if(ob.code==-1){ - t.my_warnning(gd.goods_name+"门店库存不足", 0, th); - wx.hideLoading(); - return false; + } + } + } + //-- 如果是商品的结算 -- + if(check_is_goods_selected) { + var glist = ""; //用逗号隔开的 + var map = new Map(); //使用map值键进行运算 + var map_limit = new Map(); //使用map值键进行存储限购 + var g_arr = new Array(); //已选的商品列表 + var user_id = getApp().globalData.user_id; + var th = this; + //用于判断是不是积分购的普通购买 + var normal_arr = {}; + var ab = 0; //选中 + wx.showLoading(); + for (var i = 0; i < this.data.requestData.length; i++) { + var i_arr = this.data.requestData[i].goods; + for (var j = 0; j < i_arr.length; j++) { + if (i_arr[j].selected && i_arr[j].is_gift != 1) { + + if (i_arr[j].is_pd_normal) { + normal_arr[i_arr[j].goods_id] = 1; } - - var is_ok=1; - //如果是优惠活动话，要看活动有没有过期 - if(i_arr[j].prom_type==3){ - //判断有没有活动 - await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+i_arr[j].goods_id+"/1", {}).then(res => { - if(res.data.code==0){ - if(!res.data.data.promGoodsLists){ - t.my_warnning(i_arr[j].goods_name+"优惠活动已经过期", 0, th); - wx.hideLoading(); - is_ok=0; - } - } - }) + //map 的key是不会重复，会覆盖，， + var ie = { + goods_id: i_arr[j].goods_id, + id: i_arr[j].id, + goods_price: i_arr[j].goods_price, + }; + //判断是不是线下取价 + if (i_arr[j].is_offline) { + ie.is_offline = i_arr[j].is_offline; + ie.offline_price = i_arr[j].offline_price; + ie.pricing_type = i_arr[j].pricing_type; } - if(!is_ok){return false;} - } + g_arr.push(ie); + + if (map.has(i_arr[j].goods_id + "")) { + var num11 = map.get(i_arr[j].goods_id + ""); + var num22 = parseInt(i_arr[j].goods_num) + parseInt(num11); + map.set(i_arr[j].goods_id + "", num22); + } else { + map.set(i_arr[j].goods_id + "", i_arr[j].goods_num); + } + glist += i_arr[j].goods_id + ","; + ab = 1; + //--普通商品，如果有开启线下库存的功能，要调用线下库存进行计算,赠品不要进行调用线下库存--- + if ((i_arr[j].prom_type == 0 || i_arr[j].prom_type == 3 || i_arr[j].prom_type == 5) && th.data.sales_rules == 2 && i_arr[j].is_gift != 1) { + //--获取商品的线下商品ID-- + var gd = null; + await getApp().request.promiseGet("/api/weshop/goods/get/" + oo.stoid + "/" + i_arr[j].goods_id, {}).then(res => { + if (res.data.code == 0) gd = res.data.data; + }) + //--判断商品是线下库存-- + var ob = {} + await th.check_down_line_next(i_arr[j], i, j, gd.erpwareid, function (rs) { + ob = rs; + }); + if (ob.code == -1) { + t.my_warnning(gd.goods_name + "门店库存不足", 0, th); + wx.hideLoading(); + return false; + } - } else { - if(i_arr[j].is_gift==1) continue; - rq.put("/api/weshop/cart/update", { - data: { - id: i_arr[j].id, - selected: 0, - store_id: oo.stoid - }, - success: function(ee) { - console.log(ee); + var is_ok = 1; + //如果是优惠活动话，要看活动有没有过期 + if (i_arr[j].prom_type == 3) { + //判断有没有活动 + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + i_arr[j].goods_id + "/1", {}).then(res => { + if (res.data.code == 0) { + if (!res.data.data.promGoodsLists) { + t.my_warnning(i_arr[j].goods_name + "优惠活动已经过期", 0, th); + wx.hideLoading(); + is_ok = 0; + } + } + }) + } + if (!is_ok) { + return false; + } } - }); - } - } - } - if (ab == 0) { - t.my_warnning("未选择商品", 0, th); - wx.hideLoading(); - return false; - } - glist = glist.substring(0, glist.length - 1); - //--取一下商品的限购 以及活动的限购，redis数量-- - rq.get("/api/weshop/goods/getGoodsListNum", { - data: { - goodsidlist: glist, - store_id: oo.stoid - }, - async success(ee) { - console.log(ee); - if (ee.data.code == 0) { - var ddata = ee.data.data, - isok = 1, - gname = "", - err = ""; - //--组装-- - for (var ij = 0; ij < ddata.length; ij++) { - var val = ddata[ij]; - var obj = map_limit.get(val.goods_id + ""); - if (obj) continue; - - var promgoodsbuynum = 0; - var goodsbuynum = 0; - //--要获得商品，该用户买了多少件,同步应用-- - await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", { + } else { + if (i_arr[j].is_gift == 1) continue; + rq.put("/api/weshop/cart/update", { data: { - store_id: oo.stoid, - user_id: user_id, - goods_id: val.goods_id, - prom_type: val.prom_type, - prom_id: val.prom_id + id: i_arr[j].id, + selected: 0, + store_id: oo.stoid }, - }).then(res => { - var buy_num_data = res.data.data; - if (buy_num_data.promgoodsbuynum) promgoodsbuynum = buy_num_data.promgoodsbuynum; - goodsbuynum = buy_num_data.goodsbuynum; - }) - var ie= { - promgoodsbuynum: promgoodsbuynum, - goodsbuynum: goodsbuynum - }; - map_limit.set(val.goods_id + "", ie); + success: function (ee) { + console.log(ee); + } + }); } + } + } + if (ab == 0) { + t.my_warnning("未选择商品", 0, th); + wx.hideLoading(); + return false; + } - try { - for(var ind in ddata) { - var val=ddata[ind]; - var num = map.get(val.goods_id + ""); - if (num <= 0) { - isok = 0; - gname = val.goods_name; - throw "购买数量不能为0"; - return false; - } + glist = glist.substring(0, glist.length - 1); + //--取一下商品的限购 以及活动的限购，redis数量-- + rq.get("/api/weshop/goods/getGoodsListNum", { + data: { + goodsidlist: glist, + store_id: oo.stoid + }, + async success(ee) { + console.log(ee); + if (ee.data.code == 0) { + var ddata = ee.data.data, + isok = 1, + gname = "", + err = ""; + //--组装-- + for (var ij = 0; ij < ddata.length; ij++) { + var val = ddata[ij]; + var obj = map_limit.get(val.goods_id + ""); + if (obj) continue; + + var promgoodsbuynum = 0; + var goodsbuynum = 0; + //--要获得商品，该用户买了多少件,同步应用-- + await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", { + data: { + store_id: oo.stoid, + user_id: user_id, + goods_id: val.goods_id, + prom_type: val.prom_type, + prom_id: val.prom_id + }, + }).then(res => { + var buy_num_data = res.data.data; + if (buy_num_data.promgoodsbuynum) promgoodsbuynum = buy_num_data.promgoodsbuynum; + goodsbuynum = buy_num_data.goodsbuynum; + }) + var ie = { + promgoodsbuynum: promgoodsbuynum, + goodsbuynum: goodsbuynum + }; + map_limit.set(val.goods_id + "", ie); + } - if(val.prom_type==1 || val.prom_type==6){ - if (num > val.store_count) { + try { + for (var ind in ddata) { + var val = ddata[ind]; + var num = map.get(val.goods_id + ""); + if (num <= 0) { isok = 0; gname = val.goods_name; - throw "超出库存"; + throw "购买数量不能为0"; return false; } - } - if(th.data.sales_rules!=2){ - if (num > val.store_count) { + if (val.prom_type == 1 || val.prom_type == 6) { + if (num > val.store_count) { + isok = 0; + gname = val.goods_name; + throw "超出库存"; + return false; + } + } + + if (th.data.sales_rules != 2) { + if (num > val.store_count) { + isok = 0; + gname = val.goods_name; + throw "超出库存"; + return false; + } + } + + if (num > val.redisnum && val.redisnum && !normal_arr[val.goods_id]) { isok = 0; gname = val.goods_name; - throw "超出库存"; + throw "超出活动库存"; + return false; + } + if (num > val.goods_num - val.buy_num && val.goods_num && !normal_arr[val.goods_id]) { + isok = 0; + gname = val.goods_name; + throw "超出活动库存"; return false; } - } - - if (num > val.redisnum && val.redisnum && !normal_arr[val.goods_id]) { - isok = 0; - gname = val.goods_name; - throw "超出活动库存"; - return false; - } - if (num > val.goods_num - val.buy_num && val.goods_num && !normal_arr[val.goods_id]) { - isok = 0; - gname = val.goods_name; - throw "超出活动库存"; - return false; - } - - var buyed = map_limit.get(val.goods_id + ""); - if (num + buyed.goodsbuynum > val.viplimited && val.viplimited > 0) { - isok = 0; - gname = val.goods_name; - throw "超出商品限购"; - return false; - } - - if (num + buyed.promgoodsbuynum > val.buy_limit && val.buy_limit > 0 && !normal_arr[val.goods_id]) { - isok = 0; - gname = val.goods_name; - throw "超出活动限购"; - return false; - } + var buyed = map_limit.get(val.goods_id + ""); + if (num + buyed.goodsbuynum > val.viplimited && val.viplimited > 0) { + isok = 0; + gname = val.goods_name; + throw "超出商品限购"; + return false; + } - var card_field=th.data.card_field; - for (var i = 0; i < g_arr.length; i++) { - if (g_arr[i].goods_id == val.goods_id) { + if (num + buyed.promgoodsbuynum > val.buy_limit && val.buy_limit > 0 && !normal_arr[val.goods_id]) { + isok = 0; + gname = val.goods_name; + throw "超出活动限购"; + return false; + } - //如果会员是等级会员,商品有等级价,且不是活动商品 - if(card_field && val[card_field]>0 && (val.prom_type==0 || val.prom_type==3 || val.prom_type==4 || val.prom_type==5 || normal_arr[val.goods_id]) ){ - if (g_arr[i].goods_price != val[card_field]){ - isok = 0; - gname = val.goods_name; - throw "商品价格已经变化"; - } - }else{ - if (g_arr[i].goods_price != val.shop_price && g_arr[i].goods_price != val.prom_price) { - isok = 0; - gname = val.goods_name; - throw "商品价格已经变化"; + var card_field = th.data.card_field; + for (var i = 0; i < g_arr.length; i++) { + if (g_arr[i].goods_id == val.goods_id) { + + //如果会员是等级会员,商品有等级价,且不是活动商品 + if (card_field && val[card_field] > 0 && (val.prom_type == 0 || val.prom_type == 3 || val.prom_type == 4 || val.prom_type == 5 || normal_arr[val.goods_id])) { + if (g_arr[i].goods_price != val[card_field]) { + isok = 0; + gname = val.goods_name; + throw "商品价格已经变化"; + } + } else { + if (g_arr[i].goods_price != val.shop_price && g_arr[i].goods_price != val.prom_price) { + isok = 0; + gname = val.goods_name; + throw "商品价格已经变化"; + } } - } - //-- 数据的更新 -- - var data={ - id: g_arr[i].id, - selected: 1, - store_id: oo.stoid - }; - //-- 如果有线下取价的时候 -- - if(g_arr[i].is_offline){ - data.pricing_type=g_arr[i].pricing_type; - data.offline_price=g_arr[i].offline_price; - } - rq.put("/api/weshop/cart/update", { - data: data, - success: function(ee) { - console.log(ee); + //-- 数据的更新 -- + var data = { + id: g_arr[i].id, + selected: 1, + store_id: oo.stoid + }; + //-- 如果有线下取价的时候 -- + if (g_arr[i].is_offline) { + data.pricing_type = g_arr[i].pricing_type; + data.offline_price = g_arr[i].offline_price; } - }); + rq.put("/api/weshop/cart/update", { + data: data, + success: function (ee) { + console.log(ee); + } + }); + } } - } + } + } catch (e) { + err = e; + } + if (isok == 0) { + t.confirmBox(gname + ":" + err); + wx.hideLoading(); + return false; } - } catch (e) { - err = e; - } - if (isok == 0) { - t.confirmBox(gname + ":" + err); wx.hideLoading(); - return false; + wx.navigateTo({ + url: "/pages/cart/cart2/cart2" + }); + } + } + }); + }else{ + //-- 开始服务卡的购物车购买 -- + for (var i = 0; i < this.data.service_data.length; i++) { + var i_arr = this.data.service_data[i].goods; + for (var j = 0; j < i_arr.length; j++) { + if (i_arr[j].selected) { + await rq.promisePut("/api/weshop/cartService/update", { + data: { + id: i_arr[j].id, + selected: 1, + store_id: oo.stoid + } + }); } - wx.hideLoading(); - wx.navigateTo({ - url: "/pages/cart/cart2/cart2" - }); } } - }); + wx.hideLoading(); + getApp().goto("/packageA/pages/cart2_ser/cart2_ser?is_cart=1"); + } }, //结算到最后一个商品 @@ -1302,11 +1738,12 @@ Page({ //--多个删除购物车商品--- check_del: function() { - var glist = ""; //用逗号隔开的 + var glist = "",slist=''; //用逗号隔开的 var user_id = getApp().globalData.user_id; var th = this; var ab = 0; //选中 + var abc=0; // for (var i = 0; i < this.data.requestData.length; i++) { var i_arr = this.data.requestData[i].goods; for (var j = 0; j < i_arr.length; j++) { @@ -1317,18 +1754,42 @@ Page({ } } - if (ab == 0) { - t.my_warnning("未选择商品", 0, th); + for (var ii = 0; ii < this.data.service_data.length; ii++) { + var i_arr = this.data.service_data[ii].goods; + for (var jj = 0; jj < i_arr.length; jj++) { + if (i_arr[jj].selected) { + slist += i_arr[jj].id + ","; + abc = 1; + } + } + } + + if (ab == 0 && abc==0) { + t.my_warnning("未选择商品或者服务卡", 0, th); return false; } - glist = glist.substring(0, glist.length - 1); - //要删除购物车中的商品 - var url = '/api/weshop/cart/delIds/' + oo.stoid + '/' + user_id + "/" + glist; - getApp().request.delete(url, { - success: function(t) { - th.getCardList(); - } - }); + + if(ab){ + glist = glist.substring(0, glist.length - 1); + //要删除购物车中的商品 + var url = '/api/weshop/cart/delIds/' + oo.stoid + '/' + user_id + "/" + glist; + getApp().request.delete(url, { + success: function(t) { + th.getCardList(); + } + }); + } + if(abc){ + slist = slist.substring(0, slist.length - 1); + //要删除购物车中的商品 + var url = '/api/weshop/cartService/delIds/' + oo.stoid + '/' + user_id + "/" + slist; + getApp().request.delete(url, { + success: function(t) { + th.getCardList(); + } + }); + } + }, //跳到首页 goto: function(e) { @@ -1338,7 +1799,7 @@ Page({ //---加载更多是靠这个函数---- onReachBottom: function() { - if(this.data.requestData.length==0) { + if(this.data.requestData && this.data.requestData.length==0) { var goods_list = this.selectComponent("#goods_list"); //组件的id if (goods_list) goods_list.get_list(); } diff --git a/pages/cart/cart/cart.wxml b/pages/cart/cart/cart.wxml index 4648b52..0c90842 100644 --- a/pages/cart/cart/cart.wxml +++ b/pages/cart/cart/cart.wxml @@ -13,19 +13,22 @@ - + @@ -156,7 +224,7 @@ - + @@ -169,7 +237,7 @@ - + diff --git a/pages/cart/cart/cart.wxss b/pages/cart/cart/cart.wxss index 36e86e1..a1602a5 100644 --- a/pages/cart/cart/cart.wxss +++ b/pages/cart/cart/cart.wxss @@ -352,3 +352,4 @@ page { } .quan_color{ background-color: #ff5306; height: 40rpx;color: #fff; padding: 0 10rpx; border-radius: 10rpx; margin-left: 10rpx} .red_c{color:#ff5306} +.title_show{ margin: 10rpx 0 10px 0;padding: 0 20rpx} diff --git a/pages/cart/cart2/cart2.js b/pages/cart/cart2/cart2.js index 7fc7652..deebde2 100644 --- a/pages/cart/cart2/cart2.js +++ b/pages/cart/cart2/cart2.js @@ -222,6 +222,7 @@ Page({ //先获取是否有关闭使用优惠券 getApp().getConfig2(function (ee) { var json_d = JSON.parse(ee.switch_list); + th.data.json_d=json_d; th.data.ispt_goods=json_d.ispt_goods; //是不是平摊到单品的控制参数赋值 th.setData({ is_close_quan: json_d.is_close_quan,sales_rules:ee.sales_rules,rank_switch:json_d.rank_switch}); @@ -266,7 +267,7 @@ Page({ th.get_wuliu(th.get_info(th.show_page)); } - }) + },1); //值在这里换 getApp().globalData.plus_buy_back=0; @@ -442,7 +443,10 @@ Page({ } var e_t=0 switch (arr[j].distr_t) { - case 0: e_t = 1; break; + case 0: + e_t = 1; + if(th.data.json_d.pickupway && th.data.json_d.pickupway==1) e_t=0; + break; case 1: e_t = 1; break; case 2: e_t = 0; break; } @@ -472,7 +476,11 @@ Page({ dis_t = item.distr_type ; } switch (dis_t) { - case 0: e_t = 1; break; + case 0: + e_t = 1; + //-- 系统后台有设置要默认的 -- + if(th.data.json_d.pickupway && th.data.json_d.pickupway==1) e_t=0; + break; case 1: e_t = 1; break; case 2: e_t = 0; break; } @@ -571,8 +579,13 @@ Page({ }else{ distr_t = t.data.data.distr_type; } + switch (distr_t){ - case 0: et=1; break; + case 0: + et=1; + //-- 系统后台有设置要默认的 -- + if(th.data.json_d.pickupway && th.data.json_d.pickupway==1) et=0; + break; case 1: et = 1; break; case 2: et = 0; break; } @@ -3023,7 +3036,7 @@ Page({ arr[ind].check_quan_price_list=check_quan_price_list; //是否关闭使用优惠券 - if (th.data.is_close_quan != 1 && !is_xz_yh && check_quan_ware_list && check_quan_ware_list!="") { + if (th.data.is_close_quan != 1 && !is_xz_yh) { //--调用接口，获取优惠券的列表，3秒钟内控制接口请求-- var url="/api/weshop/couponList/getUseCouponList"; await app.request.promiseGet(url,{ data:{storeId:oo.stoid,userId:app.globalData.user_id,BuySum:ckeck_quan_price,WareIds:check_quan_ware_list,pageSize:100}}).then(res=>{ @@ -3059,7 +3072,7 @@ Page({ th.data.ckeck_quan_price=good.offline_price; //如果有线下取价，就用线下价 } //--如果商家后台没有限制使用优惠券，同时商品的优惠活动没有限制使用优惠券-- - if(th.data.is_close_quan != 1 && th.data.bn_goods.is_xz_yh!=1 && th.data.check_quan_ware_list && th.data.check_quan_ware_list!='') + if(th.data.is_close_quan != 1 && th.data.bn_goods.is_xz_yh!=1) { var url0 = "/api/weshop/users/frozenQuan/listFrozenQuan/" + app.globalData.user_id; var url="/api/weshop/couponList/getUseCouponList"; diff --git a/pages/cart/cart2_inte/cart2_inte.js b/pages/cart/cart2_inte/cart2_inte.js index a84df74..50de9a3 100644 --- a/pages/cart/cart2_inte/cart2_inte.js +++ b/pages/cart/cart2_inte/cart2_inte.js @@ -92,6 +92,7 @@ Page({ //先获取是否有关闭使用优惠券 getApp().getConfig2(function (ee) { var json_d = JSON.parse(ee.switch_list); + th.data.json_d=json_d; th.data.ispt_goods=json_d.ispt_goods; //是不是平摊到单品的控制参数赋值 th.setData({ is_close_quan: json_d.is_close_quan,sales_rules:ee.sales_rules,rank_switch:json_d.rank_switch}); @@ -135,7 +136,7 @@ Page({ //-----先获取物流，再获取用户信息，再展示页面----- th.get_wuliu(th.get_info(th.show_page)); } - }) + },1); }, @@ -302,7 +303,11 @@ Page({ distr_t = t.data.data.distr_type; } switch (distr_t){ - case 0: et=1; break; + case 0: + et=1; + //-- 系统后台有设置要默认的 -- + if(th.data.json_d.pickupway && th.data.json_d.pickupway==1) et=0; + break; case 1: et = 1; break; case 2: et = 0; break; } diff --git a/pages/cart/cart2_pt/cart2_pt.js b/pages/cart/cart2_pt/cart2_pt.js index 533dac2..78d189b 100644 --- a/pages/cart/cart2_pt/cart2_pt.js +++ b/pages/cart/cart2_pt/cart2_pt.js @@ -177,6 +177,8 @@ Page({ switch (distr_t) { case 0: et = 1; + //-- 系统后台有设置要默认的 -- + if(th.data.json_d.pickupway && th.data.json_d.pickupway==1) et=0; break; case 1: et = 1; @@ -302,6 +304,7 @@ Page({ //先获取是否有关闭使用优惠券 getApp().getConfig2(function (ee) { var json_d = JSON.parse(ee.switch_list); + th.data.json_d=json_d; th.data.ispt_goods=json_d.ispt_goods; //是不是平摊到单品的控制参数赋值 th.setData({ is_close_quan: json_d.is_close_quan,sales_rules:ee.sales_rules,rank_switch:json_d.rank_switch}); @@ -345,7 +348,7 @@ Page({ //-----先获取物流，再获取用户信息，再展示页面----- th.get_wuliu(th.get_info(th.show_page)); } - }) + },1) }, diff --git a/pages/cart/cart_wk/cart_wk.js b/pages/cart/cart_wk/cart_wk.js index 2924b15..8487f2e 100644 --- a/pages/cart/cart_wk/cart_wk.js +++ b/pages/cart/cart_wk/cart_wk.js @@ -54,7 +54,12 @@ Page({ var th = this; this.data.order_id = options.order_id; //--初始化-- - this.get_wuliu(th.get_info(th.show_page)); + getApp().getConfig2(function (e){ + var json_d = JSON.parse(e.switch_list); + th.data.json_d=json_d; + th.get_wuliu(th.get_info(th.show_page)); + },1) + }, /** * 生命周期函数--监听页面显示 @@ -240,9 +245,12 @@ Page({ switch (distr_type) { case 0: exp_type = 1; + //-- 系统后台有设置要默认的 -- + if(th.data.json_d.pickupway && th.data.json_d.pickupway==1) exp_type=0; break; //自选 case 1: exp_type = 1; + break //自提 case 2: exp_type = 0; diff --git a/pages/giftpack/buygiftpack/giftpackbuy.js b/pages/giftpack/buygiftpack/giftpackbuy.js index a699bee..0d83ba4 100644 --- a/pages/giftpack/buygiftpack/giftpackbuy.js +++ b/pages/giftpack/buygiftpack/giftpackbuy.js @@ -30,13 +30,8 @@ Page({ onLoad: function(options) { var th = this; - setTimeout(function (){ - var my_confirm = th.selectComponent("#my_confirm"); //组件的id - my_confirm.open_cancel(0); - },1000) - - - + var my_confirm = th.selectComponent("#my_confirm"); //组件的id + my_confirm.open_cancel(0); th.setData({ getStorageID: a.stoid, getUserID: d.user_id @@ -163,7 +158,7 @@ Page({ var json = { "actId": '', //活动Id "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销 - "buyType": '1', //1=积分兑换 2=余额购买 + "buyType": '1', //1=积分兑换 2=余额购买 3=免费领取 "giftBagId": id, //礼包Id "storeId": that.getStorageID, //商家Id "userId": that.getUserID, //用户ID @@ -174,8 +169,7 @@ Page({ if(getApp().globalData.guide_id){ json.guide_id=getApp().globalData.guide_id; } - - + var data = JSON.stringify(json); var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert"; getApp().request.json_post(url, json, @@ -186,15 +180,53 @@ Page({ getApp().my_warnning(res.data.msg, 0, th); } }, - function(res) { - - } - - ) + function(res) {}) }) }, + //免费领取 + GetFree:function (e){ + var that = this.data; + var th = this; + var id = e.currentTarget.dataset.id; //活动id + var my_confirm = th.selectComponent("#my_confirm"); //组件的id + my_confirm.open( + "是否确定领取该礼包", + "取消", + "确定", + function() { + my_confirm.open_cancel(0); + }, + function() { + my_confirm.open_cancel(0); + var json = { + "actId": '', //活动Id + "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销 + "buyType": '3', //1=积分兑换 2=余额购买 3=免费领取 + "giftBagId": id, //礼包Id + "storeId": that.getStorageID, //商家Id + "userId": that.getUserID, //用户ID + "buyFrom": 2 + }; + //-- 分享导购要记录 -- + if(getApp().globalData.guide_id){ + json.guide_id=getApp().globalData.guide_id; + } + var data = JSON.stringify(json); + var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert"; + getApp().request.json_post(url, json, + function(res) { + if (res.data.code == 0) { + getApp().my_warnning("领取成功！", 1, th); + } else { + getApp().my_warnning(res.data.msg, 0, th); + } + }, + function(res) {}) + }) + }, + getList: function(e) { var th = this; getApp().request.get('/api/weshop/marketing/giftbag/page', { diff --git a/pages/giftpack/buygiftpack/giftpackbuy.wxml b/pages/giftpack/buygiftpack/giftpackbuy.wxml index 6b36821..e711329 100644 --- a/pages/giftpack/buygiftpack/giftpackbuy.wxml +++ b/pages/giftpack/buygiftpack/giftpackbuy.wxml @@ -84,6 +84,12 @@ + + + + + + diff --git a/pages/giftpack/giftpacklist/giftpacklist.js b/pages/giftpack/giftpacklist/giftpacklist.js index 9438489..53b28b0 100644 --- a/pages/giftpack/giftpacklist/giftpacklist.js +++ b/pages/giftpack/giftpacklist/giftpacklist.js @@ -202,6 +202,7 @@ Page({ }, + GetMyGiftList: function() { var _this = this; var th = this; @@ -419,6 +420,61 @@ Page({ } }, + //免费领取 + GetFree: function(e) { + var that = this.data; + var th = this; + + //如果还没有开始的话 + if(th.data.isStart!=1){ + getApp().my_warnning("活动还没有开始", 0, th); + return false; + } + // var id = e.currentTarget.dataset.id;//活动id + var my_confirm = th.selectComponent("#my_confirm"); //组件的id + my_confirm.open( + "是否确定领取该礼包", + "取消", + "确定", + function() { + my_confirm.open_cancel(0); + }, + function() { + my_confirm.open_cancel(0); + var json = { + "actId": '', //活动Id + "actType": '', //活动类型 1:新人礼、2:评价有礼、3:节日营销、4:生日营销 + "buyType": '3', //1=积分兑换 2=余额购买 + "giftBagId": that.getGiftID, //礼包Id + "storeId": a.stoid, //商家ID + "userId": d.user_id, //用户ID + "buyFrom":2 + }; + + //-- 分享导购要记录 -- + if(getApp().globalData.guide_id){ + json.guide_id=getApp().globalData.guide_id; + } + + + var data = JSON.stringify(json); + var url = that.url + "/api/weshop/marketing/buy/receive/gift/record/insert"; + getApp().request.json_post(url, json, + function(res) { + if (res.data.code == 0) { + getApp().my_warnning("领取成功！", 1, th); + } else { + getApp().my_warnning(res.data.msg, 0, th); + } + }, + function(res) {} + + ) + }) + + + }, + }); \ No newline at end of file diff --git a/pages/giftpack/giftpacklist/giftpacklist.wxml b/pages/giftpack/giftpacklist/giftpacklist.wxml index 2fb5f60..42fac24 100644 --- a/pages/giftpack/giftpacklist/giftpacklist.wxml +++ b/pages/giftpack/giftpacklist/giftpacklist.wxml @@ -117,12 +117,10 @@ - + 立即购买 - - 立即兑换 @@ -137,6 +135,14 @@ 立即兑换 + + + + 免费领取 + + + + diff --git a/pages/goods/goodsInfo/goodsInfo.js b/pages/goods/goodsInfo/goodsInfo.js index fd5a67f..412d9ec 100644 --- a/pages/goods/goodsInfo/goodsInfo.js +++ b/pages/goods/goodsInfo/goodsInfo.js @@ -63,7 +63,7 @@ Page({ name: "详情", id: 1 }, { - name: "评论", + name: "评价", id: 2 }], activeCategoryId2: 0, @@ -1439,6 +1439,7 @@ Page({ } } }); + } //else "exchange" == t.currentTarget.dataset.action ? this.exchange(d) : this.buyNow(d); else { @@ -1719,18 +1720,63 @@ Page({ } var ind = t.currentTarget.dataset.ind; - this.setData({ - openSpecModal: !0, - openSpecModal_ind: ind, - }); - - var is_open=th.data.config - - - this.get_off_price(); + //回调。判断是不是优惠促销 + th.check_is_prom_goods(function (){ + th.setData({ + openSpecModal: !0, + openSpecModal_ind: ind, + }); + //var is_open=th.data.config + th.get_off_price(); + }) + }, + + //判断是不是优惠促销 + check_is_prom_goods:function(callback){ + var th=this; + var usr=getApp().globalData.userInfo; + if(this.data.sele_g.prom_type!=0 && this.data.sele_g.prom_type!=3){ + callback(); + }else{ + //-- 判断有没有优惠活动 -- + getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+th.data.sele_g.goods_id+"/0", {}).then(res => { + if(res.data.code==0){ + var r_data=res.data.data; + th.data.prom_goods=r_data.promGoodsLists; + if(!th.data.prom_goods){ + callback(); + return false; + } + + ///api/weshop/order/getWPayOrder?store_id=1&user_id=5682366&prom_id=1&goods_id=1 + getApp().promiseGet("/api/weshop/order/getWPayOrder",{ + data:{store_id:os.stoid,user_id:usr.user_id,goods_id:th.data.sele_g.goods_id,prom_id:th.data.prom_goods[0].prom_id} + }).then(res=>{ + if(res.data.code==0){ + wx.showToast({ + title: "您已经购买了该商品待支付中", + icon: 'none', + duration: 2000 + }) + setTimeout(function (){ + getApp().goto("/pages/user/order_detail/order_detail?order_id=" + res.data.data.order_id,) + },1000) + } + //未找到相关记录 + else{ + callback(); + } + }) + } + + }) + + } }, + + //----获取线下价格------- get_off_price(){ var th=this; @@ -1881,9 +1927,19 @@ Page({ for (var i = 0; i < e.data.data.pageData.length; i++) { num += e.data.data.pageData[i].goods_num; } - t.setData({ - cartGoodsNum: num - }); + + //-- 读取服务卡的数量 -- + getApp().promiseGet("/api/weshop/cartService/page",{ + data:{ + store_id: s.globalData.setting.stoid, + user_id: s.globalData.user_id, + } + }).then(res=>{ + for (var i = 0; i < res.data.data.pageData.length; i++) { + num += res.data.data.pageData[i].goods_num; + } + t.setData({cartGoodsNum:num}); + }) } }); }, @@ -1945,9 +2001,12 @@ Page({ } var title= th.data.data.goods_name; var img=th.data.data.original_img; - if(th.data.prom_type==6){ + if(th.data.prom_type==6 || th.data.prom_type==1){ + title=th.data.prom_act.share_title; - img=th.data.iurl+th.data.prom_act.share_imgurl; + if(!title) title=th.data.prom_act.title; + if(th.data.prom_act.share_imgurl) + img=th.data.iurl+th.data.prom_act.share_imgurl; } @@ -3038,7 +3097,8 @@ Page({ pageSize: 3, page: 1, state: 2, - team_id: prom_id + team_id: prom_id, + ordernum:1 } }).then(res => { teamgroup = res.data.data.pageData; @@ -3917,14 +3977,19 @@ Page({ context.setFillStyle("white"); context.fillText('强烈推荐', 149 * unit + width + 15 * unit, 75 * unit); } - - + + var share_title=th.data.data.goods_name; + if(th.data.prom_type==1 || th.data.prom_type==4){ + share_title=th.data.prom_act.share_title; + if(!share_title) share_title=th.data.prom_act.title; + } + //---产品名称--- //文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度 if(type!=4){ context.setFillStyle("black"); context.setFontSize(21.3 * unit) - th.draw_Text(context, th.data.data.goods_name, + th.draw_Text(context, share_title, 38 * unit, 180 * unit, 200 * unit, 279 * unit, unit); //------产品的价格------- context.setFontSize(23 * unit) @@ -4385,18 +4450,23 @@ Page({ tt(); return false; } + + var img_url=ee.data.data.original_img; + if((this.data.prom_type==1 && this.data.prom_type==6) || this.data.prom_act.share_imgurl){ + img_url=this.data.iurl+this.data.prom_act.share_imgurl; + } + //获取商品是分享图信息 wx.getImageInfo({ - src: ee.data.data.original_img, + src: img_url, success: function(res) { - //res.path是网络图片的本地地址 - ee.data.share_goods_img = res.path; - tt(); + //res.path是网络图片的本地地址 + ee.data.share_goods_img = res.path; + tt(); }, fail: function(res) { - - ee.data.share_goods_img = "../../../images/share/default_g_img.gif"; //分享的图片不能用网络的 - tt(); + ee.data.share_goods_img = "../../../images/share/default_g_img.gif"; //分享的图片不能用网络的 + tt(); } }); }, @@ -4916,13 +4986,16 @@ Page({ var arr = [1219, 2089, 3031]; var new_arr = new Array(); var card_name_map=new Map(); - for (var i = 0; i < plusCard.length; i++) { - if((user.card_field==null || user.card_field=="") && plusCard[i].IsStopBuy==true) continue; + + var list=[]; + for (var i = 0; i < plusCard.length; i++) { + if((!user || user.card_field==null || user.card_field=="") && plusCard[i].IsStopBuy==true) continue; var name="card"+plusCard[i].CorrPrice.toLowerCase(); card_name_map.set(name,plusCard[i].CardName); + list.push(plusCard[i]); } - - var ob={"card_list":plusCard,"name_map":card_name_map}; + + var ob={"card_list":list,"name_map":card_name_map}; func(ob); }) }, diff --git a/pages/goods/goodsInfo/goodsInfo.wxml b/pages/goods/goodsInfo/goodsInfo.wxml index c063e07..a5d479c 100644 --- a/pages/goods/goodsInfo/goodsInfo.wxml +++ b/pages/goods/goodsInfo/goodsInfo.wxml @@ -298,7 +298,7 @@ - + @@ -315,7 +315,7 @@ - + - {{item.content?item.content:''}} + {{item.content?item.content:'此用户没有填写评价。'}} {{item.add_time}} @@ -795,7 +795,7 @@ - {{item.content?item.content:''}} + {{item.content?item.content:'此用户没有填写评价。'}} 全部显示 diff --git a/pages/index/index/index.js b/pages/index/index/index.js index 3032a36..f653c44 100644 --- a/pages/index/index/index.js +++ b/pages/index/index/index.js @@ -90,7 +90,13 @@ Page({ var th = this; var first_leader=tt.first_leader; if(!first_leader && tt.scene){ - first_leader= decodeURIComponent(tt.scene); + var first_leader_str= decodeURIComponent(tt.scene); + var f_arr=first_leader_str.split("_"); + first_leader=f_arr[0] && parseFloat(f_arr[0])>0?f_arr[0]:null; + //注册门店 + if(f_arr[1] && parseFloat(f_arr[1])>0){ + getApp().globalData.store_number=f_arr[1]; + } } getApp().getConfig(function(e){ @@ -107,8 +113,7 @@ Page({ }); - var th = this; - + var th = this; getApp().getConfig2(function(config2){ if(config2 && config2.is_overdue==1){ getApp().promiseGet("/store/storemoduleendtime/page?store_id=" +os.stoid + "&type=5",{}).then(res=>{ @@ -346,14 +351,10 @@ Page({ //当隐藏的时候就关闭计时器 onHide: function() { this.data.is_timer = 0; - clearInterval(this.data.pt_timer); - clearInterval(this.data.w_holiday_pop); - clearInterval(this.data.full_screen); - + if(this.data.pt_timer) clearInterval(this.data.pt_timer); + if(this.data.w_holiday_pop) clearInterval(this.data.w_holiday_pop); + if(this.data.full_screen) clearInterval(this.data.full_screen); this.data.w_holiday_pop=0; - for(var i = 1; i < 100; i++) { - clearInterval(i); - } }, diff --git a/pages/index/index/index.json b/pages/index/index/index.json index c72cf2b..6b17f42 100644 --- a/pages/index/index/index.json +++ b/pages/index/index/index.json @@ -18,6 +18,7 @@ "mvideo": "/components/diy_video/diy_video", "service": "/components/diy_service/diy_service", "scan": "/components/diy_scan/diy_scan", + "full_screen": "/components/full_screen/full_screen", "store_select": "/components/diy_store_select/diy_store_select" }, "enablePullDownRefresh": false diff --git a/pages/team/team_more/team_more.js b/pages/team/team_more/team_more.js index 22b7c4d..175e229 100644 --- a/pages/team/team_more/team_more.js +++ b/pages/team/team_more/team_more.js @@ -62,7 +62,7 @@ Page({ //获取活动从表信息team_id await getApp().request.promiseGet("/api/weshop/teamgroup/page", { data: { store_id: os.stoid, pageSize:6,page:ee.data.currentPage, - state: 2, team_id: team_id } + state: 2, team_id: team_id,ordernum:1 } }).then(res => { teamgroup = res.data.data.pageData; console.log(teamgroup); diff --git a/pages/togoin/togoin.js b/pages/togoin/togoin.js index 2fd2442..bd3d1d3 100644 --- a/pages/togoin/togoin.js +++ b/pages/togoin/togoin.js @@ -172,6 +172,11 @@ Page({ dd.guide_id=getApp().globalData.guide_id; } + //门店的扫描识别码 + if(getApp().globalData.store_number){ + dd.SunCode=encodeURIComponent(getApp().globalData.store_number.trim()); + } + console.log("-----会员注册的信息-------"); console.log(dd); app.request.get("/api/weshop/users/thirdLogin", { @@ -183,51 +188,28 @@ Page({ } else { return app.showWarning("授权登入失败！"+e.data.msg); } - + + var need_go=0; - var tuser=e.data.data; + var t_user=e.data.data; + wx.setStorageSync("userinfo",e.data.data); wx.setStorageSync("isAuth", !0), app.globalData.userInfo = e.data.data, app.globalData.userInfo.head_pic = t.getFullUrl(a.globalData.userInfo.head_pic); - //获取一下线下的真实资料 - let url3 = '/api/weshop/users/getERPUser/'; - url3 += os.stoid + "/" +tuser.user_id; - getApp().promiseGet(url3,{}).then(res=>{ - - if(res.data.code == 0) { - let t_user = res.data.data; - //如果有需要完善的信息没有完善，就需要跳转 - if (!t_user['vipname'] && th.data.name_need_go) { - need_go = 1; - } - if (!t_user['birthday'] && th.data.birth_need_go) { - need_go = 1; - } - if (!t_user['idcard'] && th.data.idcard_need_go) { - need_go = 1; - } - if (!t_user['address'] && th.data.address_need_go) { - need_go = 1; - } - if (!t_user['pickup_id'] && th.data.pick_need_go) { - need_go = 1; - } - if (!t_user['sex'] && th.data.sex_need_go) { - need_go = 1; - } - if (!t_user['fromuser_id'] && th.data.introducer_need_go) { - need_go = 1; - } - - if (need_go) { - getApp().goto("/packageA/pages/profile/profile"); - } else { - wx.navigateBack({delta: 1}) - } - } - }) - - + //如果有需要完善的信息没有完善，就需要跳转 + if(!t_user['vipname'] && th.data.name_need_go){ need_go=1;} + if(!t_user['birthday'] && th.data.birth_need_go){ need_go=1;} + if(!t_user['idcard'] && th.data.idcard_need_go){ need_go=1;} + if(!t_user['address'] && th.data.address_need_go){ need_go=1;} + if(!t_user['pickup_id'] && th.data.pick_need_go){ need_go=1;} + if(!t_user['sex'] && th.data.sex_need_go){ need_go=1;} + if(!t_user['fromuser_id'] && th.data.introducer_need_go){ need_go=1;} + + if(need_go){ + getApp().goto("/packageA/pages/profile/profile"); + }else{ + wx.navigateBack({ delta: 1}) + } }, failStatus: function (t) { diff --git a/pages/togoin/togoin.wxml b/pages/togoin/togoin.wxml index 216e723..7e8cb46 100644 --- a/pages/togoin/togoin.wxml +++ b/pages/togoin/togoin.wxml @@ -19,7 +19,7 @@ @@ -29,7 +29,7 @@ diff --git a/pages/user/cardinfo/cardinfo.js b/pages/user/cardinfo/cardinfo.js index cc49576..34da177 100644 --- a/pages/user/cardinfo/cardinfo.js +++ b/pages/user/cardinfo/cardinfo.js @@ -876,7 +876,21 @@ Page({ //显示弹出框 show_change:function () { this.setData({is_show_change_pop:1}); }, //关闭弹出框 - close_card_change_pop:function () { this.setData({is_show_change_pop:0}); } + close_card_change_pop:function () { this.setData({is_show_change_pop:0}); }, + + + /** + * 点击跳转 + */ + goto(e) { + let url = ''; + if(e.target.dataset.url) { + url = e.target.dataset.url; + } else { + url = e.currentTarget.dataset.url; + } + t.goto(url); + }, diff --git a/pages/user/cardinfo/cardinfo.wxml b/pages/user/cardinfo/cardinfo.wxml index e21972f..bbdb261 100644 --- a/pages/user/cardinfo/cardinfo.wxml +++ b/pages/user/cardinfo/cardinfo.wxml @@ -28,6 +28,7 @@ 卡类升级 + 购卡明细 diff --git a/pages/user/index/index.js b/pages/user/index/index.js index 96e2a61..7793a2d 100644 --- a/pages/user/index/index.js +++ b/pages/user/index/index.js @@ -95,6 +95,15 @@ Page({ * 生命周期函数--监听页面显示 */ onShow: function() { + var th=this; + getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + os.stoid, {}).then(res => { + if(res.data.code==0){ + var plusCard = res.data.data; + for (var i = 0; i < plusCard.length; i++) { + if(!plusCard[i].IsStopBuy) { th.setData({show_buy_plus:1}); break; } + } + } + }) if (typeof this.getTabBar === 'function' && this.getTabBar()) { var index=getApp().getPageIndex(this); @@ -595,7 +604,7 @@ Page({ switch (no) { case "01": - getApp().goto("/pages/user/user_coupon/user_coupon?img=" + + getApp().goto("/packageB/pages/user/user_coupon/user_coupon?img=" + url + "&gradeId=" + th.data.gradeId + "&FormId=" + item.Id); break; case "02": diff --git a/pages/user/index/index.wxml b/pages/user/index/index.wxml index 13e40e9..2027e0b 100644 --- a/pages/user/index/index.wxml +++ b/pages/user/index/index.wxml @@ -66,7 +66,7 @@ - + @@ -78,7 +78,7 @@ - + diff --git a/pages/user/labels/labels.js b/pages/user/labels/labels.js index bde14dd..5666231 100644 --- a/pages/user/labels/labels.js +++ b/pages/user/labels/labels.js @@ -117,7 +117,7 @@ Page({ }) th.query_checklabels(); } else { - getApp().my_warnning("系统未设置兴趣标签集合", 0, th); + getApp().my_warnning("系统繁忙,请稍后再试", 0, th); th.setData({ isread: 1 }) @@ -136,7 +136,7 @@ Page({ storeId: a.stoid } }).then(res => { - if (res.data.code == 0 && res.data.data && res.data.data.VipLabelId) { + if (res.data.code == 0) { var data = res.data.data; var arr = []; var VipLabelId = []; //通过id标签找到已选择的标签 @@ -165,7 +165,7 @@ Page({ interest_lables: interest_lables }) } else { - //getApp().my_warnning("系统繁忙，请稍后再试", 0, th); + getApp().my_warnning("系统繁忙，请稍后再试", 0, th); return false; } }) diff --git a/pages/user/my_service/appment_main.js b/pages/user/my_service/appment_main.js index e1292ac..7f47914 100644 --- a/pages/user/my_service/appment_main.js +++ b/pages/user/my_service/appment_main.js @@ -560,6 +560,9 @@ Page({ th.data.is_get_local_ok = 1; } }) + //获取上一次的预约 + this.get_fir_service(); + }, //查询剩下可预约人数 query_more: function() { @@ -633,5 +636,98 @@ Page({ var th = this; var nav_b = th.selectComponent("#nav_b"); //组件的id nav_b.close_box(); + }, + + //判断分享的导购是不是有门店，是不是该门店下又该会员 + check_firleader(data){ + var th=this; + var itemId = this.data.itemId; //服务id + var url = "/api/weshop/marketing/reservation/storage/pagenew"; + var key_word = data.store_name; + key_word = key_word.replace(/\s+/g, ""); + var usr=getApp().globalData.userInfo; + getApp().request.promiseGet(url, { + data: { + userId: usr.user_id, + storeId: os.stoid, + serviceId: itemId, + page: 1, + pageSize: 1000, + keyWord: key_word + } + }).then(res => { + //-- 如果是门店的话 -- + if (res.data.code == 0 && res.data.data && res.data.data.pageData) { + var store_data=null; + for(var i in res.data.data.pageData){ + var it=res.data.data.pageData[i]; + if(it.Id==data.StorageId){ + store_data={ + store_name: data.store_name, + storageId: data.StorageId, + }; + break; + } + } + if(!store_data) return false; + th.setData(store_data) + + }else{ + return false; + } + + //导购接口地址 + var url = "/api/weshop/marketing/reservation/staff/pagenew"; + return getApp().request.promiseGet(url, { + isShowLoading:1, + data: { + storeId: os.stoid, + userId: usr.user_id, + serviceId: itemId, + storageId: data.StorageId + } + }) + }).then(res=>{ + if (res && res.data && res.data.code == 0) { + var beautician_list=res.data.data; + for(var i in beautician_list){ + var item=beautician_list[i]; + if(item.staffid==data.beauticianID){ + th.setData({ + beautician_name:data.beautician_name, + beauticianID:data.beauticianID, + }) + break; + } + } + + } + }) + }, + + //获取上一次预约的信息 + get_fir_service:function (){ + var th=this; + var usr=getApp().globalData.userInfo; + if(!usr) return false; + + getApp().promiseGet("/api/weshop/marketing/reservation/reservation/page",{ + data:{storeId:os.stoid,userId:usr.user_id,projectId:th.data.project_id} + }).then(res=>{ + if(res.data.code==0 && res.data.data && res.data.data.pageData ){ + var ppdata= res.data.data.pageData[0]; + var data={ + store_name:ppdata.StorageName, + beautician_name:ppdata.BeauticianName, + beauticianID:ppdata.BeauticianID, + StorageId:ppdata.StorageID, + } + //检查门店和导购能不能默认使用 + th.check_firleader(data); + }; + }) } + + + }) \ 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 243edd5..54d868b 100644 --- a/pages/user/my_service/i_service.js +++ b/pages/user/my_service/i_service.js @@ -45,11 +45,8 @@ Page({ */ onShow: function() { var th = this; - setTimeout(function (){ - var my_confirm = th.selectComponent("#my_confirm"); //组件的id - my_confirm.open_cancel(0); - },1000) - + var my_confirm = th.selectComponent("#my_confirm"); //组件的id + my_confirm.open_cancel(0); }, onReachBottom: function() { var th = this; diff --git a/pages/user/order_detail/order_detail.js b/pages/user/order_detail/order_detail.js index 47fd887..6eb4094 100644 --- a/pages/user/order_detail/order_detail.js +++ b/pages/user/order_detail/order_detail.js @@ -418,7 +418,8 @@ Page({ return false; } }else{ - if((gg.prom_type==1 || gg.prom_type==3 || gg.prom_type==5 || gg.prom_type==6 || gg.prom_type==4) && !good.is_gift && !good.is_integral_normal && !good.is_pd_normal) { + if((gg.prom_type==1 || gg.prom_type==3 || gg.prom_type==5 || gg.prom_type==6 || gg.prom_type==4) + && !good.is_collocation && !good.is_gift && !good.is_integral_normal && !good.is_pd_normal) { var prom=null; //---如果是活动的时候--- var prom=null,th=this; @@ -461,21 +462,25 @@ Page({ } } else{ - var t_ok=1; - await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => { - if(res.data.code==0){ - var r_data=res.data.data; - //-- 参加了全局的优惠活动 -- - if(r_data.promGoodsLists){ - wx.showModal({ - title: '提示', - content: gg.goods_name+'商品的活动发生了变化' - }); - t_ok=0; - } - } - }) - if(!t_ok) return false; + //不是赠品的时候 + if(!good.is_gift){ + var t_ok=1; + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => { + if(res.data.code==0){ + var r_data=res.data.data; + //-- 参加了全局的优惠活动 -- + if(r_data.promGoodsLists){ + wx.showModal({ + title: '提示', + content: gg.goods_name+'商品的活动发生了变化' + }); + t_ok=0; + } + } + }) + if(!t_ok) return false; + } + //-- 如果有参加线下取价 -- if(good.offline_cut>0) wlist+=encodeURIComponent(gg.erpwareid)+","; } diff --git a/pages/user/order_detail/order_detail.wxml b/pages/user/order_detail/order_detail.wxml index b9c7899..a048d97 100644 --- a/pages/user/order_detail/order_detail.wxml +++ b/pages/user/order_detail/order_detail.wxml @@ -164,9 +164,9 @@ 评价 + url="/packageB/pages/user/comment/comment?status=0&order_id={{order.order_id}}">评价 去评价 + url="/packageB/pages/user/add_comment/add_comment?goods_id={{order.order_goods[0].goods_id}}&order_id={{order.order_id}}}">去评价 diff --git a/pages/user/order_list/order_list.js b/pages/user/order_list/order_list.js index 40a1fb5..bf62117 100644 --- a/pages/user/order_list/order_list.js +++ b/pages/user/order_list/order_list.js @@ -537,7 +537,8 @@ Page({ } }else{ - if((gg.prom_type==1 || gg.prom_type==3 || gg.prom_type==5 || gg.prom_type==6 || gg.prom_type==4) && !good.is_gift && !good.is_integral_normal && !good.is_pd_normal) { + if((gg.prom_type==1 || gg.prom_type==3 || gg.prom_type==5 || gg.prom_type==6 || gg.prom_type==4) + && !good.is_collocation && !good.is_gift && !good.is_integral_normal && !good.is_pd_normal) { var prom=null; //---如果是活动的时候--- var prom=null,th=this; @@ -580,21 +581,23 @@ Page({ } } else{ - var t_ok=1; - await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => { - if(res.data.code==0){ - var r_data=res.data.data; - //-- 参加了全局的优惠活动 -- - if(r_data.promGoodsLists){ - wx.showModal({ - title: '提示', - content: gg.goods_name+'商品的活动发生了变化' - }); - t_ok=0; - } - } - }) - if(!t_ok) return false; + if(!good.is_gift ){ + var t_ok=1; + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => { + if(res.data.code==0){ + var r_data=res.data.data; + //-- 参加了全局的优惠活动 -- + if(r_data.promGoodsLists){ + wx.showModal({ + title: '提示', + content: gg.goods_name+'商品的活动发生了变化' + }); + t_ok=0; + } + } + }) + if(!t_ok) return false; + } //-- 如果有参加线下取价 -- if(good.offline_cut>0) wlist+=encodeURIComponent(gg.erpwareid)+","; } diff --git a/pages/user/order_list/order_list.wxml b/pages/user/order_list/order_list.wxml index fa867eb..d6799c5 100644 --- a/pages/user/order_list/order_list.wxml +++ b/pages/user/order_list/order_list.wxml @@ -183,9 +183,9 @@ 评价 + url="/packageB/pages/user/comment/comment?status=0&order_id={{item.order_id}}">评价 评价 + url="/packageB/pages/user/add_comment/add_comment?goods_id={{item.order_goods[0].goods_id}}&order_id={{item.order_id}}&price={{item.order_goods[0].member_goods_price}}">评价 diff --git a/pages/user/plus/plus.js b/pages/user/plus/plus.js index 5164e85..92502be 100644 --- a/pages/user/plus/plus.js +++ b/pages/user/plus/plus.js @@ -170,49 +170,59 @@ Page({ var plusCard = res.data.data; var arr = [1219, 2089, 3031]; var new_arr = new Array(); + var parr=[]; for (var i = 0; i < plusCard.length; i++) { //plusCard[i].free=arr[i]; if(plusCard[i].IsStopBuy) { continue; } if (plusCard[i].CardImg == "") plusCard[i].CardImg = th.data.url + "/miniapp/images/plus/bg"+(i + 1)+ ".jpg?v=1"; var item = {"fee": plusCard[i].CardFee, 'index': i} new_arr.push(item); - + parr.push(plusCard[i]); } - //根據距離遠近排序，越近在前面，升序 - new_arr.sort(function (a, b) { - if (a.fee < b.fee) { - return -1; - } else if (a.fee == b.fee) { - return 0; - } else { - return 1; - } - }); - //里面和外面要显示统一 - switch (new_arr.length) { - case 1:arr=[3031]; break; - case 2: arr = [2089, 3031]; break; - case 3: arr = [1219, 2089, 3031];break; - } + //看是不是还有卡项是可以购买的 + if(new_arr && new_arr.length>0){ + //根據距離遠近排序，越近在前面，升序 + new_arr.sort(function (a, b) { + if (a.fee < b.fee) { + return -1; + } else if (a.fee == b.fee) { + return 0; + } else { + return 1; + } + }); - //---给数组添加立省多少钱--- - for (i = 0; i < plusCard.length; i++) { - //判断是否停用 - - for (var j = 0; j < new_arr.length; j++) { - if (i == new_arr[j].index) { - plusCard[i].free = arr[j]; - break; - } - + //里面和外面要显示统一 + switch (new_arr.length) { + case 1:arr=[3031]; break; + case 2: arr = [2089, 3031]; break; + case 3: arr = [1219, 2089, 3031];break; + } + //---给数组添加立省多少钱--- + for (i = 0; i < parr.length; i++) { + //判断是否停用 + for (var j = 0; j < new_arr.length; j++) { + if (i == new_arr[j].index) { + parr[i].free = arr[j]; + break; + } + } } - } - th.setData({ - is_plusCard: plusCard, is_show: 1 - }) + th.setData({ + is_plusCard: parr, is_show: 1 + }) + }else{ + th.setData({is_show: 1}); + wx.showToast({ + title: "暂无可购买的等级卡项", + icon: 'none', + duration: 4000 + }) + + } setTimeout(function(){ var goods_list = th.selectComponent("#goods_list"); //组件的id goods_list.init(); diff --git a/pages/user/plus/plus.wxml b/pages/user/plus/plus.wxml index efb2313..8e71b06 100644 --- a/pages/user/plus/plus.wxml +++ b/pages/user/plus/plus.wxml @@ -6,44 +6,44 @@ - - - - - - - - - - - - - {{item.CardName}} - 开通会员卡仅{{item.CardFee}}元 - - 立即购买 - - + + + + + + + + + + + + + + {{item.CardName}} + 开通会员卡仅{{item.CardFee}}元 + + 立即购买 + - + + + - + - - 按去年用户消费计算，开卡后一年预计省￥{{item.free}}元 + + 按去年用户消费计算，开卡后一年预计省￥{{item.free}}元 + - - - - + + + - - - + diff --git a/pages/user/userinfo/userinfo.js b/pages/user/userinfo/userinfo.js index b199dce..d04c545 100644 --- a/pages/user/userinfo/userinfo.js +++ b/pages/user/userinfo/userinfo.js @@ -68,7 +68,6 @@ Page({ is_lable_set: "", //是否启用我的兴趣标签 check_label: [], //我选择的兴趣标签 fir_guide_id:null, //存储会员详情接口出来的美导ID - reg_info:null }, //通过路径跳转到其他页面 @@ -87,18 +86,6 @@ Page({ guide_title:sms_conf.guide_consultant, //系统参数 导购标题 guide_change_time:sms_conf.guide_change_time //每月能修改几次 }) - - let reg_type = ee.reg_type; - let reg_info = ee.reg_info; - if(reg_type) { //reg_type为1才显示积分信息 - if(reg_info) { - reg_info = JSON.parse(reg_info); - th.setData({reg_info:reg_info}); - } - } - - - if (sms_conf.user_label_set) { th.query_checklabels(); } @@ -115,19 +102,20 @@ Page({ storeId: r.stoid } }).then(res => { - if (res.data.code == 0 && res.data.data && res.data.data.VipLabel) { + if (res.data.code == 0) { var data = res.data.data; - var VipLabel = th.data.VipLabel; //通过id标签找到已选择的标签 + var VipLabel = th.data.check_label; //通过id标签找到已选择的标签 var dateList = data.VipLabel.split(","); - var arr=[]; for (var i in dateList) { if (dateList[i] != "") { - arr.push(dateList[i]); + VipLabel.push(dateList[i]); } } th.setData({ - check_label: arr + check_label: VipLabel }) + } else { + getApp().my_warnning("系统繁忙，请稍后再试", 0, th); } }) }, @@ -197,20 +185,9 @@ Page({ } }, bindChange: function(e) { - - let strBirthday = e.detail.value; - let age = this.verifyBirthday(strBirthday); - - if(age <= 10) { - getApp().my_warnning("会员年龄不能小于10岁(含10岁)", 0, this); - } else if(age >= 70) { - getApp().my_warnning("会员年龄不能超过70岁(含70岁)", 0, this); - } else { - this.setData({ - datet: e.detail.value, - }); - }; - + this.setData({ + datet: e.detail.value, + }); }, //---点击二级之后的选择--- choose_for_store: function(e) { @@ -587,7 +564,6 @@ Page({ }, //------初始化加载---------- onLoad: function(t) { - var th=this; var user = getApp().globalData.userInfo; if (user.card_field != '' && user.card_field != null && user.card_field != undefined && user.card_expiredate) { var now = ut.gettimestamp(); @@ -599,9 +575,6 @@ Page({ } } this.initial_user(); - - - }, //-----------会员是否初始化--------------------- initial_user: function() { @@ -677,8 +650,8 @@ Page({ if(!a) a={}; var time ="",birthday =""; - if(a && a.reg_time) time=util.formar_no_full(a.reg_time); - if(a && a.birthday) birthday=util.formar_no_full(a.birthday); + if(a && a.reg_time) time=util.formatTime(a.reg_time, "'Y/M/D"); + if(a && a.birthday) birthday=util.formatTime(a.birthday, "'Y/M/D"); a.reg_time = time; a.birthday = birthday @@ -692,7 +665,8 @@ Page({ a.staffName=choice_guide.StaffName; a.staffId=choice_guide.Id; } - + + e.setData({ phone: a.mobile, user: a, @@ -703,13 +677,11 @@ Page({ address: a.address, isGender: a.sex, isstcsp: a.vipnopwd, - iscalendar:a.islunar, - user2:a, - datet:a.birthday + iscalendar:a.islunar }); + } }) - a.getUserInfo(function(a) { var txt = util.formatTime(a.birthday, 'yyyy-M-d'), arr = txt.split(' '); @@ -717,7 +689,7 @@ Page({ var txt2 = util.formatTime(a.reg_time, 'yyyy-M-d'), arr2 = txt.split(' '); a.reg_time = arr2[0]; - if (a.pickup_id && a.pickup_id>0) { + if (a.pickup_id != null) { req.get("/api/weshop/pickup/get/" + r.stoid + "/" + a.pickup_id, { success: function(da) { if(da.data.data){ @@ -830,9 +802,7 @@ Page({ }, //点击确认修改信息 - confirm_revision: function() { - - + confirm_revision: function() { var th = this; var isstcsp = th.data.isstcsp; //是否启用消费密码 var phone = th.data.phone; //手机号码 @@ -840,9 +810,6 @@ Page({ getApp().my_warnning("手机不能为空", 0, th); return false; } - var address = th.data.address; //地址 - var sto_sele_id = th.data.sto_sele_id; - var consumption = th.data.consumption; //消费密码 var isstcsp = th.data.isstcsp; if (isstcsp == 1) { @@ -857,6 +824,7 @@ Page({ } } var sex = th.data.isGender; //性别 + if (sex != "1" && sex != "2") { getApp().my_warnning("请选择性别", 0, th); return false; @@ -866,32 +834,14 @@ Page({ getApp().my_warnning("请输入名字", 0, th); return false; } - var identity_card = th.data.identity_card; //身份证 + if (identity_card!=null && identity_card!=undefined && identity_card != "" && !(/(^\d{15}$)|(^\d{18}$)|(^\d{17}(\d|X|x)$)/.test(identity_card))) { getApp().my_warnning("身份证号码错误", 0, th); return false; - } - if(th.data.user2.idcard && (!identity_card || identity_card=='') ){ - getApp().my_warnning("身份证不能为空", 0, th); - return false; - } - if(th.data.user2.address && (!address || address=='') ){ - getApp().my_warnning("地址不能为空", 0, th); - return false; - } - if(th.data.user2.pickup_id && (!sto_sele_id || sto_sele_id=='') ){ - getApp().my_warnning("门店不能为空", 0, th); - return false; - } - if(th.data.user2.birthday && (!th.data.datet || th.data.datet =='') ){ - getApp().my_warnning("生日不能为空", 0, th); - return false; - } - - if(this.data.confirmed) return false; - this.data.confirmed=1; - + } + var address = th.data.address; //地址 + var sto_sele_id = th.data.sto_sele_id; var datas = { mobile: phone, //手机号码 store_id: r.stoid, @@ -904,7 +854,7 @@ Page({ address: address, //地址 pickup_id: sto_sele_id ,//自提门店 所属门店 islunar:th.data.iscalendar, - birthday:th.data.datet + birthday:th.data.datet } //往上提交美导的ID if(th.data.fir_guide_id!=th.data.user.staffId){ @@ -914,9 +864,6 @@ Page({ getApp().request.put("/api/weshop/users/updateUserInfo", { data: datas, success: function(res) { - - th.data.confirmed=0; - if (res.data.code == 0) { getApp().my_warnning("修改成功", 1, th); getApp().goto("/pages/user/index/index"); @@ -964,58 +911,7 @@ Page({ } } }); - }, - - // 生日判断 - verifyBirthday(strBirthday) { - var returnAge; - var strBirthdayArr = strBirthday.split("-"); - var birthYear = strBirthdayArr[0]; - var birthMonth = strBirthdayArr[1]; - var birthDay = strBirthdayArr[2]; - - d = new Date(); - var nowYear = d.getFullYear(); - var nowMonth = d.getMonth() + 1; - var nowDay = d.getDate(); - - if(nowYear == birthYear){ - returnAge = 0;//同年 则为0岁 - } else { - var ageDiff = nowYear - birthYear ; //年之差 - if(ageDiff > 0){ - if(nowMonth == birthMonth) { - var dayDiff = nowDay - birthDay;//日之差 - if(dayDiff < 0) - { - returnAge = ageDiff - 1; - } - else - { - returnAge = ageDiff ; - } - } - else - { - var monthDiff = nowMonth - birthMonth;//月之差 - if(monthDiff < 0) - { - returnAge = ageDiff - 1; - } - else - { - returnAge = ageDiff ; - } - } - } - else - { - returnAge = -1;//返回-1 表示出生日期输入错误 晚于今天 - } - } - return returnAge;//返回周岁年龄 - }, - + } }); \ No newline at end of file diff --git a/pages/user/userinfo/userinfo.wxml b/pages/user/userinfo/userinfo.wxml index 188beb2..9b2188d 100644 --- a/pages/user/userinfo/userinfo.wxml +++ b/pages/user/userinfo/userinfo.wxml @@ -108,15 +108,8 @@ 女 - - - +{{reg_info.sex}} - 积分 - 成长值 - - - + @@ -150,48 +143,28 @@ - {{datet==""? user.birthday==""?"":filters.format_time(user.birthday):datet}} - + {{datet==""? user.birthday==""?"":filters.replace_time2(user.birthday):datet}} + + - - - - +{{reg_info.birthday}} - 积分 - 成长值 - - - - - + 姓名 - - - - - +{{reg_info.name}} - 积分 - 成长值 - - - + 身份证 - - - - +{{reg_info.idcard}} - 积分 - 成长值 - - - + + + + + 更换手机 @@ -207,16 +180,8 @@ {{user.address}} --> - - - - - +{{reg_info.address}} - 积分 - 成长值 - - - + + @@ -225,14 +190,7 @@ {{stoname}} ∟ - - +{{reg_info.pick}} - 积分 - 成长值 - - - diff --git a/pages/user/userinfo/userinfo.wxss b/pages/user/userinfo/userinfo.wxss index d35a8fd..6b11ea0 100644 --- a/pages/user/userinfo/userinfo.wxss +++ b/pages/user/userinfo/userinfo.wxss @@ -662,5 +662,3 @@ input { height: 46rpx; line-height: 46rpx; } - -.show_jf_val{ margin-left: 5rpx;} diff --git a/pages/user/userqy/userqy.js b/pages/user/userqy/userqy.js index 4257cd2..9a244d0 100644 --- a/pages/user/userqy/userqy.js +++ b/pages/user/userqy/userqy.js @@ -190,7 +190,7 @@ Page({ switch (no) { case "01": - getApp().goto("/pages/user/user_coupon/user_coupon?img=" + getApp().goto("/packageB/pages/user/user_coupon/user_coupon?img=" +url+"&gradeId="+th.data.gradeId+"&FormId="+item.Id); break; case "02": diff --git a/utils/filter.wxs b/utils/filter.wxs index c8fa917..f7a8277 100644 --- a/utils/filter.wxs +++ b/utils/filter.wxs @@ -118,6 +118,15 @@ var filters = { }, + in_arr: function(index, arr) { + if(arr.indexOf(index) != -1) { + return true; + } else { + return false; + }; + }, + + }; @@ -131,4 +140,5 @@ module.exports = { show_gui_ge: filters.show_gui_ge, show_default: filters.show_default, status: filters.status, + in_arr: filters.in_arr, } \ No newline at end of file