diff --git a/components/goods_list/goods_list.wxss b/components/goods_list/goods_list.wxss index 4722ef3..7982238 100644 --- a/components/goods_list/goods_list.wxss +++ b/components/goods_list/goods_list.wxss @@ -87,7 +87,8 @@ .goods_name { height: 62rpx; /* margin-top: 6rpx; */ - line-height: 30rpx; + line-height: 1.2; + margin-bottom: 10rpx; } .hang { diff --git a/components/my-qrcode/my-qrcode.wxml b/components/my-qrcode/my-qrcode.wxml index 8406d34..8cab69c 100644 --- a/components/my-qrcode/my-qrcode.wxml +++ b/components/my-qrcode/my-qrcode.wxml @@ -4,7 +4,6 @@ 兑换码:{{object.val}} 请向店员出示二维码核销兑换 - diff --git a/packageA/pages/jfbuy/jfbuy.js b/packageA/pages/jfbuy/jfbuy.js index 663d151..bb4b246 100644 --- a/packageA/pages/jfbuy/jfbuy.js +++ b/packageA/pages/jfbuy/jfbuy.js @@ -416,7 +416,7 @@ Page({ viewItemDetails:function(e){ var index=e.currentTarget.dataset.index; var item=this.data.list2[index]; - var url="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id; + var url="/pages/goods/goodsInfo/goodsInfo?goods_id="+item.goods_id+"&title="+item.goods_name; getApp().goto(url); }, diff --git a/packageA/pages/myGift/myGift.wxml b/packageA/pages/myGift/myGift.wxml index 4912c01..ccc9103 100644 --- a/packageA/pages/myGift/myGift.wxml +++ b/packageA/pages/myGift/myGift.wxml @@ -15,8 +15,20 @@ - {{item.lbprice}}/{{item.lbintegral}}积分 - 零售价{{item.oldprice}} + + + {{filter.toFix(item.lbprice,2)}}/{{item.lbintegral}}积分 + + + + {{filter.toFix(item.lbprice,2) }} + + + {{item.lbintegral}}积分 + + + + 零售价{{filter.toFix(item.oldprice,2)}} 已售{{item.salenum}}件 @@ -26,8 +38,8 @@ - 立即兑换 - 立即购买 + 立即兑换 + 立即购买 diff --git a/packageA/pages/myGift/myGift.wxss b/packageA/pages/myGift/myGift.wxss index 72f8959..04a155b 100644 --- a/packageA/pages/myGift/myGift.wxss +++ b/packageA/pages/myGift/myGift.wxss @@ -138,7 +138,7 @@ page { .btn-container { display: flex; - justify-content: space-around; + /*justify-content: space-around;*/ font-size: 26rpx; } @@ -146,6 +146,7 @@ page { padding: 20rpx; flex: 1; text-align: center; + max-width: 50%; } .btn.red { diff --git a/packageA/pages/myGiftDetails/myGiftDetails.js b/packageA/pages/myGiftDetails/myGiftDetails.js index f0f4798..7fd7754 100644 --- a/packageA/pages/myGiftDetails/myGiftDetails.js +++ b/packageA/pages/myGiftDetails/myGiftDetails.js @@ -57,7 +57,7 @@ Page({ // store_id: app.globalData.setting.stoid, // user_id: app.globalData.user_id, // }; - + //购买的时候是0,购买后是1 if(this.data.index == 0) { // data.lbid = this.data.id; // 请求数据 @@ -68,60 +68,100 @@ Page({ }, 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, - }); + + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ + var da= res.data.data.pageData[0] + self.setData({ details:da, }); + + //礼包有俩种类型 + if(da.lbtype==1){ + app.request.promiseGet('/api/weshop/libao/libaoList/page', { + data: { + store_id: app.globalData.setting.stoid, + lbid: self.data.id,pageSize:500 + }, + isShowLoading: true, + }).then(function(res) { + self.setData({ + list: res.data.data.pageData, + }); + }); + }else{ + app.request.promiseGet('/api/weshop/libao/libaoList/listLQ', { + data: { + store_id: app.globalData.setting.stoid, + lbid: self.data.id, + }, + isShowLoading: true, + }).then(function(res) { + if(res.data.code==0){ + self.setData({ + list: res.data.data, + }); + } + }); + } + + } }); + } 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, + 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){ + + var da= res.data.data.pageData[0] self.setData({ - details: res.data.data.pageData[0], + details:da, }); - } - }); - - 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'];//剩余次数 + + if(da.lbtype==1){ + app.request.promiseGet('/api/weshop/libao/libaoListvip/page', { + data: { + store_id: app.globalData.setting.stoid, + lbvipid: self.data.id,pageSize:500 + }, + 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, + }); + } + }); + }else{ + app.request.promiseGet('/api/weshop/libao/libaoListvip/listLQ', { + data: { + store_id: app.globalData.setting.stoid, + lbvipid: self.data.id, + user_id:app.globalData.user_id + }, + isShowLoading: true, + }).then(function(res) { + // console.log('res4-->', res); + if(res.data.code==0 && res.data.data) { + self.setData({ + list: res.data.data, + }); + } + }); } - self.setData({ - list: res.data.data.pageData, - }); + } }); }; - - }; }; }, @@ -260,14 +300,38 @@ Page({ icon: 'none', duration: 2000 }) - - - + } } }) - } + }, + + //一键领取券 + show_get_quan:function (e) { + var th=this; + var json = { + store_id:os.stoid, + user_id:getApp().globalData.user_id, + id:this.data.id + }; + var url = "/api/weshop/libao/libaoFormvip/saveLibaoQuan"; + getApp().request.post(url,{ + data:json, + success:function(res) { + if (res.data.code == 0) { + th.setData({'details.isget':1}); + } else { + wx.showToast({ + title: res.data.msg, + icon: 'none', + duration: 2000 + }) + } + }, + }) + + } }) \ No newline at end of file diff --git a/packageA/pages/myGiftDetails/myGiftDetails.wxml b/packageA/pages/myGiftDetails/myGiftDetails.wxml index 1dfade2..bd8ba1d 100644 --- a/packageA/pages/myGiftDetails/myGiftDetails.wxml +++ b/packageA/pages/myGiftDetails/myGiftDetails.wxml @@ -2,6 +2,8 @@ + + 兑换结束时间:{{filter.format_time(details.expdate,1)}} @@ -9,16 +11,32 @@ - {{details.lbprice}}/{{details.lbintegral}}积分 - 零售价{{details.oldprice}} + + + {{filter.toFix(details.lbprice,2)}}/{{details.lbintegral}}积分 + + + + {{filter.toFix(details.lbprice,2)}} + + + {{details.lbintegral}}积分 + + + + + 零售价{{filter.toFix(details.oldprice,2)}} 已售{{details.salenum}}件 活动截止日期 {{details.expdate ? filter.format_time(details.expdate):filter.format_time(details.endtime)}} + + + - + 可到线下门店兑换以下单品 @@ -40,7 +58,6 @@ - 单品名称 @@ -52,15 +69,48 @@ - + + + + + + + 满1000.00使用 + ¥1000 + + 活动结束日期: 2022-06-02 00:00:00 + + + + + + - + - 立即兑换 - 立即购买 + 立即兑换 + 立即购买 + + + + + 已领取{{list[0].freebh}} + + 立即使用 - 立即使用 + + + + 立即兑换 + 立即购买 + + + 已领 + 一键领取优惠券→ + + + diff --git a/packageA/pages/myGiftDetails/myGiftDetails.wxss b/packageA/pages/myGiftDetails/myGiftDetails.wxss index 2431c64..db13e1a 100644 --- a/packageA/pages/myGiftDetails/myGiftDetails.wxss +++ b/packageA/pages/myGiftDetails/myGiftDetails.wxss @@ -81,4 +81,21 @@ page { .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 +.ling_btn.c_a{ background: darkgrey} + +.lb_quan{ + width: 48%; + height: 120rpx; + background-size: 100% 100%; + background-position: center; + background-repeat: no-repeat; + color: #fff; + font-size: 22rpx; + text-align: center; + margin-top:20rpx; + margin-left:10rpx; +} +.fir_view{ + justify-content: space-between; height: 98rpx; line-height: 98rpx; padding: 0 8rpx; +} +.exp_title{text-align: center;height: 60rpx; line-height: 60rpx;background-color: #cccdce;color: #c0283a} \ No newline at end of file diff --git a/packageA/pages/my_service2/appment_main.js b/packageA/pages/my_service2/appment_main.js index 413a898..06f63c9 100644 --- a/packageA/pages/my_service2/appment_main.js +++ b/packageA/pages/my_service2/appment_main.js @@ -329,7 +329,7 @@ Page({ is_textea: 0 }) var itemId = th.data.itemId; //服务id - var url = "/api/weshop/marketing/reservation/storage/pageAll"; + var url = "/api/weshop/marketing/reservation/service/storage/page"; var key_word = th.data.key_word; key_word = key_word.replace(/\s+/g, ""); getApp().request.promiseGet(url, { @@ -344,7 +344,7 @@ Page({ } }).then(res => { wx.hideLoading(); - if (res.data.code == 0) { + if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0) { th.data.curpage++; var arr1 = th.data.store_list; var arr2 = res.data.data.pageData; diff --git a/pages/index/index/index.wxml b/pages/index/index/index.wxml index 5dab34e..5b326c8 100644 --- a/pages/index/index/index.wxml +++ b/pages/index/index/index.wxml @@ -33,7 +33,7 @@ - + @@ -146,7 +146,7 @@ - + @@ -208,18 +208,18 @@ - + - + - + {{aitem.title}} @@ -263,10 +263,10 @@ - + diff --git a/pages/index/index/index.wxss b/pages/index/index/index.wxss index 077f2e7..66be2ae 100644 --- a/pages/index/index/index.wxss +++ b/pages/index/index/index.wxss @@ -406,7 +406,7 @@ .nav { padding: 0 10rpx; box-sizing: border-box; - flex: 1; + /* flex: 1; */ } .p_swiper .un_line { diff --git a/pages/team/team_show/team_show.wxml b/pages/team/team_show/team_show.wxml index 307e55f..69faf39 100644 --- a/pages/team/team_show/team_show.wxml +++ b/pages/team/team_show/team_show.wxml @@ -154,10 +154,10 @@ - + diff --git a/pages/team/team_success/team_success.js b/pages/team/team_success/team_success.js index ac488dc..8c2afbd 100644 --- a/pages/team/team_success/team_success.js +++ b/pages/team/team_success/team_success.js @@ -807,7 +807,7 @@ Page({ else url+="?first_leader="+getApp().globalData.user_id; } - console.log(url); + // console.log('url+++++>>>>>', url, th.data.teamlist.title); return { path:url, @@ -815,6 +815,24 @@ Page({ imageUrl: img, } }, + + clickShare() { + this.setData({ + share_hidden: true, + }); + }, + + send() { + this.setData({ + share_hidden:false, + }); + }, + + cancel() { + this.setData({ + share_hidden:false, + }); + }, }) diff --git a/pages/team/team_success/team_success.json b/pages/team/team_success/team_success.json index 0aa78bf..528e630 100644 --- a/pages/team/team_success/team_success.json +++ b/pages/team/team_success/team_success.json @@ -5,5 +5,8 @@ "navigationBarTextStyle": "white", "navigationBarBackgroundColor": "#ffffff", "backgroundColor": "#eeeeee" - } + }, + "usingComponents": { + "share": "/components/share/share" + } } \ No newline at end of file diff --git a/pages/team/team_success/team_success.wxml b/pages/team/team_success/team_success.wxml index 888145c..452f408 100644 --- a/pages/team/team_success/team_success.wxml +++ b/pages/team/team_success/team_success.wxml @@ -165,7 +165,8 @@ - @@ -261,7 +262,7 @@ - + - + + + @@ -317,3 +319,6 @@ + + +