1 participants
-
Status changed to merged
-
mentioned in commit 89312b3ecc4f97c26c1fe238acf58a57629a766a
-
2.自定义团购的商品销量要显示虚拟数量
Showing
28 changed files
components/diy_goodsGroup/diy_goodsGroup.js
| @@ -504,7 +504,7 @@ Component({ | @@ -504,7 +504,7 @@ Component({ | ||
| 504 | if (res.data.code == 0 && res.data.data && res.data.data.length > 0) { | 504 | if (res.data.code == 0 && res.data.data && res.data.data.length > 0) { |
| 505 | var arr = res.data.data[0]; | 505 | var arr = res.data.data[0]; |
| 506 | item.prom_price = arr.luck_goods_price; | 506 | item.prom_price = arr.luck_goods_price; |
| 507 | - item.sales_sum=arr.buy_goodnum | 507 | + item.sales_sum=arr.buy_goodnum+(arr.virtual_qty?arr.virtual_qty:0); |
| 508 | } | 508 | } |
| 509 | }) | 509 | }) |
| 510 | break; | 510 | break; |
| @@ -517,9 +517,12 @@ Component({ | @@ -517,9 +517,12 @@ Component({ | ||
| 517 | var prom =null; | 517 | var prom =null; |
| 518 | if(res && res.data) prom=res.data.data; | 518 | if(res && res.data) prom=res.data.data; |
| 519 | if (prom != null && prom.is_end==0 && prom.end_time>now && (prom.start_time<now || (prom.show_time && prom.show_time<now)) ) { | 519 | if (prom != null && prom.is_end==0 && prom.end_time>now && (prom.start_time<now || (prom.show_time && prom.show_time<now)) ) { |
| 520 | - item.prom_price = res.data.data.price; | ||
| 521 | - if(res.data.data.user_price) item.prom_price=res.data.data.user_price; | ||
| 522 | - item.sales_sum=res.data.data.buy_num | 520 | + item.prom_price = res.data.data.price; |
| 521 | + if(res.data.data.user_price) item.prom_price=res.data.data.user_price; | ||
| 522 | + var vNum=res.data.data.virtual_num?res.data.data.virtual_num:0; | ||
| 523 | + var vNum1=res.data.data.virtualNum?res.data.data.virtualNum:0; | ||
| 524 | + var vNum2=res.data.data.virtual?res.data.data.virtual:0; | ||
| 525 | + item.sales_sum=res.data.data.buy_num+(vNum+vNum1+vNum2); | ||
| 523 | }else{ | 526 | }else{ |
| 524 | item.prom_type=0; | 527 | item.prom_type=0; |
| 525 | item.prom_id=0; | 528 | item.prom_id=0; |
packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js
| @@ -10,22 +10,6 @@ Page({ | @@ -10,22 +10,6 @@ Page({ | ||
| 10 | isLoading: false, // 检测是否已经发送请求,防止重复发送请求 | 10 | isLoading: false, // 检测是否已经发送请求,防止重复发送请求 |
| 11 | noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据 | 11 | noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据 |
| 12 | pageNum: 1, // 当前页数 | 12 | pageNum: 1, // 当前页数 |
| 13 | - // typeArr: [{ | ||
| 14 | - // key: 'point', | ||
| 15 | - // name: '积分', | ||
| 16 | - // },{ | ||
| 17 | - // key: 'grow', | ||
| 18 | - // name: '成长值', | ||
| 19 | - // },{ | ||
| 20 | - // key: 'point', | ||
| 21 | - // name: '优惠券', | ||
| 22 | - // },{ | ||
| 23 | - // key: 'prestore_name', | ||
| 24 | - // name: '项目服务', | ||
| 25 | - // },{ | ||
| 26 | - // key: 'prestore_money', | ||
| 27 | - // name: '预存金额', | ||
| 28 | - // }], | ||
| 29 | }, | 13 | }, |
| 30 | 14 | ||
| 31 | onLoad: function () { | 15 | onLoad: function () { |
| @@ -54,13 +38,11 @@ Page({ | @@ -54,13 +38,11 @@ Page({ | ||
| 54 | enabled: 1 | 38 | enabled: 1 |
| 55 | } | 39 | } |
| 56 | }).then(res => { | 40 | }).then(res => { |
| 57 | - // console.log('获取广告', res); | ||
| 58 | if(res.data.code == 0) { | 41 | if(res.data.code == 0) { |
| 59 | self.setData({ | 42 | self.setData({ |
| 60 | adList: res.data.data.pageData, | 43 | adList: res.data.data.pageData, |
| 61 | }); | 44 | }); |
| 62 | }; | 45 | }; |
| 63 | - | ||
| 64 | }); | 46 | }); |
| 65 | 47 | ||
| 66 | // 获取列表 | 48 | // 获取列表 |
| @@ -72,8 +54,6 @@ Page({ | @@ -72,8 +54,6 @@ Page({ | ||
| 72 | 54 | ||
| 73 | 55 | ||
| 74 | }; | 56 | }; |
| 75 | - | ||
| 76 | - | ||
| 77 | }; | 57 | }; |
| 78 | }, | 58 | }, |
| 79 | 59 |
packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxml
| @@ -11,11 +11,11 @@ | @@ -11,11 +11,11 @@ | ||
| 11 | 11 | ||
| 12 | <view class="list"> | 12 | <view class="list"> |
| 13 | <block wx:for="{{list.pageData}}"> | 13 | <block wx:for="{{list.pageData}}"> |
| 14 | - <view class="list-item" wx:if="{{item.status}}"> | ||
| 15 | - | 14 | + <view class="list-item" wx:if="{{item.status == 1}}" bindtap="go" data-url="/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id={{item.goods_id}}&prom_type=9&group_id={{item.id}}"> |
| 16 | <view class="flex ai-center"> | 15 | <view class="flex ai-center"> |
| 17 | - <view class="img-container"><image class="img-block" src="{{imghost + item.original_img}}" data-val="{{item.original_img}}" | ||
| 18 | - data-errorimg="list.pageData[{{index}}].original_img" binderror="bind_bnerr" lazy-load="true"></image></view> | 16 | + <view class="img-container"> |
| 17 | + <image class="img-block" src="{{imghost + item.original_img}}" data-val="{{item.original_img}}" | ||
| 18 | + data-errorimg="list.pageData[{{index}}].original_img" binderror="bind_bnerr" lazy-load="true" mode="heightFix"></image></view> | ||
| 19 | <view class="pdl20 flex fdc jc_sb f1"> | 19 | <view class="pdl20 flex fdc jc_sb f1"> |
| 20 | 20 | ||
| 21 | <view class="ellipsis-2 name fs28" data-content="{{item.group_num}}人团">{{item.title}}</view> | 21 | <view class="ellipsis-2 name fs28" data-content="{{item.group_num}}人团">{{item.title}}</view> |
| @@ -26,8 +26,7 @@ | @@ -26,8 +26,7 @@ | ||
| 26 | </view> | 26 | </view> |
| 27 | <view class="flex jc_sb"> | 27 | <view class="flex jc_sb"> |
| 28 | <progress class="pdr20 f1 progress" percent="{{filters.percent(item.num, item.group_num)}}" activeColor="#FF6768" backgroundColor="#d0d0d0" border-radius="12" stroke-width="12" data-content="{{item.num}}人已参团"></progress> | 28 | <progress class="pdr20 f1 progress" percent="{{filters.percent(item.num, item.group_num)}}" activeColor="#FF6768" backgroundColor="#d0d0d0" border-radius="12" stroke-width="12" data-content="{{item.num}}人已参团"></progress> |
| 29 | - <view class="btn fs26" bindtap="go" data-url="/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id={{item.goods_id}}&prom_type=9&group_id={{item.id}}">去参团</view> | ||
| 30 | - <!-- &title=狐狸3号测速003&prom_type=7&prom_id=468 --> | 29 | + <view class="btn fs26">去参团</view> |
| 31 | </view> | 30 | </view> |
| 32 | </view> | 31 | </view> |
| 33 | 32 |
packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
| @@ -46,10 +46,15 @@ Page({ | @@ -46,10 +46,15 @@ Page({ | ||
| 46 | 46 | ||
| 47 | 47 | ||
| 48 | showRules: false, | 48 | showRules: false, |
| 49 | + isSuccess: false, | ||
| 50 | + showPoster: false, | ||
| 49 | }, | 51 | }, |
| 50 | onLoad: function (t) { | 52 | onLoad: function (t) { |
| 51 | - // wx.setNavigationBarTitle({ title: "拼团订单",}) | ||
| 52 | - // console.log('options========>', t); | 53 | + if(t.team_id != null && t.team_id !=undefined) { |
| 54 | + this.setData({ | ||
| 55 | + team_id: t.team_id, | ||
| 56 | + }); | ||
| 57 | + }; | ||
| 53 | this.setData({ | 58 | this.setData({ |
| 54 | param: t, | 59 | param: t, |
| 55 | }); | 60 | }); |
| @@ -93,8 +98,22 @@ Page({ | @@ -93,8 +98,22 @@ Page({ | ||
| 93 | }) | 98 | }) |
| 94 | }, | 99 | }, |
| 95 | 100 | ||
| 101 | + onShow: function() { | ||
| 102 | + this.get_team_info(); | ||
| 103 | + }, | ||
| 104 | + | ||
| 105 | + | ||
| 106 | + | ||
| 107 | + | ||
| 108 | + onUnload: function () { | ||
| 109 | + // 开团成功后,清除storage里的team_id | ||
| 110 | + if(this.data.luckyGoInfo.num && this.data.luckyGoInfo.num == 0) { | ||
| 111 | + wx.removeStorageSync('team_id'); | ||
| 112 | + }; | ||
| 113 | + }, | ||
| 114 | + | ||
| 96 | //关闭展开列表 | 115 | //关闭展开列表 |
| 97 | - click:function(e){ | 116 | + click: function(e) { |
| 98 | this.setData({ | 117 | this.setData({ |
| 99 | hiddenName: !this.data.hiddenName, | 118 | hiddenName: !this.data.hiddenName, |
| 100 | zk: !this.data.zk, | 119 | zk: !this.data.zk, |
| @@ -102,7 +121,7 @@ Page({ | @@ -102,7 +121,7 @@ Page({ | ||
| 102 | }, | 121 | }, |
| 103 | 122 | ||
| 104 | //打开收起拼团列表 | 123 | //打开收起拼团列表 |
| 105 | - czk:function(e){ | 124 | + czk: function(e) { |
| 106 | this.setData({ | 125 | this.setData({ |
| 107 | zk:!this.data.zk, | 126 | zk:!this.data.zk, |
| 108 | hiddenName: !this.data.hiddenName, | 127 | hiddenName: !this.data.hiddenName, |
| @@ -110,28 +129,28 @@ Page({ | @@ -110,28 +129,28 @@ Page({ | ||
| 110 | }, | 129 | }, |
| 111 | 130 | ||
| 112 | //打开蒙板提示 | 131 | //打开蒙板提示 |
| 113 | - cmeng:function(e){ | 132 | + cmeng: function(e) { |
| 114 | this.setData({ | 133 | this.setData({ |
| 115 | meng:!this.data.meng, | 134 | meng:!this.data.meng, |
| 116 | }) | 135 | }) |
| 117 | }, | 136 | }, |
| 118 | 137 | ||
| 119 | //关闭蒙板提示 | 138 | //关闭蒙板提示 |
| 120 | - cmc:function(e){ | 139 | + cmc: function(e) { |
| 121 | this.setData({ | 140 | this.setData({ |
| 122 | meng: !this.data.meng, | 141 | meng: !this.data.meng, |
| 123 | }) | 142 | }) |
| 124 | }, | 143 | }, |
| 125 | 144 | ||
| 126 | //打开二维码提示 | 145 | //打开二维码提示 |
| 127 | - cerweima:function(e){ | 146 | + cerweima: function(e) { |
| 128 | this.setData({ | 147 | this.setData({ |
| 129 | meng: !this.data.meng, | 148 | meng: !this.data.meng, |
| 130 | erweima: !this.data.erweima, | 149 | erweima: !this.data.erweima, |
| 131 | }) | 150 | }) |
| 132 | }, | 151 | }, |
| 133 | 152 | ||
| 134 | - cerc:function(e){ | 153 | + cerc: function(e) { |
| 135 | this.setData({ | 154 | this.setData({ |
| 136 | erweima: !this.data.erweima, | 155 | erweima: !this.data.erweima, |
| 137 | meng: !this.data.meng, | 156 | meng: !this.data.meng, |
| @@ -164,116 +183,81 @@ Page({ | @@ -164,116 +183,81 @@ Page({ | ||
| 164 | // data: {orderSn:order_sn,storeId:os.stoid } | 183 | // data: {orderSn:order_sn,storeId:os.stoid } |
| 165 | // }) | 184 | // }) |
| 166 | 185 | ||
| 167 | - // 幸运购成团信息 | ||
| 168 | - await getApp().request.promiseGet("/api/weshop/prom/luckyActivity/page", { | ||
| 169 | - data: { | ||
| 170 | - store_id: o.stoid, | ||
| 171 | - is_end: 0, | ||
| 172 | - timetype: 1, | ||
| 173 | - id: this.data.param.group_id, | ||
| 174 | - } | ||
| 175 | - }).then(res => { | ||
| 176 | - var luckyGoInfo = res.data.data.pageData[0]; | ||
| 177 | - console.log('成团信息====>', luckyGoInfo); | ||
| 178 | - th.setData({ | ||
| 179 | - luckyGoInfo, | ||
| 180 | - }); | ||
| 181 | - //参团成功后,保存team_id | ||
| 182 | - wx.setStorage({ | ||
| 183 | - key: 'team_id', | ||
| 184 | - data: luckyGoInfo.team_id, | ||
| 185 | - }) | ||
| 186 | - //如果team_id为0, 表示当前已开启新的一期，文字提示应改为’参团成功，本期幸运购已开团，中奖结果可点击下方查看参团列表‘ | ||
| 187 | - //如果team_id为0，取出之前保存的team_id替换掉，请求上一期已成团的幸运购活动 | ||
| 188 | - }) | ||
| 189 | 186 | ||
| 190 | 187 | ||
| 191 | - // 幸运购成团成员 | ||
| 192 | - await getApp().request.promiseGet("/api/weshop/prom/luckyOrder/page", { | ||
| 193 | - data: { | ||
| 194 | - store_id: o.stoid, | ||
| 195 | - team_id: this.data.luckyGoInfo.team_id, | ||
| 196 | - } | ||
| 197 | - }).then(res => { | ||
| 198 | - console.log('成团成员====>', res.data.data.pageData); | ||
| 199 | - th.setData({ | ||
| 200 | - luckyGoMembers: res.data.data.pageData, | ||
| 201 | - }); | ||
| 202 | - }) | ||
| 203 | - | ||
| 204 | 188 | ||
| 205 | 189 | ||
| 206 | //获取order信息根据订单编号order_sn | 190 | //获取order信息根据订单编号order_sn |
| 207 | - await getApp().request.promiseGet("/api/weshop/order/page", { | ||
| 208 | - data: { store_id: o.stoid, order_sn: order_sn,} | ||
| 209 | - }).then(res => { | ||
| 210 | - console.log('获取order信息====>', order); | ||
| 211 | - order = res.data.data.pageData[0]; | ||
| 212 | - pt_prom_id = order.pt_prom_id; | ||
| 213 | - pt_listno = order.pt_listno; | ||
| 214 | - }) | ||
| 215 | - | ||
| 216 | - if (this.data.payf || order.pt_status == 3) p_status = 3; //失败 | ||
| 217 | - if (order.pt_status == 2 || order.pt_status == 4 || order.pt_status == 5) | ||
| 218 | - p_status = 2; //成功 | ||
| 219 | - if (order.pt_status < 2 && !this.data.payf) | ||
| 220 | - p_status = 1; //正在进行 | ||
| 221 | - if ( order.pt_status == 6) p_status = 4; //支付尾款失败 | ||
| 222 | - | ||
| 223 | - //多少人参团头像 | ||
| 224 | - // await getApp().request.promiseGet("/api/weshop/order/pagePtList", { | ||
| 225 | - // data: { store_id: o.stoid, pt_listno: pt_listno, } | ||
| 226 | - // }).then(res => { | ||
| 227 | - // ordertx = res.data.data.pageData; | ||
| 228 | - // }) | ||
| 229 | - | ||
| 230 | - | ||
| 231 | - var min_price=0; | ||
| 232 | - //获取活动表的信息根据活动pt_prom_id | ||
| 233 | - await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + pt_prom_id, { | ||
| 234 | - data: { } | ||
| 235 | - }).then(res => { | ||
| 236 | - if (res.data.code==0){ | ||
| 237 | - teamlist = res.data.data; | ||
| 238 | - this.setData({teamlist: teamlist}); | ||
| 239 | - //获取当前时间,并且判断剩余时间 | ||
| 240 | - var nt = ut.gettimestamp(); | ||
| 241 | - teamlist.status = 0; | ||
| 242 | - if (nt >= teamlist.start_time) teamlist.status = 1; | ||
| 243 | - | ||
| 244 | - goods_id = res.data.data.goods_id; | ||
| 245 | - id = res.data.data.id; | ||
| 246 | - share_img = ee.data.imageurl + res.data.data.share_imgurl; | ||
| 247 | - | ||
| 248 | - //----------查看阶梯团------------ | ||
| 249 | - if (teamlist.ct_rylist != "" && teamlist.ct_rylist != null && teamlist.ct_rylist != undefined){ | ||
| 250 | - var ct_rylist = JSON.parse(teamlist.ct_rylist); | ||
| 251 | - var max=0; var pri=0; | ||
| 252 | - ct_rylist.forEach(function (val,ind) { | ||
| 253 | - if(val.rynum>max){ | ||
| 254 | - max=val.rynum; | ||
| 255 | - pri = val.price; | ||
| 256 | - } | ||
| 257 | - }) | ||
| 258 | - max_num=max; | ||
| 259 | - min_price=pri; | 191 | + // await getApp().request.promiseGet("/api/weshop/order/page", { |
| 192 | + // data: { store_id: o.stoid, order_sn: order_sn,} | ||
| 193 | + // }).then(res => { | ||
| 194 | + // console.log('获取order信息====>', order); | ||
| 195 | + // order = res.data.data.pageData[0]; | ||
| 196 | + // pt_prom_id = order.pt_prom_id; | ||
| 197 | + // pt_listno = order.pt_listno; | ||
| 198 | + // }) | ||
| 199 | + | ||
| 200 | + // if (this.data.payf || order.pt_status == 3) p_status = 3; //失败 | ||
| 201 | + // if (order.pt_status == 2 || order.pt_status == 4 || order.pt_status == 5) | ||
| 202 | + // p_status = 2; //成功 | ||
| 203 | + // if (order.pt_status < 2 && !this.data.payf) | ||
| 204 | + // p_status = 1; //正在进行 | ||
| 205 | + // if ( order.pt_status == 6) p_status = 4; //支付尾款失败 | ||
| 206 | + | ||
| 207 | + // //多少人参团头像 | ||
| 208 | + // // await getApp().request.promiseGet("/api/weshop/order/pagePtList", { | ||
| 209 | + // // data: { store_id: o.stoid, pt_listno: pt_listno, } | ||
| 210 | + // // }).then(res => { | ||
| 211 | + // // ordertx = res.data.data.pageData; | ||
| 212 | + // // }) | ||
| 213 | + | ||
| 214 | + | ||
| 215 | + // var min_price=0; | ||
| 216 | + // //获取活动表的信息根据活动pt_prom_id | ||
| 217 | + // await getApp().request.promiseGet("/api/weshop/teamlist/get/" + os.stoid + "/" + pt_prom_id, { | ||
| 218 | + // data: { } | ||
| 219 | + // }).then(res => { | ||
| 220 | + // if (res.data.code==0){ | ||
| 221 | + // teamlist = res.data.data; | ||
| 222 | + // this.setData({teamlist: teamlist}); | ||
| 223 | + // //获取当前时间,并且判断剩余时间 | ||
| 224 | + // var nt = ut.gettimestamp(); | ||
| 225 | + // teamlist.status = 0; | ||
| 226 | + // if (nt >= teamlist.start_time) teamlist.status = 1; | ||
| 227 | + | ||
| 228 | + // goods_id = res.data.data.goods_id; | ||
| 229 | + // id = res.data.data.id; | ||
| 230 | + // share_img = ee.data.imageurl + res.data.data.share_imgurl; | ||
| 231 | + | ||
| 232 | + // //----------查看阶梯团------------ | ||
| 233 | + // if (teamlist.ct_rylist != "" && teamlist.ct_rylist != null && teamlist.ct_rylist != undefined){ | ||
| 234 | + // var ct_rylist = JSON.parse(teamlist.ct_rylist); | ||
| 235 | + // var max=0; var pri=0; | ||
| 236 | + // ct_rylist.forEach(function (val,ind) { | ||
| 237 | + // if(val.rynum>max){ | ||
| 238 | + // max=val.rynum; | ||
| 239 | + // pri = val.price; | ||
| 240 | + // } | ||
| 241 | + // }) | ||
| 242 | + // max_num=max; | ||
| 243 | + // min_price=pri; | ||
| 260 | 244 | ||
| 261 | - } | 245 | + // } |
| 262 | 246 | ||
| 263 | 247 | ||
| 264 | - //获取商品信息 | ||
| 265 | - getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + goods_id, { | ||
| 266 | - }).then(res => { | ||
| 267 | - //商品地址 | ||
| 268 | - original_img = ee.data.imageurl+ res.data.data.original_img, | ||
| 269 | - goods = res.data.data | 248 | + // //获取商品信息 |
| 249 | + // getApp().request.promiseGet("/api/weshop/goods/get/" + os.stoid + "/" + goods_id, { | ||
| 250 | + // }).then(res => { | ||
| 251 | + // //商品地址 | ||
| 252 | + // original_img = ee.data.imageurl+ res.data.data.original_img, | ||
| 253 | + // goods = res.data.data | ||
| 270 | 254 | ||
| 271 | - ee.setData({goods: goods,image: original_img,}) | 255 | + // ee.setData({goods: goods,image: original_img,}) |
| 272 | 256 | ||
| 273 | - }) | 257 | + // }) |
| 274 | 258 | ||
| 275 | - } | ||
| 276 | - }) | 259 | + // } |
| 260 | + // }) | ||
| 277 | 261 | ||
| 278 | 262 | ||
| 279 | //只装5个 | 263 | //只装5个 |
| @@ -299,28 +283,28 @@ Page({ | @@ -299,28 +283,28 @@ Page({ | ||
| 299 | 283 | ||
| 300 | 284 | ||
| 301 | //获取活动从表信息team_id:305暂时 | 285 | //获取活动从表信息team_id:305暂时 |
| 302 | - await getApp().request.promiseGet("/api/weshop/teamgroup/page" , { | ||
| 303 | - data: { store_id: os.stoid, listno: pt_listno, team_id: pt_prom_id } | ||
| 304 | - }).then(res => { | ||
| 305 | - teamgroup = res.data.data.pageData[0]; | ||
| 306 | - if (teamgroup){ | ||
| 307 | - var buy_start_date = ut.formatTime(teamgroup.buy_start_date, "yyyy-MM-dd hh:mm:ss"); | ||
| 308 | - teamgroup.buy_start_date=buy_start_date; | ||
| 309 | - } | ||
| 310 | - }) | 286 | + // await getApp().request.promiseGet("/api/weshop/teamgroup/page" , { |
| 287 | + // data: { store_id: os.stoid, listno: pt_listno, team_id: pt_prom_id } | ||
| 288 | + // }).then(res => { | ||
| 289 | + // teamgroup = res.data.data.pageData[0]; | ||
| 290 | + // if (teamgroup){ | ||
| 291 | + // var buy_start_date = ut.formatTime(teamgroup.buy_start_date, "yyyy-MM-dd hh:mm:ss"); | ||
| 292 | + // teamgroup.buy_start_date=buy_start_date; | ||
| 293 | + // } | ||
| 294 | + // }) | ||
| 311 | 295 | ||
| 312 | 296 | ||
| 313 | - var ct_price = 0, | ||
| 314 | - num_0 = ordertx.length; | ||
| 315 | - if (teamlist.kttype == 3){ | ||
| 316 | - var js_data = JSON.parse(teamlist.ct_rylist); | ||
| 317 | - js_data.forEach(function (val,ind) { | ||
| 318 | - if (num_0<=val.rynum && ct_price==0){ | ||
| 319 | - ct_price=val.price; | ||
| 320 | - } | ||
| 321 | - }) | ||
| 322 | - if(ct_price==0) ct_price=min_price; | ||
| 323 | - } | 297 | + // var ct_price = 0, |
| 298 | + // num_0 = ordertx.length; | ||
| 299 | + // if (teamlist.kttype == 3){ | ||
| 300 | + // var js_data = JSON.parse(teamlist.ct_rylist); | ||
| 301 | + // js_data.forEach(function (val,ind) { | ||
| 302 | + // if (num_0<=val.rynum && ct_price==0){ | ||
| 303 | + // ct_price=val.price; | ||
| 304 | + // } | ||
| 305 | + // }) | ||
| 306 | + // if(ct_price==0) ct_price=min_price; | ||
| 307 | + // } | ||
| 324 | 308 | ||
| 325 | //获取大家都在团信息 | 309 | //获取大家都在团信息 |
| 326 | getApp().request.promiseGet("/api/weshop/teamlist/pageteam/1?store_id="+ os.stoid +"&is_end=0&is_show=1" , { | 310 | getApp().request.promiseGet("/api/weshop/teamlist/pageteam/1?store_id="+ os.stoid +"&is_end=0&is_show=1" , { |
| @@ -334,416 +318,520 @@ Page({ | @@ -334,416 +318,520 @@ Page({ | ||
| 334 | }) | 318 | }) |
| 335 | 319 | ||
| 336 | //--当是成团的时候的操作-- | 320 | //--当是成团的时候的操作-- |
| 337 | - if(order.pt_status==2 || order.pt_status==4 || order.pt_status==5){ | ||
| 338 | - //设置值 | ||
| 339 | - | ||
| 340 | - ee.setData({ | ||
| 341 | - ordertx2: ordertx2, ordertx: ordertx, teamlist: teamlist, teamgroup: teamgroup, min_price: min_price, | ||
| 342 | - order: order, share_img: share_img,max_num:max_num, | ||
| 343 | - pindGoods: teamlist,is_show:1, zk:false, | ||
| 344 | - hiddenName: false, ct_price:ct_price,p_status:p_status,sf_arr:sf_arr}); | ||
| 345 | - | ||
| 346 | - //--是否支付了尾款-- | ||
| 347 | - if(order.pt_status==4 || order.pt_status==5){ | ||
| 348 | - ee.setData({is_pay_wk:1}); | ||
| 349 | - } | ||
| 350 | - }else{ | ||
| 351 | - console.log("239什么鬼", teamlist); | ||
| 352 | - //设置值 | ||
| 353 | - ee.setData({ | ||
| 354 | - ordertx2: ordertx2, ordertx: ordertx, teamlist: teamlist, teamgroup: teamgroup, | ||
| 355 | - order: order, p_status: p_status, min_price:min_price, | ||
| 356 | - share_img: share_img, max_num: max_num, pindGoods: teamlist, is_show: 1, | ||
| 357 | - ct_price: ct_price, p_status: p_status,sf_arr:sf_arr}); | ||
| 358 | - } | 321 | + // if(order.pt_status==2 || order.pt_status==4 || order.pt_status==5){ |
| 322 | + // //设置值 | ||
| 323 | + | ||
| 324 | + // ee.setData({ | ||
| 325 | + // ordertx2: ordertx2, ordertx: ordertx, teamlist: teamlist, teamgroup: teamgroup, min_price: min_price, | ||
| 326 | + // order: order, share_img: share_img,max_num:max_num, | ||
| 327 | + // pindGoods: teamlist,is_show:1, zk:false, | ||
| 328 | + // hiddenName: false, ct_price:ct_price,p_status:p_status,sf_arr:sf_arr}); | ||
| 329 | + | ||
| 330 | + // //--是否支付了尾款-- | ||
| 331 | + // if(order.pt_status==4 || order.pt_status==5){ | ||
| 332 | + // ee.setData({is_pay_wk:1}); | ||
| 333 | + // } | ||
| 334 | + // }else{ | ||
| 335 | + // console.log("239什么鬼", teamlist); | ||
| 336 | + // //设置值 | ||
| 337 | + // ee.setData({ | ||
| 338 | + // ordertx2: ordertx2, ordertx: ordertx, teamlist: teamlist, teamgroup: teamgroup, | ||
| 339 | + // order: order, p_status: p_status, min_price:min_price, | ||
| 340 | + // share_img: share_img, max_num: max_num, pindGoods: teamlist, is_show: 1, | ||
| 341 | + // ct_price: ct_price, p_status: p_status,sf_arr:sf_arr}); | ||
| 342 | + // } | ||
| 359 | 343 | ||
| 360 | wx.hideLoading(); | 344 | wx.hideLoading(); |
| 361 | 345 | ||
| 362 | wx.setNavigationBarTitle({ | 346 | wx.setNavigationBarTitle({ |
| 363 | title: "拼团详情", | 347 | title: "拼团详情", |
| 364 | - }) | 348 | + }); |
| 365 | 349 | ||
| 366 | - ee.countDown2(); | 350 | + // ee.countDown2(); |
| 367 | 351 | ||
| 368 | //获取分享图片的本地地址 | 352 | //获取分享图片的本地地址 |
| 369 | - var path2 = os.imghost + teamlist.share_imgurl; | ||
| 370 | - wx.getImageInfo({ | ||
| 371 | - src: path2, | ||
| 372 | - success: function (res) { | ||
| 373 | - //res.path是网络图片的本地地址 | ||
| 374 | - ee.data.share_img_localpath = res.path; | ||
| 375 | - }, | ||
| 376 | - fail: function (res) { | ||
| 377 | - //失败回调 | ||
| 378 | - } | ||
| 379 | - }); | 353 | + // var path2 = os.imghost + th.data.luckyGoInfo.original_img; |
| 354 | + // wx.getImageInfo({ | ||
| 355 | + // src: path2, | ||
| 356 | + // success: function (res) { | ||
| 357 | + // //res.path是网络图片的本地地址 | ||
| 358 | + // ee.data.share_img_localpath = res.path; | ||
| 359 | + // }, | ||
| 360 | + // fail: function (res) { | ||
| 361 | + // //失败回调 | ||
| 362 | + // } | ||
| 363 | + // }); | ||
| 380 | 364 | ||
| 381 | 365 | ||
| 382 | }, | 366 | }, |
| 383 | //---小于10的格式化函数---- | 367 | //---小于10的格式化函数---- |
| 384 | - timeFormat(param) { | ||
| 385 | - return param < 10 ? '0' + param : param; | ||
| 386 | - }, | ||
| 387 | - countDown2() { | ||
| 388 | - var th = this; | ||
| 389 | - // 获取当前时间，同时得到活动结束时间数组 | ||
| 390 | - var newTime = ut.gettimestamp(); | ||
| 391 | - var o = this.data.teamgroup; | ||
| 392 | - if(!o) return false; | 368 | + // timeFormat(param) { |
| 369 | + // return param < 10 ? '0' + param : param; | ||
| 370 | + // }, | ||
| 371 | + // countDown2() { | ||
| 372 | + // var th = this; | ||
| 373 | + // // 获取当前时间，同时得到活动结束时间数组 | ||
| 374 | + // var newTime = ut.gettimestamp(); | ||
| 375 | + // var o = this.data.teamgroup; | ||
| 376 | + // if(!o) return false; | ||
| 393 | 377 | ||
| 394 | - var endTime = o.kt_end_time; | ||
| 395 | - if (o.status == 0) endTime = o.start_time; | 378 | + // var endTime = o.kt_end_time; |
| 379 | + // if (o.status == 0) endTime = o.start_time; | ||
| 396 | 380 | ||
| 397 | - //看一下，是否要支付尾款 | ||
| 398 | - if(o.team_type==3 && th.data.order.pt_status==2){ | ||
| 399 | - endTime = o.wk_end_time; | ||
| 400 | - } | 381 | + // //看一下，是否要支付尾款 |
| 382 | + // if(o.team_type==3 && th.data.order.pt_status==2){ | ||
| 383 | + // endTime = o.wk_end_time; | ||
| 384 | + // } | ||
| 401 | 385 | ||
| 402 | - let obj = null; | ||
| 403 | - // 如果活动未结束，对时间进行处理 | ||
| 404 | - if (endTime - newTime > 0) { | ||
| 405 | - let time = (endTime - newTime); | ||
| 406 | - // 获取天、时、分、秒 | ||
| 407 | - let day = parseInt(time / (60 * 60 * 24)); | ||
| 408 | - let hou = parseInt(time % (60 * 60 * 24) / 3600); | ||
| 409 | - let min = parseInt(time % (60 * 60 * 24) % 3600 / 60); | ||
| 410 | - let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60); | ||
| 411 | - obj = { | ||
| 412 | - day: this.timeFormat(day), | ||
| 413 | - hou: this.timeFormat(hou), | ||
| 414 | - min: this.timeFormat(min), | ||
| 415 | - sec: this.timeFormat(sec) | 386 | + // let obj = null; |
| 387 | + // // 如果活动未结束，对时间进行处理 | ||
| 388 | + // if (endTime - newTime > 0) { | ||
| 389 | + // let time = (endTime - newTime); | ||
| 390 | + // // 获取天、时、分、秒 | ||
| 391 | + // let day = parseInt(time / (60 * 60 * 24)); | ||
| 392 | + // let hou = parseInt(time % (60 * 60 * 24) / 3600); | ||
| 393 | + // let min = parseInt(time % (60 * 60 * 24) % 3600 / 60); | ||
| 394 | + // let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60); | ||
| 395 | + // obj = { | ||
| 396 | + // day: this.timeFormat(day), | ||
| 397 | + // hou: this.timeFormat(hou), | ||
| 398 | + // min: this.timeFormat(min), | ||
| 399 | + // sec: this.timeFormat(sec) | ||
| 400 | + // } | ||
| 401 | + // } else { | ||
| 402 | + // //活动已结束，全部设置为'00' | ||
| 403 | + // obj = { | ||
| 404 | + // day: '00', | ||
| 405 | + // hou: '00', | ||
| 406 | + // min: '00', | ||
| 407 | + // sec: '00' | ||
| 408 | + // } | ||
| 409 | + // } | ||
| 410 | + // var txt = "pindGoods.djs"; | ||
| 411 | + // th.setData({ | ||
| 412 | + // obj: obj | ||
| 413 | + // }); | ||
| 414 | + // setTimeout(th.countDown2, 1000); | ||
| 415 | + // }, | ||
| 416 | + | ||
| 417 | + | ||
| 418 | + | ||
| 419 | + //--定义的保存图片方法，分享团--- | ||
| 420 | + saveImageToPhotosAlbum: function () { | ||
| 421 | + var that = this, th = that; | ||
| 422 | + var app = getApp(); | ||
| 423 | + | ||
| 424 | + // 关闭底部分享弹窗 | ||
| 425 | + this.setData({ | ||
| 426 | + share_hidden: false, | ||
| 427 | + }); | ||
| 428 | + | ||
| 429 | + //--先判断会员状态-- | ||
| 430 | + var user_info = getApp().globalData.userInfo; | ||
| 431 | + if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { | ||
| 432 | + //getApp().my_warnning("请先登录",0,this); | ||
| 433 | + // wx.navigateTo({ url: '/pages/togoin/togoin', }) | ||
| 434 | + // return false; | ||
| 435 | + } | ||
| 436 | + | ||
| 437 | + // if (this.data.share_hidden) { | ||
| 438 | + // this.setData({ share_hidden: false,}); | ||
| 439 | + // }; | ||
| 440 | + | ||
| 441 | + //类型 0普通商品 1秒杀商品 2商家和会员团 3阶梯团 4阶梯团 9幸运购 | ||
| 442 | + var type = 9; | ||
| 443 | + // if (type == 6) type = 2; | ||
| 444 | + // if (this.data.prom_act && this.data.prom_act.kttype == 3) type = 3; | ||
| 445 | + | ||
| 446 | + wx.showLoading({title: '生成海报中'}); | ||
| 447 | + | ||
| 448 | + //设置画板显示，才能开始绘图 | ||
| 449 | + // that.setData({ | ||
| 450 | + // canvasHidden: true | ||
| 451 | + // }) | ||
| 452 | + | ||
| 453 | + | ||
| 454 | + var unit = that.data.screenWidth / 750 * 1.35; //基础单位， | ||
| 455 | + // var path2 = th.data.iurl + th.data.luckyGoInfo.original_img; | ||
| 456 | + var scene = th.data.param.goods_id + ''; | ||
| 457 | + scene+="."+9+"."+th.data.luckyGoInfo.id; | ||
| 458 | + | ||
| 459 | + var user_id = getApp().globalData.user_id ? getApp().globalData.user_id : 0; | ||
| 460 | + if (user_id > 0) { | ||
| 461 | + scene += "_" + user_id; | ||
| 462 | + }; | ||
| 463 | + //-- 如果不是会员分享过来的要分享给别人 -- | ||
| 464 | + if(getApp().globalData.room_id && th.data.data.goods_id == getApp().globalData.room_goods_id && !getApp().globalData.room_user_share) { | ||
| 465 | + //固定房间是第3个字符 | ||
| 466 | + if (!user_id) scene += "_0"; | ||
| 467 | + scene += "_" + getApp().globalData.room_id; | ||
| 468 | + }; | ||
| 469 | + ///二微码 | ||
| 470 | + var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + | ||
| 471 | + os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo"; | ||
| 472 | + | ||
| 473 | + | ||
| 474 | + // 读取文件成功则OK-- | ||
| 475 | + wx.getImageInfo({ | ||
| 476 | + src: path3, | ||
| 477 | + success: function (res) { | ||
| 478 | + // 回调写法 | ||
| 479 | + th.get_head_temp(th.get_goods_temp, function () { | ||
| 480 | + var vpath = res.path; | ||
| 481 | + var context = wx.createCanvasContext('share'); | ||
| 482 | + // 先画背景 | ||
| 483 | + var pg_path = "../../../../images/share/share_bg.png"; | ||
| 484 | + | ||
| 485 | + // context.fillStyle="#FFFFFF"; | ||
| 486 | + // context.fillRect(0,0,554 * unit, 899 * unit); | ||
| 487 | + | ||
| 488 | + // if(type == 0) { | ||
| 489 | + // this.drawPoster(context); | ||
| 490 | + // return false; | ||
| 491 | + // }; | ||
| 492 | + | ||
| 493 | + | ||
| 494 | + //-- 如果有自定义海报的时候，判断背景的图片 -- | ||
| 495 | + // if (th.data.share_b_img) { | ||
| 496 | + // pg_path = th.data.share_b_img; | ||
| 497 | + // } | ||
| 498 | + | ||
| 499 | + // context.drawImage(pg_path, 0, 0, 554 * unit, 899 * unit); | ||
| 500 | + | ||
| 501 | + | ||
| 502 | + // if(type == 0) { | ||
| 503 | + // // 如果是普通商品，绘制新海报 | ||
| 504 | + // th.drawPoster(context, unit, th.data.share_goods_img, vpath); | ||
| 505 | + // } else { | ||
| 506 | + context.drawImage(pg_path, 0, 0, 554 * unit, 899 * unit); | ||
| 507 | + // }; | ||
| 508 | + | ||
| 509 | + // th.drawPoster(context, unit, th.data.share_goods_img, vpath); | ||
| 510 | + | ||
| 511 | + | ||
| 512 | + //-- 是自定义海报的情况下 -- | ||
| 513 | + if(type != 0) { | ||
| 514 | + | ||
| 515 | + | ||
| 516 | + | ||
| 517 | + if (th.data.poster && parseInt(th.data.poster.style) == 2) { | ||
| 518 | + //在线上分享人的情况下 | ||
| 519 | + // if (parseInt(th.data.poster.show_headpic)) { | ||
| 520 | + // //获取坐标 | ||
| 521 | + // var x = parseFloat(th.data.poster.head_x) * 2; | ||
| 522 | + // var y = parseFloat(th.data.poster.head_y) * 2; | ||
| 523 | + // var x1 = (x + 90) * unit; | ||
| 524 | + // var y1 = (y + 50) * unit; | ||
| 525 | + // //--昵称--- | ||
| 526 | + // context.setFontSize(24 * unit) | ||
| 527 | + // context.setFillStyle("black") | ||
| 528 | + // context.fillText(app.globalData.userInfo.nickname, x1, y1); | ||
| 529 | + // var width = 24 * app.globalData.userInfo.nickname.length * unit + 4 * unit; | ||
| 530 | + // //强烈推荐 改许程 | ||
| 531 | + // var tj_path = "../../../../images/share/q_tj.png"; | ||
| 532 | + // context.drawImage(tj_path, x1 + width, y1 - 22 * unit, 85 * unit, 30 * unit); | ||
| 533 | + // context.setFontSize(16 * unit); | ||
| 534 | + // context.setLineJoin('round'); //交点设置成圆角 | ||
| 535 | + // context.setFillStyle("white"); | ||
| 536 | + // context.fillText('强烈推荐', x1 + width + 8 * unit, y1 - 1 * unit); | ||
| 537 | + | ||
| 538 | + // //context.setFillStyle("black") | ||
| 539 | + // //context.setFontSize(24 * unit) | ||
| 540 | + // //context.fillText(getApp().globalData.config.store_name, 40 * unit, 130 * unit); | ||
| 541 | + // } | ||
| 542 | + } else { | ||
| 543 | + //--昵称--- | ||
| 544 | + context.setFontSize(24 * unit); | ||
| 545 | + context.setFillStyle("black"); | ||
| 546 | + context.fillText(getApp().globalData.userInfo.nickname, 152 * unit, 60 * unit); | ||
| 547 | + var width = 24 * getApp().globalData.userInfo.nickname.length * unit + 2 * unit; | ||
| 548 | + //强烈推荐 改许程 | ||
| 549 | + // var tj_path = "../../../../images/share/q_tj.png"; | ||
| 550 | + // let txt_gn = th.data.luckGoInfo.group_num + '人团'; | ||
| 551 | + // let width_gn = ut.measureText(txt_gn, 15); | ||
| 552 | + // context.drawImage(tj_path, 152 * unit + width, 54 * unit, (width_gn + 20) * unit, 30 * unit); | ||
| 553 | + // context.setFontSize(16 * unit); | ||
| 554 | + // context.setLineJoin('round'); //交点设置成圆角 | ||
| 555 | + // context.setFillStyle("white"); | ||
| 556 | + // context.fillText(txt_gn, 149 * unit + width + 15 * unit, 75 * unit); | ||
| 557 | + // 发出幸运购活动邀请 | ||
| 558 | + context.setFillStyle("#7f7f7f") | ||
| 559 | + context.setFontSize(21.3 * unit) | ||
| 560 | + context.fillText("向您发出幸运购邀请", 152 * unit, 90 * unit); | ||
| 561 | + | ||
| 562 | + } | ||
| 563 | + | ||
| 564 | + }; | ||
| 565 | + | ||
| 566 | + | ||
| 567 | + // var share_title = th.data.data.goods_name; | ||
| 568 | + var share_title = th.data.param.goods_name; | ||
| 569 | + // if (th.data.prom_type == 1 || th.data.prom_type == 6 || th.data.prom_type == 4) { | ||
| 570 | + // share_title = th.data.prom_act.share_title; | ||
| 571 | + // if (!share_title) share_title = th.data.prom_act.title; | ||
| 572 | + // if (th.data.prom_type == 4) share_title = th.data.prom_act.name; | ||
| 573 | + // } | ||
| 574 | + | ||
| 575 | + //---产品名称--- | ||
| 576 | + //文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度 | ||
| 577 | + if (type != 4 && type != 0) { | ||
| 578 | + context.setFillStyle("black"); | ||
| 579 | + context.setFontSize(21.3 * unit); | ||
| 580 | + th.draw_Text(context, share_title, | ||
| 581 | + 38 * unit, 180 * unit, 220 * unit, 220 * unit, unit); | ||
| 582 | + | ||
| 583 | + //------产品的价格------- | ||
| 584 | + context.setFontSize(23 * unit); | ||
| 585 | + context.setFillStyle("red"); | ||
| 586 | + | ||
| 587 | + | ||
| 588 | + // var pri0 = th.data.data.shop_price; | ||
| 589 | + var pri0 = th.data.luckyGoInfo.group_price/100; | ||
| 590 | + if (th.data.prom_act) pri0 = th.data.prom_act.price; | ||
| 591 | + pri0 = parseFloat(pri0).toFixed(2); | ||
| 592 | + var wd1 = th.data.screenWidth - ut.measureText(pri0, 31 * unit) - 25; | ||
| 593 | + context.fillText("￥", wd1 - 15, 185 * unit); | ||
| 594 | + context.setFontSize(31 * unit); | ||
| 595 | + context.fillText(pri0, wd1, 185 * unit); | ||
| 596 | + | ||
| 597 | + var tj_path = "../../../../images/share/q_tj.png"; | ||
| 598 | + context.drawImage(tj_path, 315 * unit, 158 * unit, 85 * unit, 30 * unit); | ||
| 599 | + context.setLineJoin('round'); //交点设置成圆角 | ||
| 600 | + context.setFontSize(18 * unit); | ||
| 601 | + context.setFillStyle("white"); | ||
| 602 | + context.fillText('参团价', 330 * unit, 179 * unit); | ||
| 603 | + | ||
| 604 | + //---市场价划掉--- | ||
| 605 | + context.setFillStyle("gray"); | ||
| 606 | + context.setFontSize(22 * unit); | ||
| 607 | + pri0 = "零售价：￥" + th.data.luckyGoInfo.market_price.toFixed(2); | ||
| 608 | + var wd2 = th.data.screenWidth - ut.measureText(pri0, 22 * unit) - 25; | ||
| 609 | + context.fillText(pri0, wd2, 213 * unit); | ||
| 610 | + | ||
| 611 | + context.setStrokeStyle('gray'); | ||
| 612 | + context.setLineWidth(1 * unit); | ||
| 613 | + context.moveTo(wd2 - 5, 206 * unit); | ||
| 614 | + context.lineTo(wd2 + ut.measureText(pri0, 22 * unit) + 5, 206 * unit); | ||
| 615 | + context.stroke(); | ||
| 616 | + | ||
| 617 | + } else if(type == 4 && type != 0) { | ||
| 618 | + context.setFillStyle("black"); | ||
| 619 | + context.setFontSize(21.3 * unit); | ||
| 620 | + th.draw_Text(context, share_title, | ||
| 621 | + 38 * unit, 170 * unit, 20 * unit, 300 * unit, unit); | ||
| 622 | + //------ 产品的价格 ----- | ||
| 623 | + var pri0 = th.data.prom_act.addmoney; | ||
| 624 | + var integral = th.data.prom_act.integral; | ||
| 625 | + var text = ""; | ||
| 626 | + if (integral) { text = integral + "积分"; } | ||
| 627 | + if (pri0 && integral) { text += "+"; } | ||
| 628 | + if (pri0) { text += "￥" + pri0; } | ||
| 629 | + | ||
| 630 | + if (!pri0 && !integral) { text = "0积分"; } | ||
| 631 | + context.setFillStyle("red"); | ||
| 632 | + context.fillText(text, 38 * unit, 235 * unit); | ||
| 633 | + | ||
| 416 | } | 634 | } |
| 417 | - } else { | ||
| 418 | - //活动已结束，全部设置为'00' | ||
| 419 | - obj = { | ||
| 420 | - day: '00', | ||
| 421 | - hou: '00', | ||
| 422 | - min: '00', | ||
| 423 | - sec: '00' | 635 | + |
| 636 | + //---中间大图--- | ||
| 637 | + // if(type != 0) { | ||
| 638 | + // ee.data.share_img_localpath | ||
| 639 | + context.drawImage(that.data.share_img_localpath, 70 * unit, 250 * unit, 408 * unit, 408 * unit); | ||
| 640 | + // wx.getImageInfo({ | ||
| 641 | + // src: th.data.iurl + th.data.luckyGoInfo.original_img, | ||
| 642 | + // ssuccess: function (res) { | ||
| 643 | + // //res.path是网络图片的本地地址 | ||
| 644 | + // console.log('res.path', res.path); | ||
| 645 | + // context.drawImage(res.path, 70 * unit, 250 * unit, 408 * unit, 408 * unit); | ||
| 646 | + // // ee.data.share_img_localpath = res.path; | ||
| 647 | + // // tt(); | ||
| 648 | + // }, | ||
| 649 | + // fail: function (res) { | ||
| 650 | + // // context.drawImage('../../../../images/share/default_g_img.gif', 70 * unit, 250 * unit, 408 * unit, 408 * unit); | ||
| 651 | + // // ee.data.share_img_localpath= "../../../../images/share/default_g_img.gif"; //分享的图片不能用网络的 | ||
| 652 | + // // tt(); | ||
| 653 | + // } | ||
| 654 | + // }); | ||
| 655 | + // context.drawImage(th.data.luckyGoInfo.original_img, 70 * unit, 250 * unit, 408 * unit, 408 * unit); | ||
| 656 | + // }; | ||
| 657 | + | ||
| 658 | + | ||
| 659 | + | ||
| 660 | + //-------大图后面就不一样了----------- | ||
| 661 | + switch (type) { | ||
| 662 | + case 9: | ||
| 663 | + | ||
| 664 | + //---画线--- | ||
| 665 | + context.setLineWidth(1 * unit) | ||
| 666 | + context.moveTo(32 * unit, 680 * unit) | ||
| 667 | + context.lineTo(520 * unit, 680 * unit) | ||
| 668 | + context.stroke(); | ||
| 669 | + | ||
| 670 | + //---文字--- | ||
| 671 | + context.setFillStyle("black") | ||
| 672 | + context.setFontSize(24 * unit) | ||
| 673 | + // context.font = 'normal bold 18px'; | ||
| 674 | + // context.fillText(th.data.sto_sele_name_1, 40 * unit, 720 * unit); | ||
| 675 | + | ||
| 676 | + //还差N人,即可成团 | ||
| 677 | + let group_num = th.data.luckyGoInfo.group_num; | ||
| 678 | + let num_joined = th.data.luckyGoInfo.num; | ||
| 679 | + let delta1 = group_num - num_joined; | ||
| 680 | + let width_delta1 = ut.measureText(delta1, 15); | ||
| 681 | + context.setFillStyle("black"); | ||
| 682 | + context.setFontSize(21.3 * unit); | ||
| 683 | + context.fillText(group_num + "人团，还差", 40 * unit, 772 * unit); | ||
| 684 | + context.setFillStyle("#FF6768"); | ||
| 685 | + context.setFontSize(21.3 * unit); | ||
| 686 | + context.fillText(delta1, 160 * unit, 772 * unit); | ||
| 687 | + context.setFillStyle("black"); | ||
| 688 | + context.setFontSize(21.3 * unit); | ||
| 689 | + context.fillText("人，即可成团", (170 + width_delta1) * unit, 772 * unit); | ||
| 690 | + | ||
| 691 | + // N人得商品,N人全额退款 | ||
| 692 | + let group_win = th.data.luckyGoInfo.group_win; | ||
| 693 | + let delta2 = group_num - group_win; | ||
| 694 | + let width_delta2 = ut.measureText(delta2, 16); | ||
| 695 | + let width_groupNum = ut.measureText(group_num, 15); | ||
| 696 | + let width_groupWin = ut.measureText(group_win, 15); | ||
| 697 | + context.setFillStyle("#FF6768"); | ||
| 698 | + context.setFontSize(21.3 * unit); | ||
| 699 | + context.fillText(group_win, 40 * unit, 806 * unit); | ||
| 700 | + context.setFillStyle("black"); | ||
| 701 | + context.setFontSize(21.3 * unit); | ||
| 702 | + context.fillText("人得商品，", (54 + width_groupWin) * unit, 806 * unit); | ||
| 703 | + context.setFillStyle("#FF6768"); | ||
| 704 | + context.setFontSize(21.3 * unit); | ||
| 705 | + context.fillText(delta2, 160 * unit, 806 * unit); | ||
| 706 | + context.setFillStyle("black"); | ||
| 707 | + context.setFontSize(21.3 * unit); | ||
| 708 | + context.fillText("人全额退款", (170 + width_delta2) * unit, 806 * unit); | ||
| 709 | + | ||
| 710 | + // 并得帮团惊喜礼品 | ||
| 711 | + context.setFillStyle("black") | ||
| 712 | + context.setFontSize(21.3 * unit) | ||
| 713 | + context.fillText("并得帮团", 40 * unit, 840 * unit); | ||
| 714 | + context.setFillStyle("#FF6768") | ||
| 715 | + context.setFontSize(21.3 * unit) | ||
| 716 | + context.fillText("惊喜礼品", 130 * unit, 840 * unit); | ||
| 717 | + context.setFillStyle("black") | ||
| 718 | + context.setFontSize(21.3 * unit) | ||
| 719 | + context.fillText("！", 220 * unit, 840 * unit); | ||
| 720 | + | ||
| 721 | + | ||
| 722 | + //---二维吗图--- | ||
| 723 | + //-- 自定义海报 -- | ||
| 724 | + if (th.data.poster) { | ||
| 725 | + var erm_x = parseFloat(th.data.poster.ewm_x) * 2; | ||
| 726 | + var erm_y = parseFloat(th.data.poster.ewm_y) * 2; | ||
| 727 | + context.drawImage(vpath, erm_x * unit, erm_y * unit, 136 * unit, 136 * unit); | ||
| 728 | + } else { | ||
| 729 | + //---二维吗图--- | ||
| 730 | + context.drawImage(vpath, 390 * unit, 726 * unit, 136 * unit, 136 * unit); | ||
| 731 | + } | ||
| 732 | + | ||
| 733 | + break; | ||
| 734 | + | ||
| 735 | + | ||
| 424 | } | 736 | } |
| 425 | - } | ||
| 426 | - var txt = "pindGoods.djs"; | ||
| 427 | - th.setData({ | ||
| 428 | - obj: obj | ||
| 429 | - }); | ||
| 430 | - setTimeout(th.countDown2, 1000); | ||
| 431 | - }, | ||
| 432 | - | ||
| 433 | - //--定义的保存图片方法，分享团--- | ||
| 434 | - saveImageToPhotosAlbum: function () { | ||
| 435 | - //类型 0普通商品 1秒杀商品 2商家和会员团 3阶梯团 | ||
| 436 | - var type=1; | ||
| 437 | - if(this.data.teamlist.kttype==3) type=2; | ||
| 438 | - | ||
| 439 | - wx.showLoading({ title: '生成中...', }) | ||
| 440 | - var that = this, th = that; | ||
| 441 | - //设置画板显示，才能开始绘图 | ||
| 442 | - that.setData({ | ||
| 443 | - canvasHidden: true, | ||
| 444 | - }) | 737 | + |
| 738 | + | ||
| 739 | + //--- 如果是自定义海报的时候 --- | ||
| 740 | + if(type != 0) { | ||
| 741 | + | ||
| 742 | + if (th.data.poster && parseInt(th.data.poster.style) == 2) { | ||
| 743 | + | ||
| 744 | + //如果显示会员信息的话 | ||
| 745 | + if (parseInt(th.data.poster.show_headpic)) { | ||
| 746 | + //获取坐标 | ||
| 747 | + var x = parseFloat(th.data.poster.head_x) * 2; | ||
| 748 | + var y = parseFloat(th.data.poster.head_y) * 2; | ||
| 749 | + //---绘制圆形要放在最后---- | ||
| 750 | + context.save(); | ||
| 751 | + context.beginPath(); | ||
| 752 | + var h_x = x * unit; | ||
| 753 | + var h_y = y * unit; | ||
| 754 | + var h_r = 40 * unit; | ||
| 755 | + var cx = h_x + h_r; | ||
| 756 | + var cy = h_y + h_r; | ||
| 757 | + context.arc(cx, cy, h_r, 0, Math.PI * 2, false); | ||
| 758 | + context.closePath(); | ||
| 759 | + context.fill(); | ||
| 760 | + context.clip(); | ||
| 761 | + context.drawImage(th.data.share_head, h_x, h_y, h_r * 2, h_r * 2); | ||
| 762 | + context.restore(); | ||
| 763 | + } | ||
| 764 | + | ||
| 765 | + } else { | ||
| 766 | + //---绘制圆形要放在最后---- | ||
| 767 | + context.save(); | ||
| 768 | + context.beginPath(); | ||
| 769 | + var h_x = 60 * unit; | ||
| 770 | + var h_y = 24 * unit; | ||
| 771 | + var h_r = 40 * unit; | ||
| 772 | + var cx = h_x + h_r; | ||
| 773 | + var cy = h_y + h_r; | ||
| 774 | + context.arc(cx, cy, h_r, 0, Math.PI * 2, false); | ||
| 775 | + context.closePath(); | ||
| 776 | + context.fill(); | ||
| 777 | + context.clip(); | ||
| 778 | + context.drawImage(th.data.share_head, h_x, h_y, h_r * 2, h_r * 2); | ||
| 779 | + context.restore(); | ||
| 780 | + } | ||
| 781 | + | ||
| 782 | + }; | ||
| 783 | + | ||
| 784 | + | ||
| 785 | + | ||
| 786 | + //把画板内容绘制成图片，并回调 画板图片路径 | ||
| 787 | + context.draw(false, function () { | ||
| 788 | + setTimeout(function () { | ||
| 789 | + wx.canvasToTempFilePath({ | ||
| 790 | + x: 0, | ||
| 791 | + y: 0, | ||
| 792 | + width: 750, | ||
| 793 | + height: 1217, | ||
| 794 | + destWidth: 1.2 * 750 * 750 / that.data.screenWidth, | ||
| 795 | + destHeight: 1.2 * 1217 * 750 / that.data.screenWidth, | ||
| 796 | + canvasId: 'share', | ||
| 797 | + success: function (res) { | ||
| 798 | + console.log('生成成功'); | ||
| 799 | + that.setData({ | ||
| 800 | + shareImgPath: res.tempFilePath, | ||
| 801 | + canvasHidden: true | ||
| 802 | + }) | ||
| 803 | + | ||
| 804 | + if (!res.tempFilePath) { | ||
| 805 | + wx.showModal({ | ||
| 806 | + title: '提示', | ||
| 807 | + content: '图片绘制中，请稍后重试', | ||
| 808 | + showCancel: false | ||
| 809 | + }) | ||
| 810 | + return false; | ||
| 811 | + } | ||
| 812 | + | ||
| 445 | 813 | ||
| 446 | - if(this.data.share_hidden) { | ||
| 447 | - this.setData({ | ||
| 448 | - share_hidden: false, | 814 | + that.setData({ |
| 815 | + showPoster: true, | ||
| 816 | + }); | ||
| 817 | + wx.hideLoading(); | ||
| 818 | + }, | ||
| 819 | + fail: function() { | ||
| 820 | + console.log('生成失败'); | ||
| 821 | + }, | ||
| 822 | + }) | ||
| 823 | + }, 500) | ||
| 824 | + | ||
| 449 | }); | 825 | }); |
| 450 | - }; | ||
| 451 | - | ||
| 452 | - var app = getApp(); | ||
| 453 | - var unit = that.data.screenWidth / 750 * 1.35; | ||
| 454 | - var scene=th.data.teamgroup.id; | ||
| 455 | - var user_id=getApp().globalData.user_id?getApp().globalData.user_id:0; | ||
| 456 | - if(user_id>0){ | ||
| 457 | - scene+="_"+user_id; | ||
| 458 | - } | ||
| 459 | - | ||
| 460 | - //二微码 | ||
| 461 | - var path3 = os.url+ "/api/wx/open/app/user/getWeAppEwm/"+ | ||
| 462 | - os.stoid+"?sceneValue="+scene+"&pageValue=pages/team/team_show/team_show"; | ||
| 463 | - | ||
| 464 | - //读取文件成功则OK-- | ||
| 465 | - wx.getImageInfo({ | ||
| 466 | - src: path3, | ||
| 467 | - success:function (res) { | ||
| 468 | - //回调写法 | ||
| 469 | - th.get_head_temp(th.get_goods_temp,function () { | ||
| 470 | - var vpath = res.path; | ||
| 471 | - var context = wx.createCanvasContext('share'); | ||
| 472 | - | ||
| 473 | - | ||
| 474 | - //先画背景 | ||
| 475 | - var pg_path = "../../../../images/share/share_bg.png"; | ||
| 476 | - //-- 如果有自定义海报的时候，判断背景的图片 -- | ||
| 477 | - if(th.data.share_b_img){ | ||
| 478 | - pg_path=th.data.share_b_img; | ||
| 479 | - } | ||
| 480 | - | ||
| 481 | - var share_title=th.data.teamlist.share_title; | ||
| 482 | - if(!share_title) | ||
| 483 | - share_title=th.data.teamlist.title; | ||
| 484 | - context.drawImage(pg_path, 0, 0, 554 * unit, 899 * unit); | ||
| 485 | - | ||
| 486 | - //-- 是自定义海报的情况下 -- | ||
| 487 | - if(th.data.poster && parseInt(th.data.poster.style)==2){ | ||
| 488 | - //在线上分享人的情况下 | ||
| 489 | - if(parseInt(th.data.poster.show_headpic)){ | ||
| 490 | - //获取坐标 | ||
| 491 | - var x=parseFloat(th.data.poster.head_x)*2; | ||
| 492 | - var y=parseFloat(th.data.poster.head_y)*2; | ||
| 493 | - var x1=(x+90) *unit; | ||
| 494 | - var y1=(y+50) *unit; | ||
| 495 | - //--昵称--- | ||
| 496 | - context.setFontSize(24 * unit) | ||
| 497 | - context.setFillStyle("black") | ||
| 498 | - context.fillText(app.globalData.userInfo.nickname, x1, y1); | ||
| 499 | - var width = 24 * app.globalData.userInfo.nickname.length * unit + 4 * unit; | ||
| 500 | - //强烈推荐 改许程 | ||
| 501 | - var tj_path = "../../../../images/share/q_tj.png"; | ||
| 502 | - context.drawImage(tj_path, x1 + width, y1-22*unit, 85 * unit, 30 * unit); | ||
| 503 | - context.setFontSize(16 * unit) | ||
| 504 | - context.setLineJoin('round'); //交点设置成圆角 | ||
| 505 | - context.setFillStyle("white") | ||
| 506 | - context.fillText('强烈推荐', x1 + width+8*unit, y1-1*unit); | ||
| 507 | - } | ||
| 508 | - | ||
| 509 | - }else{ | ||
| 510 | - //--昵称--- | ||
| 511 | - context.setFontSize(24 * unit) | ||
| 512 | - context.setFillStyle("black") | ||
| 513 | - context.fillText(app.globalData.userInfo.nickname, 152 * unit, 76 * unit); | ||
| 514 | - var width = 24 * app.globalData.userInfo.nickname.length * unit + 2 * unit; | ||
| 515 | - //强烈推荐 | ||
| 516 | - var tj_path = "../../../../images/share/q_tj.png"; | ||
| 517 | - context.drawImage(tj_path, 152 * unit + width, 54 * unit, 110 * unit, 30 * unit); | ||
| 518 | - context.setFontSize(18 * unit) | ||
| 519 | - context.setFillStyle("white") | ||
| 520 | - context.fillText('强烈推荐', 152 * unit + width + 20 * unit, 76 * unit); | ||
| 521 | - } | ||
| 522 | - | ||
| 523 | - | ||
| 524 | - //---产品名称--- | ||
| 525 | - context.setFontSize(21.3 * unit); | ||
| 526 | - context.setFillStyle("black"); | ||
| 527 | - | ||
| 528 | - | ||
| 529 | - | ||
| 530 | - | ||
| 531 | - th.draw_Text(context,share_title, | ||
| 532 | - 38 * unit, 180 * unit, 200 * unit, 279 * unit, unit); | ||
| 533 | - //------产品的价格------- | ||
| 534 | - context.setFontSize(24 * unit) | ||
| 535 | - context.setFillStyle("red") | ||
| 536 | - | ||
| 537 | - var pri0 = th.data.teamlist.price; | ||
| 538 | - pri0=parseFloat(pri0).toFixed(2); | ||
| 539 | - var wd1=th.data.screenWidth-ut.measureText(pri0, 31 * unit)-25; | ||
| 540 | - context.fillText("￥", wd1-15, 180 * unit); | ||
| 541 | - context.setFontSize(31 * unit) | ||
| 542 | - context.fillText(pri0, wd1, 180 * unit); | ||
| 543 | - | ||
| 544 | - //---市场价划掉--- | ||
| 545 | - context.setFillStyle("gray") | ||
| 546 | - context.setFontSize(22 * unit) | ||
| 547 | - pri0= "￥" + parseFloat(th.data.goods.market_price).toFixed(2); | ||
| 548 | - var wd2=th.data.screenWidth-ut.measureText(pri0, 22 * unit)-25; | ||
| 549 | - context.fillText(pri0, wd2, 210 * unit); | ||
| 550 | - | ||
| 551 | - context.setStrokeStyle('gray') | ||
| 552 | - context.setLineWidth(1 * unit) | ||
| 553 | - context.moveTo(wd2-5, 204 * unit) | ||
| 554 | - context.lineTo(wd2+ut.measureText(pri0, 22 * unit)+5, 204 * unit) | ||
| 555 | - context.stroke(); | ||
| 556 | - console.log(th.data.share_img_localpath); | ||
| 557 | - | ||
| 558 | - | ||
| 559 | - //---中间大图--- | ||
| 560 | - context.drawImage(th.data.share_img_localpath, 68 * unit, 242 * unit, 410 * unit, 410 * unit); | ||
| 561 | - | ||
| 562 | - var g_ct=th.data.teamlist.ct_num-th.data.ordertx.length; | ||
| 563 | - var wz= ""; | ||
| 564 | - if(g_ct>0) wz="还差"+g_ct+"人成团，"; | ||
| 565 | - else{ | ||
| 566 | - g_ct= th.data.max_num -th.data.ordertx.length; | ||
| 567 | - if(g_ct>0){ | ||
| 568 | - wz="还差"+g_ct+"人享最低优惠，"; | ||
| 569 | - }else{ | ||
| 570 | - wz="已享受最优惠，"; | ||
| 571 | - } | ||
| 572 | - } | ||
| 573 | - | ||
| 574 | - //-------大图后面就不一样了----------- | ||
| 575 | - switch (type) { | ||
| 576 | - case 1://会员团和商家团的展示 | ||
| 577 | - //---画线--- | ||
| 578 | - context.setLineWidth(1 * unit) | ||
| 579 | - context.moveTo(32 * unit, 670 * unit) | ||
| 580 | - context.lineTo(520 * unit, 670 * unit) | ||
| 581 | - context.stroke(); | ||
| 582 | - | ||
| 583 | - //---文字--- | ||
| 584 | - context.setFontSize(22 * unit) | ||
| 585 | - context.setFillStyle("black") | ||
| 586 | - context.fillText("好物拼起来,拼拼更划算", 40 * unit, 726 * unit); | ||
| 587 | - | ||
| 588 | - //绘制成团图片 | ||
| 589 | - var ct_img ="../../../../images/share/ct_num.png"; | ||
| 590 | - context.drawImage(ct_img, 40 * unit, 740 * unit, 120 * unit, 30 * unit); | ||
| 591 | - var ct_num = th.data.teamlist.ct_num; | ||
| 592 | - context.setFontSize(14 * unit) | ||
| 593 | - | ||
| 594 | - context.setFillStyle("red") | ||
| 595 | - if(ct_num<10){ | ||
| 596 | - context.fillText(ct_num+"人拼团", 92 * unit, 760 * unit); | ||
| 597 | - }else{ | ||
| 598 | - context.fillText(ct_num+"人拼团", 86 * unit, 760 * unit); | ||
| 599 | - } | ||
| 600 | - context.setFontSize(22 * unit) | ||
| 601 | - context.fillText("已拼"+th.data.teamlist.buy_num+"份", 166 * unit, 763 * unit); | ||
| 602 | - context.setFillStyle("gray") | ||
| 603 | - context.fillText(wz+"快来和我一起拼团吧！", 40 * unit, 826 * unit); | ||
| 604 | - context.setFillStyle("black") | ||
| 605 | - | ||
| 606 | - context.setFontSize(22 * unit) | ||
| 607 | - context.fillText("长按识别二维码，立即参团", 40 * unit, 856 * unit); | ||
| 608 | - //---二维吗图--- | ||
| 609 | - //-- 自定义海报 -- | ||
| 610 | - if(th.data.poster){ | ||
| 611 | - var erm_x= parseFloat(th.data.poster.ewm_x)*2; | ||
| 612 | - var erm_y= parseFloat(th.data.poster.ewm_y)*2; | ||
| 613 | - context.drawImage(vpath, erm_x * unit, erm_y * unit, 120 * unit, 120 * unit); | ||
| 614 | - }else{ | ||
| 615 | - //---二维吗图--- | ||
| 616 | - context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit); | ||
| 617 | - } | ||
| 618 | - break | ||
| 619 | - case 2://阶梯团的展示 | ||
| 620 | - //---画线--- | ||
| 621 | - context.setLineWidth(1 * unit) | ||
| 622 | - context.moveTo(32 * unit, 670 * unit) | ||
| 623 | - context.lineTo(520 * unit, 670 * unit) | ||
| 624 | - context.stroke(); | ||
| 625 | - //---文字--- | ||
| 626 | - context.setFontSize(22 * unit) | ||
| 627 | - context.setFillStyle("black") | ||
| 628 | - context.fillText("好物拼起来,拼拼更划算", 40 * unit, 726 * unit); | ||
| 629 | - //---绘制中间阶梯的价格--- | ||
| 630 | - var list= JSON.parse(th.data.teamlist.ct_rylist); | ||
| 631 | - for(var i=0; i<list.length;i++){ | ||
| 632 | - var item=list[i]; | ||
| 633 | - var wi=i*90*unit; | ||
| 634 | - context.setFontSize(16 * unit) | ||
| 635 | - context.setFillStyle("red") | ||
| 636 | - context.fillText("￥", 40 * unit+wi, 756 * unit); | ||
| 637 | - context.setFontSize(22 * unit) | ||
| 638 | - var pri=parseFloat(item.price).toFixed(2); | ||
| 639 | - context.fillText(pri, 56 * unit+wi, 756 * unit); | ||
| 640 | - context.setFillStyle("gray") | ||
| 641 | - context.fillText("满"+item.rynum+"人", 40 * unit+wi, 786 * unit); | ||
| 642 | - } | ||
| 643 | - | ||
| 644 | - //----------------下面部分---------------- | ||
| 645 | - context.setFillStyle("gray") | ||
| 646 | - context.fillText(wz+"快来和我一起拼团吧！", 40 * unit, 830 * unit); | ||
| 647 | - context.setFillStyle("black") | ||
| 648 | - context.setFontSize(22 * unit) | ||
| 649 | - | ||
| 650 | - context.fillText("长按识别二维码，立即参团", 40 * unit, 860 * unit); | ||
| 651 | - //---二维吗图--- | ||
| 652 | - //-- 自定义海报 -- | ||
| 653 | - if(th.data.poster){ | ||
| 654 | - var erm_x= parseFloat(th.data.poster.ewm_x)*2; | ||
| 655 | - var erm_y= parseFloat(th.data.poster.ewm_y)*2; | ||
| 656 | - context.drawImage(vpath, erm_x * unit, erm_y * unit, 120 * unit, 120 * unit); | ||
| 657 | - }else{ | ||
| 658 | - //---二维吗图--- | ||
| 659 | - context.drawImage(vpath, 420 * unit, 726 * unit, 120 * unit, 120 * unit); | ||
| 660 | - } | ||
| 661 | - break | ||
| 662 | - } | ||
| 663 | - | ||
| 664 | - //--- 如果是自定义海报的时候 --- | ||
| 665 | - if(th.data.poster && parseInt(th.data.poster.style)==2){ | ||
| 666 | - | ||
| 667 | - //如果显示会员信息的话 | ||
| 668 | - if(parseInt(th.data.poster.show_headpic)){ | ||
| 669 | - //获取坐标 | ||
| 670 | - var x= parseFloat(th.data.poster.head_x)*2; | ||
| 671 | - var y=parseFloat(th.data.poster.head_y)*2; | ||
| 672 | - //---绘制圆形要放在最后---- | ||
| 673 | - context.save(); | ||
| 674 | - context.beginPath(); | ||
| 675 | - var h_x = x* unit; | ||
| 676 | - var h_y = y * unit; | ||
| 677 | - var h_r = 40 * unit; | ||
| 678 | - var cx = h_x + h_r; | ||
| 679 | - var cy = h_y + h_r; | ||
| 680 | - context.arc(cx, cy, h_r, 0, Math.PI * 2, false); | ||
| 681 | - context.closePath(); | ||
| 682 | - context.fill(); | ||
| 683 | - context.clip(); | ||
| 684 | - context.drawImage(th.data.share_head, h_x, h_y, h_r * 2, h_r * 2); | ||
| 685 | - context.restore(); | ||
| 686 | - } | ||
| 687 | - | ||
| 688 | - }else{ | ||
| 689 | - //---绘制圆形要放在最后---- | ||
| 690 | - context.save(); | ||
| 691 | - context.beginPath(); | ||
| 692 | - var h_x = 60 * unit; | ||
| 693 | - var h_y = 24 * unit; | ||
| 694 | - var h_r = 40 * unit; | ||
| 695 | - var cx = h_x + h_r; | ||
| 696 | - var cy = h_y + h_r; | ||
| 697 | - context.arc(cx, cy, h_r, 0, Math.PI * 2, false); | ||
| 698 | - context.closePath(); | ||
| 699 | - context.fill(); | ||
| 700 | - context.clip(); | ||
| 701 | - context.drawImage(th.data.share_head, h_x, h_y, h_r * 2, h_r * 2); | ||
| 702 | - context.restore(); | ||
| 703 | - } | ||
| 704 | - | ||
| 705 | - //把画板内容绘制成图片，并回调 画板图片路径 | ||
| 706 | - context.draw(false, function () { | ||
| 707 | - setTimeout(function () { | ||
| 708 | - wx.canvasToTempFilePath({ | ||
| 709 | - x: 0, y: 0, | ||
| 710 | - width: 750, | ||
| 711 | - height: 1217, | ||
| 712 | - destWidth: 750 * 750 / that.data.screenWidth, | ||
| 713 | - destHeight: 1217 * 750 / that.data.screenWidth, | ||
| 714 | - canvasId: 'share', | ||
| 715 | - success: function (res) { | ||
| 716 | - | ||
| 717 | - that.setData({ | ||
| 718 | - shareImgPath: res.tempFilePath, canvasHidden: false, | ||
| 719 | - }) | ||
| 720 | - if (!res.tempFilePath) { | ||
| 721 | - wx.showModal({ | ||
| 722 | - title: '提示', | ||
| 723 | - content: '图片绘制中，请稍后重试', | ||
| 724 | - showCancel: false | ||
| 725 | - }) | ||
| 726 | - return false; | ||
| 727 | - } | ||
| 728 | - | ||
| 729 | - // wx.previewImage({ | ||
| 730 | - // //将图片预览出来 | ||
| 731 | - // urls: [that.data.shareImgPath] | ||
| 732 | - // }); | ||
| 733 | - | ||
| 734 | - that.setData({ | ||
| 735 | - showPoster: true, | ||
| 736 | - }); | ||
| 737 | - | ||
| 738 | - wx.hideLoading(); | ||
| 739 | - } | ||
| 740 | - }) | ||
| 741 | - },500) | ||
| 742 | - }); | ||
| 743 | - }); | ||
| 744 | - } | ||
| 745 | }); | 826 | }); |
| 746 | - }, | 827 | + }, |
| 828 | + fail: function (res) { | ||
| 829 | + // console.log(res); | ||
| 830 | + wx.hideLoading(); | ||
| 831 | + | ||
| 832 | + } | ||
| 833 | + }); | ||
| 834 | + }, | ||
| 747 | 835 | ||
| 748 | 836 | ||
| 749 | //文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度 | 837 | //文本换行 参数：1、canvas对象，2、文本 3、距离左侧的距离 4、距离顶部的距离 5、6、文本的宽度 |
| @@ -787,9 +875,11 @@ Page({ | @@ -787,9 +875,11 @@ Page({ | ||
| 787 | }, | 875 | }, |
| 788 | 876 | ||
| 789 | go_goodsinfo:function (e) { | 877 | go_goodsinfo:function (e) { |
| 790 | - var gid=e.currentTarget.dataset.gid; | ||
| 791 | - var url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gid; | ||
| 792 | - wx.navigateTo({ url: url, }) //跳到非tabbar页 | 878 | + var gid=e.currentTarget.dataset.gid; |
| 879 | + var url="/pages/goods/goodsInfo/goodsInfo?goods_id="+gid; | ||
| 880 | + wx.navigateTo({ | ||
| 881 | + url: url, | ||
| 882 | + })//跳到非tabbar页 | ||
| 793 | }, | 883 | }, |
| 794 | 884 | ||
| 795 | gohome:function () { | 885 | gohome:function () { |
| @@ -798,32 +888,32 @@ Page({ | @@ -798,32 +888,32 @@ Page({ | ||
| 798 | 888 | ||
| 799 | //--获取头像的本地缓存,回调写法-- | 889 | //--获取头像的本地缓存,回调写法-- |
| 800 | get_head_temp:function (tt,func) { | 890 | get_head_temp:function (tt,func) { |
| 801 | - var ee=this; | ||
| 802 | - if(ee.data.share_head){ | ||
| 803 | - tt(func); | ||
| 804 | - return false; | ||
| 805 | - } | ||
| 806 | - //---获取分享图片的本地地址,头像和商品图片---- | ||
| 807 | - var path2 = getApp().globalData.userInfo.head_pic; | ||
| 808 | - if(path2==""){ | ||
| 809 | - ee.data.share_head ="../../../../images/share/hui_hear_pic.png"; | ||
| 810 | - tt(func); | ||
| 811 | - }else { | ||
| 812 | - path2=path2.replace("http://thirdwx.qlogo.cn","https://wx.qlogo.cn"); | ||
| 813 | - path2=path2.replace("https://thirdwx.qlogo.cn","https://wx.qlogo.cn"); | ||
| 814 | - wx.getImageInfo({ | ||
| 815 | - src: path2, | ||
| 816 | - success: function (res) { | ||
| 817 | - //res.path是网络图片的本地地址 | ||
| 818 | - ee.data.share_head = res.path; | ||
| 819 | - tt(func);; | ||
| 820 | - }, | ||
| 821 | - fail: function (res) { | ||
| 822 | - ee.data.share_head = "../../../../images/share/hui_hear_pic.png"; //分享的图片不能用网络的 | ||
| 823 | - tt(func); | ||
| 824 | - } | ||
| 825 | - }); | ||
| 826 | - } | 891 | + var ee=this; |
| 892 | + if(ee.data.share_head) { | ||
| 893 | + tt(func); | ||
| 894 | + return false; | ||
| 895 | + } | ||
| 896 | + //---获取分享图片的本地地址,头像和商品图片---- | ||
| 897 | + var path2 = getApp().globalData.userInfo.head_pic; | ||
| 898 | + if(path2=="") { | ||
| 899 | + ee.data.share_head ="../../../../images/share/hui_hear_pic.png"; | ||
| 900 | + tt(func); | ||
| 901 | + } else { | ||
| 902 | + path2=path2.replace("http://thirdwx.qlogo.cn","https://wx.qlogo.cn"); | ||
| 903 | + path2=path2.replace("https://thirdwx.qlogo.cn","https://wx.qlogo.cn"); | ||
| 904 | + wx.getImageInfo({ | ||
| 905 | + src: path2, | ||
| 906 | + success: function (res) { | ||
| 907 | + //res.path是网络图片的本地地址 | ||
| 908 | + ee.data.share_head = res.path; | ||
| 909 | + tt(func);; | ||
| 910 | + }, | ||
| 911 | + fail: function (res) { | ||
| 912 | + ee.data.share_head = "../../../../images/share/hui_hear_pic.png"; //分享的图片不能用网络的 | ||
| 913 | + tt(func); | ||
| 914 | + } | ||
| 915 | + }); | ||
| 916 | + }; | ||
| 827 | }, | 917 | }, |
| 828 | 918 | ||
| 829 | //--获取商品图片的本地缓存，回调写法-- | 919 | //--获取商品图片的本地缓存，回调写法-- |
| @@ -833,7 +923,7 @@ Page({ | @@ -833,7 +923,7 @@ Page({ | ||
| 833 | tt(); | 923 | tt(); |
| 834 | return false; | 924 | return false; |
| 835 | } | 925 | } |
| 836 | - var path2 = os.imghost + ee.data.teamlist.share_imgurl; | 926 | + var path2 = os.imghost + ee.data.luckyGoInfo.original_img; |
| 837 | //获取商品是分享图信息 | 927 | //获取商品是分享图信息 |
| 838 | wx.getImageInfo({ | 928 | wx.getImageInfo({ |
| 839 | src: path2, | 929 | src: path2, |
| @@ -898,13 +988,13 @@ Page({ | @@ -898,13 +988,13 @@ Page({ | ||
| 898 | 988 | ||
| 899 | send() { | 989 | send() { |
| 900 | this.setData({ | 990 | this.setData({ |
| 901 | - share_hidden:false, | 991 | + share_hidden: false, |
| 902 | }); | 992 | }); |
| 903 | }, | 993 | }, |
| 904 | 994 | ||
| 905 | cancel() { | 995 | cancel() { |
| 906 | this.setData({ | 996 | this.setData({ |
| 907 | - share_hidden:false, | 997 | + share_hidden: false, |
| 908 | }); | 998 | }); |
| 909 | }, | 999 | }, |
| 910 | 1000 | ||
| @@ -1017,8 +1107,6 @@ Page({ | @@ -1017,8 +1107,6 @@ Page({ | ||
| 1017 | 1107 | ||
| 1018 | 1108 | ||
| 1019 | 1109 | ||
| 1020 | - onTouchMove() {}, | ||
| 1021 | - | ||
| 1022 | // 显示幸运购规则 | 1110 | // 显示幸运购规则 |
| 1023 | showRules: function() { | 1111 | showRules: function() { |
| 1024 | this.setData({ | 1112 | this.setData({ |
| @@ -1032,6 +1120,58 @@ Page({ | @@ -1032,6 +1120,58 @@ Page({ | ||
| 1032 | showRules: false, | 1120 | showRules: false, |
| 1033 | }); | 1121 | }); |
| 1034 | }, | 1122 | }, |
| 1123 | + | ||
| 1124 | + // 获取幸运购参团情况 | ||
| 1125 | + async get_team_info () { | ||
| 1126 | + var th = this; | ||
| 1127 | + // 幸运购成团信息 | ||
| 1128 | + await getApp().request.promiseGet("/api/weshop/prom/luckyActivity/page", { | ||
| 1129 | + data: { | ||
| 1130 | + store_id: o.stoid, | ||
| 1131 | + is_end: 0, | ||
| 1132 | + timetype: 1, | ||
| 1133 | + id: this.data.param.group_id, | ||
| 1134 | + } | ||
| 1135 | + }).then(res => { | ||
| 1136 | + var luckyGoInfo = res.data.data.pageData[0]; | ||
| 1137 | + var team_id = luckyGoInfo.team_id; | ||
| 1138 | + | ||
| 1139 | + th.setData({ | ||
| 1140 | + luckyGoInfo, | ||
| 1141 | + team_id, | ||
| 1142 | + }); | ||
| 1143 | + | ||
| 1144 | + //参团成功后,检查team_id | ||
| 1145 | + //如果team_id为0, 表示当前已开启新的一期，文字提示应改为’参团成功，本期幸运购已开团，中奖结果可点击下方查看参团列表‘ | ||
| 1146 | + //如果team_id为0，取出之前保存的team_id替换掉，请求上一期已成团的幸运购活动 | ||
| 1147 | + if(team_id != 0) { | ||
| 1148 | + wx.setStorage({ | ||
| 1149 | + key: 'team_id', | ||
| 1150 | + data: team_id, | ||
| 1151 | + }); | ||
| 1152 | + } else { | ||
| 1153 | + let team_id = wx.getStorageSync('team_id'); | ||
| 1154 | + th.setData({ | ||
| 1155 | + team_id: team_id, | ||
| 1156 | + isSuccess: true, | ||
| 1157 | + }); | ||
| 1158 | + }; | ||
| 1159 | + | ||
| 1160 | + }); | ||
| 1161 | + | ||
| 1162 | + // 幸运购成团成员 | ||
| 1163 | + await getApp().request.promiseGet("/api/weshop/prom/luckyOrder/page", { | ||
| 1164 | + data: { | ||
| 1165 | + store_id: o.stoid, | ||
| 1166 | + team_id: this.data.team_id, | ||
| 1167 | + } | ||
| 1168 | + }).then(res => { | ||
| 1169 | + th.setData({ | ||
| 1170 | + luckyGoMembers: res.data.data.pageData, | ||
| 1171 | + }); | ||
| 1172 | + }); | ||
| 1173 | + | ||
| 1174 | + }, | ||
| 1035 | 1175 | ||
| 1036 | 1176 | ||
| 1037 | 1177 |
packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxml
| @@ -66,7 +66,13 @@ | @@ -66,7 +66,13 @@ | ||
| 66 | <!-- 阶梯团失败 --> | 66 | <!-- 阶梯团失败 --> |
| 67 | <!-- <view class="pdt50 pdb30 pdh20" wx:if="{{pay_f==1 || order.pt_status==3}}"> --> | 67 | <!-- <view class="pdt50 pdb30 pdh20" wx:if="{{pay_f==1 || order.pt_status==3}}"> --> |
| 68 | <view class="pdt50 pdb30 pdh20"> | 68 | <view class="pdt50 pdb30 pdh20"> |
| 69 | - <view class="fs28 t-c">参团成功，还差{{filters.show_default(luckyGoInfo.group_num, '0')- filters.show_default(luckyGoInfo.num, '0')}}人即可成团，请留意成员开奖通知！</view> | 69 | + <block wx:if="{{team_id != 0}}"> |
| 70 | + <view class="fs28 t-c" wx:if="{{!isSuccess}}">参团成功，还差{{filters.show_default(luckyGoInfo.group_num, '0') - filters.show_default(luckyGoInfo.num, '0')}}人即可成团，请留意成员开奖通知！</view> | ||
| 71 | + <view class="fs28 t-c" wx:else>参团成功，本期幸运购已开团！</view> | ||
| 72 | + </block> | ||
| 73 | + <block wx:if="{{team_id == 0 && param.from}}"> | ||
| 74 | + <view class="fs28 t-c">组团中，还差{{filters.show_default(luckyGoInfo.group_num, '0') - filters.show_default(luckyGoInfo.num, '0')}}人即可成团！</view> | ||
| 75 | + </block> | ||
| 70 | <view class="fs24 t-c c-red">未团中可获得帮团奖励</view> | 76 | <view class="fs24 t-c c-red">未团中可获得帮团奖励</view> |
| 71 | <!-- <view class="xc-img-frame oh" > | 77 | <!-- <view class="xc-img-frame oh" > |
| 72 | <image class="img" src="{{iurl}}/miniapp/images/xc-qtshibai.png"></image> | 78 | <image class="img" src="{{iurl}}/miniapp/images/xc-qtshibai.png"></image> |
| @@ -86,22 +92,21 @@ | @@ -86,22 +92,21 @@ | ||
| 86 | <!----//// //头像----> | 92 | <!----//// //头像----> |
| 87 | <view class="flex_tou pdv30"> | 93 | <view class="flex_tou pdv30"> |
| 88 | <view class="flex jc-center"> | 94 | <view class="flex jc-center"> |
| 89 | - <block wx:for="{{luckyGoMembers}}"> | ||
| 90 | - <view class="d" wx:if="{{index <= 4}}"> | ||
| 91 | - <image class="img-block" src='{{item.head_pic}}'></image> | ||
| 92 | - <!-- <span wx:if="{{item.is_pt_tz==1}}">团长</span> --> | 95 | + <view class="d" wx:if="{{team_id == 0 && param.from}}"> |
| 96 | + <image class="img-block" src='{{iurl}}/miniapp/images/shafa.png'></image> | ||
| 97 | + </view> | ||
| 98 | + <block wx:else> | ||
| 99 | + <block wx:for="{{luckyGoMembers}}"> | ||
| 100 | + <view class="d" wx:if="{{index <= 4}}"> | ||
| 101 | + <image class="img-block" src='{{item.head_pic}}'></image> | ||
| 102 | + <!-- <span wx:if="{{item.is_pt_tz==1}}">团长</span> --> | ||
| 103 | + </view> | ||
| 104 | + </block> | ||
| 105 | + | ||
| 106 | + <view class="d" wx:if="{{luckyGoMembers.length > 4}}"> | ||
| 107 | + <image class="pictures img-block" src="{{iurl}}/miniapp/images/xc_ellipsis.png"></image> | ||
| 93 | </view> | 108 | </view> |
| 94 | </block> | 109 | </block> |
| 95 | - | ||
| 96 | - <!-- <view class="d" wx:for="{{sf_arr}}" wx:if="{{p_status!=2}}"> --> | ||
| 97 | - <!-- <view class="d"> | ||
| 98 | - <image class="img-block" src='{{iurl}}/miniapp/images/shafa.png'></image> | ||
| 99 | - </view> --> | ||
| 100 | - | ||
| 101 | - <!-- <view class='xc-ellipsis-img flex-vertical' wx:if="{{ordertx.length>5}}"> --> | ||
| 102 | - <view class="d" wx:if="{{luckyGoMembers.length > 4}}"> | ||
| 103 | - <image class="pictures img-block" src="{{iurl}}/miniapp/images/xc_ellipsis.png"></image> | ||
| 104 | - </view> | ||
| 105 | </view> | 110 | </view> |
| 106 | </view> | 111 | </view> |
| 107 | 112 | ||
| @@ -202,9 +207,9 @@ | @@ -202,9 +207,9 @@ | ||
| 202 | </view> | 207 | </view> |
| 203 | 208 | ||
| 204 | <view class="f1 t-r"> | 209 | <view class="f1 t-r"> |
| 205 | - <view class="fs22">{{filters.format_time(item.create_time, 1)}}</view> | 210 | + <view class="fs22">{{filters.format_time(item.add_time, 1)}}</view> |
| 206 | <view class="c-red" wx:if="{{item.team_status == 0}}">待成团</view> | 211 | <view class="c-red" wx:if="{{item.team_status == 0}}">待成团</view> |
| 207 | - <view class="c-red" wx:if="{{item.team_status == 1}}">未团中</view> | 212 | + <view class="c-7b" wx:if="{{item.team_status == 1}}">未团中</view> |
| 208 | <view class="c-red" wx:if="{{item.team_status == 2}}">已团中</view> | 213 | <view class="c-red" wx:if="{{item.team_status == 2}}">已团中</view> |
| 209 | </view> | 214 | </view> |
| 210 | 215 | ||
| @@ -240,15 +245,14 @@ | @@ -240,15 +245,14 @@ | ||
| 240 | <view class='clear'></view> | 245 | <view class='clear'></view> |
| 241 | 246 | ||
| 242 | <!----//大家都在团----> | 247 | <!----//大家都在团----> |
| 243 | - <view class='goodslist'> | ||
| 244 | - <view class='goodslisttop'> | 248 | + <!-- <view class='goodslist'> |
| 249 | + <view class='goodslisttop'> --> | ||
| 245 | <!-- <view class='goodslistspan fs24'>大家都在团</view> --> | 250 | <!-- <view class='goodslistspan fs24'>大家都在团</view> --> |
| 246 | <!-- 推荐商品 --> | 251 | <!-- 推荐商品 --> |
| 247 | - <view class="flex-center rel xc-linellae-frame"> | 252 | + <!-- <view class="flex-center rel xc-linellae-frame"> |
| 248 | <view class="xc-linellae"></view> | 253 | <view class="xc-linellae"></view> |
| 249 | <view class="abs flex-center xc-recommend-frame "> | 254 | <view class="abs flex-center xc-recommend-frame "> |
| 250 | - <image class=" xc-recommend" src="{{iurl}}/miniapp/images/diamond.png"> | ||
| 251 | - </image> | 255 | + <image class=" xc-recommend" src="{{iurl}}/miniapp/images/diamond.png"></image> |
| 252 | <view class="xc-recommend-word">大家都在团</view> | 256 | <view class="xc-recommend-word">大家都在团</view> |
| 253 | </view> | 257 | </view> |
| 254 | </view> | 258 | </view> |
| @@ -265,7 +269,7 @@ | @@ -265,7 +269,7 @@ | ||
| 265 | <view class='price flex-vertical-between'> | 269 | <view class='price flex-vertical-between'> |
| 266 | <view class='jgleft fs32 flex-center xc-wc'> | 270 | <view class='jgleft fs32 flex-center xc-wc'> |
| 267 | <view class="xc-ping xc-wc fs26 t-c">拼</view> | 271 | <view class="xc-ping xc-wc fs26 t-c">拼</view> |
| 268 | - <text class="fs20" style='height:39rpx;margin-right:5rpx;margin-left:15rpx;' >¥</text>11.00{{item.price}} | 272 | + <text class="fs20" style='height:39rpx;margin-right:5rpx;margin-left:15rpx;'>¥</text>11.00{{item.price}} |
| 269 | </view> | 273 | </view> |
| 270 | <view class='jgright'>{{item.ct_num}}2 | 274 | <view class='jgright'>{{item.ct_num}}2 |
| 271 | <span>人参团</span> | 275 | <span>人参团</span> |
| @@ -278,14 +282,15 @@ | @@ -278,14 +282,15 @@ | ||
| 278 | </view> | 282 | </view> |
| 279 | </view> | 283 | </view> |
| 280 | </view> | 284 | </view> |
| 281 | - </view> | 285 | + </view> --> |
| 282 | </view> | 286 | </view> |
| 283 | 287 | ||
| 284 | 288 | ||
| 285 | 289 | ||
| 286 | 290 | ||
| 287 | <!--二维码显示页面--> | 291 | <!--二维码显示页面--> |
| 288 | -<canvas canvas-id='share' style='width:750rpx;height:1217rpx;' wx:if='{{canvasHidden}}'></canvas> | 292 | +<canvas class="mycanvas" canvas-id='share' style='width:750rpx;height:1217rpx;'></canvas> |
| 293 | +<!-- <canvas canvas-id='share' style='width:750rpx;height:1217rpx;' wx:if='{{canvasHidden}}'></canvas> --> | ||
| 289 | <!--拼团玩法弹出框--> | 294 | <!--拼团玩法弹出框--> |
| 290 | <!----弹起的----> | 295 | <!----弹起的----> |
| 291 | <block wx:if="{{pd_xx}}"> | 296 | <block wx:if="{{pd_xx}}"> |
| @@ -324,13 +329,15 @@ | @@ -324,13 +329,15 @@ | ||
| 324 | <view class="poster-wrapper"> | 329 | <view class="poster-wrapper"> |
| 325 | <view class="poster"> | 330 | <view class="poster"> |
| 326 | <!-- <view class="poster" bindtap="previewImage"> --> | 331 | <!-- <view class="poster" bindtap="previewImage"> --> |
| 327 | - <image src="{{shareImgPath}}" class="poster-img" show-menu-by-longpress></image> | ||
| 328 | - <view class="btn-close" catchtap="closePoster"><text class="iconfont icon-close"></text></view> | 332 | + <image src="{{shareImgPath}}" class="poster-img"></image> |
| 333 | + <view class="btn-close" catchtap="closePoster"> | ||
| 334 | + <text class="iconfont icon-close"></text> | ||
| 335 | + </view> | ||
| 336 | + </view> | ||
| 337 | + <view class="btn-container"> | ||
| 338 | + <!-- <button class="btn-share" open-type="share" bindtap="">微信好友分享</button> --> | ||
| 339 | + <button class="btn-share" bindtap="savePic">保存到相册</button> | ||
| 329 | </view> | 340 | </view> |
| 330 | - <view class="btn-container"> | ||
| 331 | - <!--<button class="btn-share" open-type="share" bindtap="">微信好友分享</button>--> | ||
| 332 | - <button class="btn-share" bindtap="savePic">保存到相册</button> | ||
| 333 | - </view> | ||
| 334 | </view> | 341 | </view> |
| 335 | </view> | 342 | </view> |
| 336 | </view> | 343 | </view> |
packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxss
| @@ -1023,7 +1023,7 @@ height:40rpx; | @@ -1023,7 +1023,7 @@ height:40rpx; | ||
| 1023 | font-size: 26rpx; | 1023 | font-size: 26rpx; |
| 1024 | position: absolute; | 1024 | position: absolute; |
| 1025 | color: white; | 1025 | color: white; |
| 1026 | - background-color: rgba(255,103,103,.7); | 1026 | + background-color: #FE6867; |
| 1027 | right: 0; | 1027 | right: 0; |
| 1028 | top: 0; | 1028 | top: 0; |
| 1029 | z-index: 1; | 1029 | z-index: 1; |
| @@ -1083,4 +1083,10 @@ height:40rpx; | @@ -1083,4 +1083,10 @@ height:40rpx; | ||
| 1083 | .popup-content { | 1083 | .popup-content { |
| 1084 | max-height: 600rpx; | 1084 | max-height: 600rpx; |
| 1085 | overflow-y: auto; | 1085 | overflow-y: auto; |
| 1086 | +} | ||
| 1087 | + | ||
| 1088 | +.mycanvas { | ||
| 1089 | + position: absolute; | ||
| 1090 | + top: -9999px; | ||
| 1091 | + left: -9999px; | ||
| 1086 | } | 1092 | } |
| 1087 | \ No newline at end of file | 1093 | \ No newline at end of file |
packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
| @@ -18,7 +18,7 @@ | @@ -18,7 +18,7 @@ | ||
| 18 | ￥ {{sele_g.shop_price}} | 18 | ￥ {{sele_g.shop_price}} |
| 19 | </block> | 19 | </block> |
| 20 | </view> | 20 | </view> |
| 21 | - <view class="spec-goods-price" wx:else>￥ {{prom_price}}</view> | 21 | + <view class="spec-goods-price" wx:else>￥ {{prom_price || filters.div100(luckGoInfo.group_price)}}</view> |
| 22 | </view> | 22 | </view> |
| 23 | 23 | ||
| 24 | <block wx:if="{{is_normal==1}}"> | 24 | <block wx:if="{{is_normal==1}}"> |
| @@ -31,13 +31,13 @@ | @@ -31,13 +31,13 @@ | ||
| 31 | <block wx:else><view class="spec-goods-stock">可售：{{sele_g.store_count}}</view></block> | 31 | <block wx:else><view class="spec-goods-stock">可售：{{sele_g.store_count}}</view></block> |
| 32 | </view> | 32 | </view> |
| 33 | </block> | 33 | </block> |
| 34 | - <block wx:if="{{is_normal==0}}"> | 34 | + <!-- <block wx:if="{{is_normal==0}}"> |
| 35 | <view class="flex"> | 35 | <view class="flex"> |
| 36 | <view class="spec-goods-stock" wx:if="{{prom_st>0}}">已售：{{prom_act.buy_num}}</view> | 36 | <view class="spec-goods-stock" wx:if="{{prom_st>0}}">已售：{{prom_act.buy_num}}</view> |
| 37 | <view class="spec-goods-stock" wx:else >已售：{{prom_act.buy_num}}</view> | 37 | <view class="spec-goods-stock" wx:else >已售：{{prom_act.buy_num}}</view> |
| 38 | <view class="spec-goods-stock">可售：{{prom_act.goods_num-prom_act.buy_num}}</view> | 38 | <view class="spec-goods-stock">可售：{{prom_act.goods_num-prom_act.buy_num}}</view> |
| 39 | </view> | 39 | </view> |
| 40 | - </block> | 40 | + </block> --> |
| 41 | </view> | 41 | </view> |
| 42 | 42 | ||
| 43 | </view> | 43 | </view> |
| @@ -102,14 +102,23 @@ | @@ -102,14 +102,23 @@ | ||
| 102 | <!--<image class="wh100" src="{{iurl}}/miniapp/images/icon-arrowdown.png"></image>--> | 102 | <!--<image class="wh100" src="{{iurl}}/miniapp/images/icon-arrowdown.png"></image>--> |
| 103 | <!--</view>--> | 103 | <!--</view>--> |
| 104 | <!--</view>--> | 104 | <!--</view>--> |
| 105 | + | ||
| 106 | + <view class="b_num" hidden="{{ismend==1}}" style="margin-top: 20rpx" wx:if="{{is_normal==1}}"> | ||
| 107 | + <view>购买数量</view> | ||
| 108 | + <view class="count"> | ||
| 109 | + <view bindtap="{{goodsInputNum <= 1 ? '':'subCartNum'}}" class="sub {{goodsInputNum <= 1 ? 'active':''}}">-</view> | ||
| 110 | + <input bindblur="inputCartNum" class="xc-val-fream" type="number" value="{{goodsInputNum}}"></input> | ||
| 111 | + <view bindtap="addCartNum" class="add">+</view> | ||
| 112 | + </view> | ||
| 113 | + </view> | ||
| 105 | 114 | ||
| 106 | 115 | ||
| 107 | - <view class="b_num" hidden="{{ismend==1}}" style="margin-top: 20rpx"> | 116 | + <view class="b_num" hidden="{{ismend==1}}" style="margin-top: 20rpx" wx:else> |
| 108 | <view>购买数量</view> | 117 | <view>购买数量</view> |
| 109 | <view class="count"> | 118 | <view class="count"> |
| 110 | <view bindtap="{{goodsInputNum <= 1 ? '':'subCartNum'}}" class="sub {{goodsInputNum <= 1 ? 'active':''}}">-</view> | 119 | <view bindtap="{{goodsInputNum <= 1 ? '':'subCartNum'}}" class="sub {{goodsInputNum <= 1 ? 'active':''}}">-</view> |
| 111 | - <input bindblur="inputCartNum" class="xc-val-fream" type="number" value="{{goodsInputNum}}"></input> | ||
| 112 | - <view bindtap="addCartNum" class="add">+</view> | 120 | + <input bindblur="inputCartNum" class="xc-val-fream" type="number" value="{{goodsInputNum}}" disabled></input> |
| 121 | + <view bindtap="" class="sub active">+</view> | ||
| 113 | </view> | 122 | </view> |
| 114 | </view> | 123 | </view> |
| 115 | 124 | ||
| @@ -186,7 +195,7 @@ | @@ -186,7 +195,7 @@ | ||
| 186 | <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view> | 195 | <view class="spec-cart-btn fs32" data-action="add" style="background-color: #dcdcdc;color: #999">库存不足</view> |
| 187 | </block> | 196 | </block> |
| 188 | <block wx:else> | 197 | <block wx:else> |
| 189 | - <view bindtap="addCart_pt" class="spec-cart-btn spec-buy" data-action="buy">立即购买</view> | 198 | + <view bindtap="addCart" class="spec-cart-btn spec-buy" data-action="buy">立即购买</view> |
| 190 | </block> | 199 | </block> |
| 191 | 200 | ||
| 192 | </block> | 201 | </block> |
| @@ -203,7 +212,7 @@ | @@ -203,7 +212,7 @@ | ||
| 203 | <view class="spec-cart-btn spec-buy w100" style="background-color: #dcdcdc;color: #999;">配送不匹配</view> | 212 | <view class="spec-cart-btn spec-buy w100" style="background-color: #dcdcdc;color: #999;">配送不匹配</view> |
| 204 | </block> | 213 | </block> |
| 205 | <block wx:else> | 214 | <block wx:else> |
| 206 | - <view bindtap="addCart_pt" class="spec-cart-btn spec-buy w100" data-action="buy">确定</view> | 215 | + <view bindtap="addCart" class="spec-cart-btn spec-buy w100" data-action="buy">确定</view> |
| 207 | </block> | 216 | </block> |
| 208 | </block> | 217 | </block> |
| 209 | 218 |
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
| @@ -139,7 +139,7 @@ Page({ | @@ -139,7 +139,7 @@ Page({ | ||
| 139 | brand_name: '', | 139 | brand_name: '', |
| 140 | nation_name: '', | 140 | nation_name: '', |
| 141 | 141 | ||
| 142 | - //商品的活动类型 0普通 1秒杀 2团购 3优惠 4 积分购 6拼单 | 142 | + //商品的活动类型 0普通 1秒杀 2团购 3优惠 4 积分购 6拼单 9幸运购 |
| 143 | prom_type: 9, | 143 | prom_type: 9, |
| 144 | prom_time_text: "", | 144 | prom_time_text: "", |
| 145 | prom_price: null, | 145 | prom_price: null, |
| @@ -296,10 +296,14 @@ Page({ | @@ -296,10 +296,14 @@ Page({ | ||
| 296 | prom_id = t.group_id; //活动ID | 296 | prom_id = t.group_id; //活动ID |
| 297 | 297 | ||
| 298 | if(prom_type) { | 298 | if(prom_type) { |
| 299 | - this.data.prom_type = prom_type; | ||
| 300 | - this.data.prom_id = prom_id; | 299 | + // this.data.prom_type = prom_type; |
| 300 | + // this.data.prom_id = prom_id; | ||
| 301 | + this.setData({ | ||
| 302 | + prom_type, | ||
| 303 | + prom_id, | ||
| 304 | + }); | ||
| 301 | } | 305 | } |
| 302 | - | 306 | + console.log('type********>>',this.data.prom_type); |
| 303 | //-- 自定义海报 -- | 307 | //-- 自定义海报 -- |
| 304 | // getApp().request.promiseGet("/api/weshop/goods/poster/page", { | 308 | // getApp().request.promiseGet("/api/weshop/goods/poster/page", { |
| 305 | // data: { store_id: os.stoid, type: 1, is_use: 1 } | 309 | // data: { store_id: os.stoid, type: 1, is_use: 1 } |
| @@ -435,34 +439,34 @@ Page({ | @@ -435,34 +439,34 @@ Page({ | ||
| 435 | var swithc_list = e.switch_list; | 439 | var swithc_list = e.switch_list; |
| 436 | var sw_arr = JSON.parse(swithc_list); | 440 | var sw_arr = JSON.parse(swithc_list); |
| 437 | //---如果后台又开等级卡的开关--- | 441 | //---如果后台又开等级卡的开关--- |
| 438 | - // if (sw_arr.rank_switch && sw_arr.rank_switch == "2") { | ||
| 439 | - // th.setData({ rank_switch: true }); | ||
| 440 | - // //---回调卡的列表--- | ||
| 441 | - // th.getPlusCardType(function (ob) { | ||
| 442 | - // th.setData({ card_list: ob.card_list }); | ||
| 443 | - // var ti = setInterval(function () { | ||
| 444 | - // var user = getApp().globalData.userInfo; | ||
| 445 | - // if (!user) return false; | ||
| 446 | - // clearInterval(ti); | ||
| 447 | - | ||
| 448 | - // if (user.card_field && user['card_expiredate']) { | ||
| 449 | - // var str = user['card_expiredate'].replace(/-/g, '/'); | ||
| 450 | - // var end = new Date(str); | ||
| 451 | - // end = Date.parse(end) / 1000; | ||
| 452 | - // var now = ut.gettimestamp(); | ||
| 453 | - // //--- 判断是等级会员，且在有效期范围内 --- | ||
| 454 | - // if (user.card_field && now < end) { | ||
| 455 | - // var card_name = ob.name_map.get(user.card_field); | ||
| 456 | - // //if(card_name.length>6) card_name=card_name.substring(0,6); | ||
| 457 | - | ||
| 458 | - // var is_near_date = 0; | ||
| 459 | - // if (end - now < 60 * 60 * 30 * 24) is_near_date = 1; //如果小于30天 | ||
| 460 | - // th.setData({ card_field: user.card_field, card_name: card_name, card_list: ob.card_list, is_near_date: is_near_date }); | ||
| 461 | - // } | ||
| 462 | - // } | ||
| 463 | - // }, 500) | ||
| 464 | - // }) | ||
| 465 | - // } | 442 | + if (sw_arr.rank_switch && sw_arr.rank_switch == "2") { |
| 443 | + th.setData({ rank_switch: true }); | ||
| 444 | + //---回调卡的列表--- | ||
| 445 | + th.getPlusCardType(function (ob) { | ||
| 446 | + th.setData({ card_list: ob.card_list }); | ||
| 447 | + var ti = setInterval(function () { | ||
| 448 | + var user = getApp().globalData.userInfo; | ||
| 449 | + if (!user) return false; | ||
| 450 | + clearInterval(ti); | ||
| 451 | + | ||
| 452 | + if (user.card_field && user['card_expiredate']) { | ||
| 453 | + var str = user['card_expiredate'].replace(/-/g, '/'); | ||
| 454 | + var end = new Date(str); | ||
| 455 | + end = Date.parse(end) / 1000; | ||
| 456 | + var now = ut.gettimestamp(); | ||
| 457 | + //--- 判断是等级会员，且在有效期范围内 --- | ||
| 458 | + if (user.card_field && now < end) { | ||
| 459 | + var card_name = ob.name_map.get(user.card_field); | ||
| 460 | + //if(card_name.length>6) card_name=card_name.substring(0,6); | ||
| 461 | + | ||
| 462 | + var is_near_date = 0; | ||
| 463 | + if (end - now < 60 * 60 * 30 * 24) is_near_date = 1; //如果小于30天 | ||
| 464 | + th.setData({ card_field: user.card_field, card_name: card_name, card_list: ob.card_list, is_near_date: is_near_date }); | ||
| 465 | + } | ||
| 466 | + } | ||
| 467 | + }, 500) | ||
| 468 | + }) | ||
| 469 | + } | ||
| 466 | 470 | ||
| 467 | }, 1); | 471 | }, 1); |
| 468 | 472 | ||
| @@ -877,6 +881,7 @@ Page({ | @@ -877,6 +881,7 @@ Page({ | ||
| 877 | e.wxParseAddFullImageUrl(ee, "content"); | 881 | e.wxParseAddFullImageUrl(ee, "content"); |
| 878 | 882 | ||
| 879 | if(ee.data.prom_type){ | 883 | if(ee.data.prom_type){ |
| 884 | + //999 | ||
| 880 | t.data.data.prom_type=ee.data.prom_type; | 885 | t.data.data.prom_type=ee.data.prom_type; |
| 881 | t.data.data.prom_id=ee.data.prom_id; | 886 | t.data.data.prom_id=ee.data.prom_id; |
| 882 | } | 887 | } |
| @@ -891,17 +896,17 @@ Page({ | @@ -891,17 +896,17 @@ Page({ | ||
| 891 | //获取统一条形码,普通商品和优惠促销的商品 | 896 | //获取统一条形码,普通商品和优惠促销的商品 |
| 892 | if (ee.data.data.prom_type == 0 || ee.data.data.prom_type == 2 || ee.data.data.prom_type == 3 || ee.data.data.prom_type == 5 || ee.data.data.prom_type == 7) { | 897 | if (ee.data.data.prom_type == 0 || ee.data.data.prom_type == 2 || ee.data.data.prom_type == 3 || ee.data.data.prom_type == 5 || ee.data.data.prom_type == 7) { |
| 893 | //默认门店要拿下门店库存 | 898 | //默认门店要拿下门店库存 |
| 894 | - if (that.data.sales_rules == 2 && that.data.is_newsales_rules) { | ||
| 895 | - //获取门店 | ||
| 896 | - ee.get_sto(); | 899 | + // if (that.data.sales_rules == 2 && that.data.is_newsales_rules) { |
| 900 | + // //获取门店 | ||
| 901 | + // ee.get_sto(1); | ||
| 897 | 902 | ||
| 898 | - } else { | ||
| 899 | - //获取门店 | ||
| 900 | - ee.get_sto(); | ||
| 901 | - } | 903 | + // } else { |
| 904 | + // //获取门店 | ||
| 905 | + // ee.get_sto(); | ||
| 906 | + // } | ||
| 902 | 907 | ||
| 903 | - ee.get_sku(o.stoid, t.data.data, gid); | ||
| 904 | - ee.check_has_flash(); | 908 | + // ee.get_sku(o.stoid, t.data.data, gid); |
| 909 | + // ee.check_has_flash(); | ||
| 905 | 910 | ||
| 906 | } | 911 | } |
| 907 | else { | 912 | else { |
| @@ -1018,7 +1023,7 @@ Page({ | @@ -1018,7 +1023,7 @@ Page({ | ||
| 1018 | } | 1023 | } |
| 1019 | }).then(res => { | 1024 | }).then(res => { |
| 1020 | if (res.data.code == 0) { | 1025 | if (res.data.code == 0) { |
| 1021 | - console.log('成团信息=======》', res.data.data); | 1026 | + // console.log('成团信息=======》', res.data.data); |
| 1022 | th.setData({ | 1027 | th.setData({ |
| 1023 | luckGoInfo: res.data.data.pageData[0], | 1028 | luckGoInfo: res.data.data.pageData[0], |
| 1024 | team_id: res.data.data.pageData[0].team_id, | 1029 | team_id: res.data.data.pageData[0].team_id, |
| @@ -1039,7 +1044,7 @@ Page({ | @@ -1039,7 +1044,7 @@ Page({ | ||
| 1039 | } | 1044 | } |
| 1040 | }).then(res => { | 1045 | }).then(res => { |
| 1041 | if (res.data.code == 0) { | 1046 | if (res.data.code == 0) { |
| 1042 | - console.log(th.data.team_id,'参团成员===============》', res.data.data.pageData); | 1047 | + // console.log(th.data.team_id,'参团成员===============》', res.data.data.pageData); |
| 1043 | th.setData({ | 1048 | th.setData({ |
| 1044 | luckGoMembers: res.data.data.pageData, | 1049 | luckGoMembers: res.data.data.pageData, |
| 1045 | }); | 1050 | }); |
| @@ -1057,19 +1062,22 @@ Page({ | @@ -1057,19 +1062,22 @@ Page({ | ||
| 1057 | 1062 | ||
| 1058 | }, | 1063 | }, |
| 1059 | 1064 | ||
| 1065 | + // 暂时无用 | ||
| 1066 | + // enterAddress: function () { | ||
| 1067 | + // this.data.enterAddressPage = !0, wx.navigateTo({ | ||
| 1068 | + // url: "/pages/user/address_list/address_list?operate=selectAddress" | ||
| 1069 | + // }); | ||
| 1070 | + // }, | ||
| 1060 | 1071 | ||
| 1061 | - enterAddress: function () { | ||
| 1062 | - this.data.enterAddressPage = !0, wx.navigateTo({ | ||
| 1063 | - url: "/pages/user/address_list/address_list?operate=selectAddress" | ||
| 1064 | - }); | ||
| 1065 | - }, | ||
| 1066 | 1072 | ||
| 1073 | + // 页面卸载 | ||
| 1067 | onUnload: function () { | 1074 | onUnload: function () { |
| 1068 | for (var i = 1; i < 100; i++) { | 1075 | for (var i = 1; i < 100; i++) { |
| 1069 | clearInterval(i); | 1076 | clearInterval(i); |
| 1070 | } | 1077 | } |
| 1071 | }, | 1078 | }, |
| 1072 | 1079 | ||
| 1080 | + // 页面隐藏 | ||
| 1073 | onHide: function () { | 1081 | onHide: function () { |
| 1074 | this.data.is_timer = 0; | 1082 | this.data.is_timer = 0; |
| 1075 | for (var i = 1; i < 100; i++) { | 1083 | for (var i = 1; i < 100; i++) { |
| @@ -1077,7 +1085,7 @@ Page({ | @@ -1077,7 +1085,7 @@ Page({ | ||
| 1077 | } | 1085 | } |
| 1078 | }, | 1086 | }, |
| 1079 | 1087 | ||
| 1080 | - //----------三个选项按钮----------- | 1088 | + // 点击顶部选项卡 |
| 1081 | tabClick: function (t) { | 1089 | tabClick: function (t) { |
| 1082 | var e = t.currentTarget.id; | 1090 | var e = t.currentTarget.id; |
| 1083 | this.setData({ | 1091 | this.setData({ |
| @@ -1092,6 +1100,8 @@ Page({ | @@ -1092,6 +1100,8 @@ Page({ | ||
| 1092 | // }); | 1100 | // }); |
| 1093 | // }, | 1101 | // }, |
| 1094 | 1102 | ||
| 1103 | + | ||
| 1104 | + // 点击评价选项卡下的各评价按钮 | ||
| 1095 | tabClick3: function (t) { | 1105 | tabClick3: function (t) { |
| 1096 | var e = this; | 1106 | var e = this; |
| 1097 | if (t.currentTarget.id != this.data.activeCategoryId3) { | 1107 | if (t.currentTarget.id != this.data.activeCategoryId3) { |
| @@ -1104,6 +1114,7 @@ Page({ | @@ -1104,6 +1114,7 @@ Page({ | ||
| 1104 | } | 1114 | } |
| 1105 | }, | 1115 | }, |
| 1106 | 1116 | ||
| 1117 | + // 滚动到顶部 | ||
| 1107 | doScrollTop: function () { | 1118 | doScrollTop: function () { |
| 1108 | wx.pageScrollTo({ | 1119 | wx.pageScrollTo({ |
| 1109 | scrollTop: 0 | 1120 | scrollTop: 0 |
| @@ -1116,7 +1127,8 @@ Page({ | @@ -1116,7 +1127,8 @@ Page({ | ||
| 1116 | }), this.data.comments || this.requestComments_new(); | 1127 | }), this.data.comments || this.requestComments_new(); |
| 1117 | }, | 1128 | }, |
| 1118 | 1129 | ||
| 1119 | - //商品详情的时候调用 | 1130 | + |
| 1131 | + //商品详情里表格信息：类别、品牌、国别 | ||
| 1120 | tabGoodsContent: function () { | 1132 | tabGoodsContent: function () { |
| 1121 | var th = this, | 1133 | var th = this, |
| 1122 | i = getApp().request; | 1134 | i = getApp().request; |
| @@ -1702,9 +1714,9 @@ Page({ | @@ -1702,9 +1714,9 @@ Page({ | ||
| 1702 | openSpecModal_pt: 0, | 1714 | openSpecModal_pt: 0, |
| 1703 | }) | 1715 | }) |
| 1704 | 1716 | ||
| 1705 | - if (e.prom_type == 4) { | 1717 | + if (e.prom_type == 9) { |
| 1706 | s.set_b_now(e); | 1718 | s.set_b_now(e); |
| 1707 | - var url = "/pages/cart/cart2_inte/cart2_inte?is_bnow=1&goods_id=" + e.goods_id; | 1719 | + var url = "/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart?is_bnow=1&goods_id=" + e.goods_id; |
| 1708 | getApp().goto(url); | 1720 | getApp().goto(url); |
| 1709 | } else { | 1721 | } else { |
| 1710 | //要判断积分购的普通购买有没有参加优惠活动 | 1722 | //要判断积分购的普通购买有没有参加优惠活动 |
| @@ -1954,6 +1966,8 @@ Page({ | @@ -1954,6 +1966,8 @@ Page({ | ||
| 1954 | }) | 1966 | }) |
| 1955 | return false; | 1967 | return false; |
| 1956 | } | 1968 | } |
| 1969 | + | ||
| 1970 | + | ||
| 1957 | 1971 | ||
| 1958 | if(th.data.more_flash && open_store==1){ | 1972 | if(th.data.more_flash && open_store==1){ |
| 1959 | th.setData({is_pop_more:1}); | 1973 | th.setData({is_pop_more:1}); |
| @@ -3729,22 +3743,20 @@ Page({ | @@ -3729,22 +3743,20 @@ Page({ | ||
| 3729 | //--点击弹起拼单-- | 3743 | //--点击弹起拼单-- |
| 3730 | openSpecModel_pt: function (e) { | 3744 | openSpecModel_pt: function (e) { |
| 3731 | 3745 | ||
| 3732 | - | ||
| 3733 | - this.setData({ open_ind_store: 4, goodsInputNum: 1 });//拼团直接给4 | ||
| 3734 | - | 3746 | + this.setData({ open_ind_store: 9, goodsInputNum: 1 }); |
| 3735 | 3747 | ||
| 3736 | //--先判断会员状态-- | 3748 | //--先判断会员状态-- |
| 3737 | var user_info = getApp().globalData.userInfo; | 3749 | var user_info = getApp().globalData.userInfo; |
| 3738 | - if (user_info == null || user_info.mobile == undefined || user_info.mobile == "" || user_info.mobile == null) { | 3750 | + if (user_info == null || user_info.mobile == undefined || user_info.mobile == '' || user_info.mobile == null) { |
| 3739 | wx.navigateTo({ | 3751 | wx.navigateTo({ |
| 3740 | url: '/pages/togoin/togoin', | 3752 | url: '/pages/togoin/togoin', |
| 3741 | }) | 3753 | }) |
| 3742 | return false; | 3754 | return false; |
| 3743 | - } | 3755 | + }; |
| 3744 | 3756 | ||
| 3745 | var th = this; | 3757 | var th = this; |
| 3746 | - var ind = parseInt(e.currentTarget.dataset.it); | ||
| 3747 | - //如果是拼单活动的普通购买 | 3758 | + var ind = parseInt(e.currentTarget.dataset.ind); |
| 3759 | + //ind == 1是普通购买 | ||
| 3748 | if (ind == 1) { | 3760 | if (ind == 1) { |
| 3749 | //如果拼单的sku data是空的，就要先获取一下 | 3761 | //如果拼单的sku data是空的，就要先获取一下 |
| 3750 | if (th.data.sku_g_pt) { | 3762 | if (th.data.sku_g_pt) { |
| @@ -3761,62 +3773,73 @@ Page({ | @@ -3761,62 +3773,73 @@ Page({ | ||
| 3761 | openSpecModal_pt: 1 | 3773 | openSpecModal_pt: 1 |
| 3762 | }); | 3774 | }); |
| 3763 | }); | 3775 | }); |
| 3764 | - } | 3776 | + |
| 3777 | + th.setData({ | ||
| 3778 | + is_normal: ind, | ||
| 3779 | + openSpecModal_pt: 1 | ||
| 3780 | + }); | ||
| 3781 | + }; | ||
| 3765 | th.check_is_youhui(th.data.gid, 1); | 3782 | th.check_is_youhui(th.data.gid, 1); |
| 3766 | } else { | 3783 | } else { |
| 3767 | 3784 | ||
| 3768 | - //拼单商品从这里进，先判断有没有买过商品， | ||
| 3769 | - getApp().request.get("/api/weshop/order/page", { | ||
| 3770 | - data: { | ||
| 3771 | - pt_prom_id: th.data.prom_act.id, | ||
| 3772 | - user_id: oo.user_id, | ||
| 3773 | - store_id: os.stoid, | ||
| 3774 | - pageSize: 1, | ||
| 3775 | - page: 1 | ||
| 3776 | - }, | ||
| 3777 | - success: function (e) { | ||
| 3778 | - //--跳转到已经购买的情况-- | ||
| 3779 | - if (e.data.data.pageData.length > 0) { | ||
| 3780 | - var odr = e.data.data.pageData[0]; | ||
| 3781 | - //还未支付 | ||
| 3782 | - if (odr.pt_status == 0 && (odr.order_status == 1 || odr.order_status == 0)) { | ||
| 3783 | - wx.showModal({ | ||
| 3784 | - title: "您已经购买了该商品待支付中", | ||
| 3785 | - success: function (a) { | ||
| 3786 | - if (a.confirm) { | ||
| 3787 | - wx.navigateTo({ | ||
| 3788 | - url: "/pages/user/order_detail/order_detail?order_id=" + odr.order_id, | ||
| 3789 | - }); | ||
| 3790 | - } | ||
| 3791 | - } | ||
| 3792 | - }); | ||
| 3793 | - } else if (odr.pt_status == 1 && odr.order_status == 1) { | ||
| 3794 | - | ||
| 3795 | - if (this.data.is_go_to_team_show) return false; | ||
| 3796 | - this.data.is_go_to_team_show = 1; | ||
| 3797 | - wx.showLoading(); | ||
| 3798 | - | ||
| 3799 | - /*--- | ||
| 3800 | - wx.redirectTo({ | ||
| 3801 | - url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn, | ||
| 3802 | - });--*/ | ||
| 3803 | - getApp().goto("/pages/team/team_success/team_success?ordersn=" + odr.order_sn); | ||
| 3804 | - | ||
| 3805 | - } else { | ||
| 3806 | - th.setData({ | ||
| 3807 | - is_normal: ind, | ||
| 3808 | - openSpecModal_pt: 1 | ||
| 3809 | - }); | ||
| 3810 | - } | 3785 | + // //拼单商品从这里进，先判断有没有买过商品， |
| 3786 | + // getApp().request.get("/api/weshop/order/page", { | ||
| 3787 | + // data: { | ||
| 3788 | + // // pt_prom_id: th.data.prom_act.id, | ||
| 3789 | + // user_id: oo.user_id, | ||
| 3790 | + // store_id: os.stoid, | ||
| 3791 | + // pageSize: 1, | ||
| 3792 | + // page: 1 | ||
| 3793 | + // }, | ||
| 3794 | + // success: function (e) { | ||
| 3795 | + // //--跳转到已经购买的情况-- | ||
| 3796 | + // if (e.data.data.pageData.length > 0) { | ||
| 3797 | + // var odr = e.data.data.pageData[0]; | ||
| 3798 | + // //还未支付 | ||
| 3799 | + // if (odr.pt_status == 0 && (odr.order_status == 1 || odr.order_status == 0)) { | ||
| 3800 | + // wx.showModal({ | ||
| 3801 | + // title: "您已经购买了该商品待支付中", | ||
| 3802 | + // success: function (a) { | ||
| 3803 | + // if (a.confirm) { | ||
| 3804 | + // wx.navigateTo({ | ||
| 3805 | + // url: "/pages/user/order_detail/order_detail?order_id=" + odr.order_id, | ||
| 3806 | + // }); | ||
| 3807 | + // } | ||
| 3808 | + // } | ||
| 3809 | + // }); | ||
| 3810 | + // } else if (odr.pt_status == 1 && odr.order_status == 1) { | ||
| 3811 | + | ||
| 3812 | + // if (this.data.is_go_to_team_show) return false; | ||
| 3813 | + // this.data.is_go_to_team_show = 1; | ||
| 3814 | + // wx.showLoading(); | ||
| 3815 | + | ||
| 3816 | + // /*--- | ||
| 3817 | + // wx.redirectTo({ | ||
| 3818 | + // url: "/pages/team/team_success/team_success?ordersn=" + odr.order_sn, | ||
| 3819 | + // });--*/ | ||
| 3820 | + // getApp().goto("/pages/team/team_success/team_success?ordersn=" + odr.order_sn); | ||
| 3821 | + | ||
| 3822 | + // } else { | ||
| 3823 | + // th.setData({ | ||
| 3824 | + // is_normal: ind, | ||
| 3825 | + // openSpecModal_pt: 1 | ||
| 3826 | + // }); | ||
| 3827 | + // } | ||
| 3811 | 3828 | ||
| 3812 | - } else { | ||
| 3813 | - th.setData({ | ||
| 3814 | - is_normal: ind, | ||
| 3815 | - openSpecModal_pt: 1 | ||
| 3816 | - }); | ||
| 3817 | - } | ||
| 3818 | - } | ||
| 3819 | - }); | 3829 | + // } else { |
| 3830 | + // th.setData({ | ||
| 3831 | + // is_normal: ind, | ||
| 3832 | + // openSpecModal_pt: 1 | ||
| 3833 | + // }); | ||
| 3834 | + // } | ||
| 3835 | + // } | ||
| 3836 | + // }); | ||
| 3837 | + th.get_sto(1); | ||
| 3838 | + th.setData({ | ||
| 3839 | + is_normal: 0, | ||
| 3840 | + openSpecModal_pt: 1 | ||
| 3841 | + }); | ||
| 3842 | + | ||
| 3820 | } | 3843 | } |
| 3821 | }, | 3844 | }, |
| 3822 | 3845 | ||
| @@ -4010,7 +4033,7 @@ Page({ | @@ -4010,7 +4033,7 @@ Page({ | ||
| 4010 | buyNow_pt: function (e) { | 4033 | buyNow_pt: function (e) { |
| 4011 | s.set_b_now(e); | 4034 | s.set_b_now(e); |
| 4012 | wx.navigateTo({ | 4035 | wx.navigateTo({ |
| 4013 | - url: "/pages/cart/cart2_pt/cart2_pt?is_bnow=1&goods_id=" + e.goods_id, | 4036 | + url: "/packageC/pages/luckyGo_cart/luckyGo_cart/luckyGo_cart?is_bnow=1&goods_id=" + e.goods_id, |
| 4014 | }); | 4037 | }); |
| 4015 | }, | 4038 | }, |
| 4016 | 4039 | ||
| @@ -4437,8 +4460,9 @@ Page({ | @@ -4437,8 +4460,9 @@ Page({ | ||
| 4437 | this.setData({ share_hidden: false,}); | 4460 | this.setData({ share_hidden: false,}); |
| 4438 | }; | 4461 | }; |
| 4439 | 4462 | ||
| 4440 | - //类型 0普通商品 1秒杀商品 2商家和会员团 3阶梯团 4阶梯团 | ||
| 4441 | - var type = this.data.prom_type; | 4463 | + //类型 0普通商品 1秒杀商品 2商家和会员团 3阶梯团 4阶梯团 9幸运购 |
| 4464 | + var type = 9; | ||
| 4465 | + console.log('type',type); | ||
| 4442 | if (type == 6) type = 2; | 4466 | if (type == 6) type = 2; |
| 4443 | if (this.data.prom_act && this.data.prom_act.kttype == 3) type = 3; | 4467 | if (this.data.prom_act && this.data.prom_act.kttype == 3) type = 3; |
| 4444 | 4468 | ||
| @@ -4481,7 +4505,7 @@ Page({ | @@ -4481,7 +4505,7 @@ Page({ | ||
| 4481 | var vpath = res.path; | 4505 | var vpath = res.path; |
| 4482 | var context = wx.createCanvasContext('share'); | 4506 | var context = wx.createCanvasContext('share'); |
| 4483 | // 先画背景 | 4507 | // 先画背景 |
| 4484 | - var pg_path = "../../../images/share/share_bg.png"; | 4508 | + var pg_path = "../../../../images/share/share_bg.png"; |
| 4485 | 4509 | ||
| 4486 | // context.fillStyle="#FFFFFF"; | 4510 | // context.fillStyle="#FFFFFF"; |
| 4487 | // context.fillRect(0,0,554 * unit, 899 * unit); | 4511 | // context.fillRect(0,0,554 * unit, 899 * unit); |
| @@ -4511,6 +4535,8 @@ Page({ | @@ -4511,6 +4535,8 @@ Page({ | ||
| 4511 | //-- 是自定义海报的情况下 -- | 4535 | //-- 是自定义海报的情况下 -- |
| 4512 | if(type != 0) { | 4536 | if(type != 0) { |
| 4513 | 4537 | ||
| 4538 | + | ||
| 4539 | + | ||
| 4514 | if (th.data.poster && parseInt(th.data.poster.style) == 2) { | 4540 | if (th.data.poster && parseInt(th.data.poster.style) == 2) { |
| 4515 | //在线上分享人的情况下 | 4541 | //在线上分享人的情况下 |
| 4516 | if (parseInt(th.data.poster.show_headpic)) { | 4542 | if (parseInt(th.data.poster.show_headpic)) { |
| @@ -4525,7 +4551,7 @@ Page({ | @@ -4525,7 +4551,7 @@ Page({ | ||
| 4525 | context.fillText(app.globalData.userInfo.nickname, x1, y1); | 4551 | context.fillText(app.globalData.userInfo.nickname, x1, y1); |
| 4526 | var width = 24 * app.globalData.userInfo.nickname.length * unit + 4 * unit; | 4552 | var width = 24 * app.globalData.userInfo.nickname.length * unit + 4 * unit; |
| 4527 | //强烈推荐 改许程 | 4553 | //强烈推荐 改许程 |
| 4528 | - var tj_path = "../../../images/share/q_tj.png"; | 4554 | + var tj_path = "../../../../images/share/q_tj.png"; |
| 4529 | context.drawImage(tj_path, x1 + width, y1 - 22 * unit, 85 * unit, 30 * unit); | 4555 | context.drawImage(tj_path, x1 + width, y1 - 22 * unit, 85 * unit, 30 * unit); |
| 4530 | context.setFontSize(16 * unit); | 4556 | context.setFontSize(16 * unit); |
| 4531 | context.setLineJoin('round'); //交点设置成圆角 | 4557 | context.setLineJoin('round'); //交点设置成圆角 |
| @@ -4540,22 +4566,29 @@ Page({ | @@ -4540,22 +4566,29 @@ Page({ | ||
| 4540 | //--昵称--- | 4566 | //--昵称--- |
| 4541 | context.setFontSize(24 * unit); | 4567 | context.setFontSize(24 * unit); |
| 4542 | context.setFillStyle("black"); | 4568 | context.setFillStyle("black"); |
| 4543 | - context.fillText(app.globalData.userInfo.nickname, 152 * unit, 76 * unit); | 4569 | + context.fillText(app.globalData.userInfo.nickname, 152 * unit, 60 * unit); |
| 4544 | var width = 24 * app.globalData.userInfo.nickname.length * unit + 2 * unit; | 4570 | var width = 24 * app.globalData.userInfo.nickname.length * unit + 2 * unit; |
| 4545 | //强烈推荐 改许程 | 4571 | //强烈推荐 改许程 |
| 4546 | - var tj_path = "../../../images/share/q_tj.png"; | ||
| 4547 | - context.drawImage(tj_path, 152 * unit + width, 54 * unit, 85 * unit, 30 * unit); | ||
| 4548 | - context.setFontSize(16 * unit); | ||
| 4549 | - context.setLineJoin('round'); //交点设置成圆角 | ||
| 4550 | - context.setFillStyle("white"); | ||
| 4551 | - context.fillText('强烈推荐', 149 * unit + width + 15 * unit, 75 * unit); | 4572 | + // var tj_path = "../../../../images/share/q_tj.png"; |
| 4573 | + // let txt_gn = th.data.luckGoInfo.group_num + '人团'; | ||
| 4574 | + // let width_gn = ut.measureText(txt_gn, 15); | ||
| 4575 | + // context.drawImage(tj_path, 152 * unit + width, 54 * unit, (width_gn + 20) * unit, 30 * unit); | ||
| 4576 | + // context.setFontSize(16 * unit); | ||
| 4577 | + // context.setLineJoin('round'); //交点设置成圆角 | ||
| 4578 | + // context.setFillStyle("white"); | ||
| 4579 | + // context.fillText(txt_gn, 149 * unit + width + 15 * unit, 75 * unit); | ||
| 4580 | + // 发出幸运购活动邀请 | ||
| 4581 | + context.setFillStyle("#7f7f7f") | ||
| 4582 | + context.setFontSize(21.3 * unit) | ||
| 4583 | + context.fillText("向您发出幸运购邀请", 152 * unit, 90 * unit); | ||
| 4584 | + | ||
| 4552 | } | 4585 | } |
| 4553 | 4586 | ||
| 4554 | }; | 4587 | }; |
| 4555 | 4588 | ||
| 4556 | 4589 | ||
| 4557 | 4590 | ||
| 4558 | - var share_title = th.data.data.goods_name; | 4591 | + var share_title = th.data.data.goods_name; |
| 4559 | if (th.data.prom_type == 1 || th.data.prom_type == 6 || th.data.prom_type == 4) { | 4592 | if (th.data.prom_type == 1 || th.data.prom_type == 6 || th.data.prom_type == 4) { |
| 4560 | share_title = th.data.prom_act.share_title; | 4593 | share_title = th.data.prom_act.share_title; |
| 4561 | if (!share_title) share_title = th.data.prom_act.title; | 4594 | if (!share_title) share_title = th.data.prom_act.title; |
| @@ -4568,7 +4601,7 @@ Page({ | @@ -4568,7 +4601,7 @@ Page({ | ||
| 4568 | context.setFillStyle("black"); | 4601 | context.setFillStyle("black"); |
| 4569 | context.setFontSize(21.3 * unit) | 4602 | context.setFontSize(21.3 * unit) |
| 4570 | th.draw_Text(context, share_title, | 4603 | th.draw_Text(context, share_title, |
| 4571 | - 38 * unit, 180 * unit, 200 * unit, 279 * unit, unit); | 4604 | + 38 * unit, 180 * unit, 220 * unit, 220 * unit, unit); |
| 4572 | 4605 | ||
| 4573 | //------产品的价格------- | 4606 | //------产品的价格------- |
| 4574 | context.setFontSize(23 * unit) | 4607 | context.setFontSize(23 * unit) |
| @@ -4583,11 +4616,18 @@ Page({ | @@ -4583,11 +4616,18 @@ Page({ | ||
| 4583 | context.fillText("￥", wd1 - 15, 185 * unit); | 4616 | context.fillText("￥", wd1 - 15, 185 * unit); |
| 4584 | context.setFontSize(31 * unit) | 4617 | context.setFontSize(31 * unit) |
| 4585 | context.fillText(pri0, wd1, 185 * unit); | 4618 | context.fillText(pri0, wd1, 185 * unit); |
| 4619 | + | ||
| 4620 | + var tj_path = "../../../../images/share/q_tj.png"; | ||
| 4621 | + context.drawImage(tj_path, 315 * unit, 158 * unit, 85 * unit, 30 * unit); | ||
| 4622 | + context.setLineJoin('round'); //交点设置成圆角 | ||
| 4623 | + context.setFontSize(18 * unit); | ||
| 4624 | + context.setFillStyle("white"); | ||
| 4625 | + context.fillText('参团价', 330 * unit, 179 * unit); | ||
| 4586 | 4626 | ||
| 4587 | //---市场价划掉--- | 4627 | //---市场价划掉--- |
| 4588 | context.setFillStyle("gray") | 4628 | context.setFillStyle("gray") |
| 4589 | context.setFontSize(22 * unit) | 4629 | context.setFontSize(22 * unit) |
| 4590 | - pri0 = "￥" + th.data.data.market_price.toFixed(2); | 4630 | + pri0 = "零售价：￥" + th.data.data.market_price.toFixed(2); |
| 4591 | var wd2 = th.data.screenWidth - ut.measureText(pri0, 22 * unit) - 25; | 4631 | var wd2 = th.data.screenWidth - ut.measureText(pri0, 22 * unit) - 25; |
| 4592 | context.fillText(pri0, wd2, 213 * unit); | 4632 | context.fillText(pri0, wd2, 213 * unit); |
| 4593 | 4633 | ||
| @@ -4630,7 +4670,7 @@ Page({ | @@ -4630,7 +4670,7 @@ Page({ | ||
| 4630 | //中间的几个字 | 4670 | //中间的几个字 |
| 4631 | if (th.data.poster && parseInt(th.data.poster.style) == 2) { | 4671 | if (th.data.poster && parseInt(th.data.poster.style) == 2) { |
| 4632 | if (parseInt(th.data.poster.show_quality)) { | 4672 | if (parseInt(th.data.poster.show_quality)) { |
| 4633 | - var g_path = "../../../images/share/s_gou.png"; | 4673 | + var g_path = "../../../../images/share/s_gou.png"; |
| 4634 | context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit); | 4674 | context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit); |
| 4635 | context.setFillStyle("red") | 4675 | context.setFillStyle("red") |
| 4636 | context.setFontSize(18 * unit) | 4676 | context.setFontSize(18 * unit) |
| @@ -4648,7 +4688,7 @@ Page({ | @@ -4648,7 +4688,7 @@ Page({ | ||
| 4648 | } | 4688 | } |
| 4649 | 4689 | ||
| 4650 | } else { | 4690 | } else { |
| 4651 | - var g_path = "../../../images/share/s_gou.png"; | 4691 | + var g_path = "../../../../images/share/s_gou.png"; |
| 4652 | context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit); | 4692 | context.drawImage(g_path, 56 * unit, 670 * unit, 22 * unit, 22 * unit); |
| 4653 | context.setFillStyle("red") | 4693 | context.setFillStyle("red") |
| 4654 | context.setFontSize(18 * unit) | 4694 | context.setFontSize(18 * unit) |
| @@ -4714,7 +4754,7 @@ Page({ | @@ -4714,7 +4754,7 @@ Page({ | ||
| 4714 | context.stroke(); | 4754 | context.stroke(); |
| 4715 | 4755 | ||
| 4716 | //画秒杀的图片 | 4756 | //画秒杀的图片 |
| 4717 | - var miaos_path = '../../../images/share/miao_share.png'; | 4757 | + var miaos_path = '../../../../images/share/miao_share.png'; |
| 4718 | context.drawImage(miaos_path, 43 * unit, 700 * unit, 222 * unit, 40 * unit); | 4758 | context.drawImage(miaos_path, 43 * unit, 700 * unit, 222 * unit, 40 * unit); |
| 4719 | 4759 | ||
| 4720 | context.setFillStyle("black") | 4760 | context.setFillStyle("black") |
| @@ -4751,7 +4791,7 @@ Page({ | @@ -4751,7 +4791,7 @@ Page({ | ||
| 4751 | context.fillText(th.data.sto_sele_name_1, 40 * unit, 720 * unit); | 4791 | context.fillText(th.data.sto_sele_name_1, 40 * unit, 720 * unit); |
| 4752 | 4792 | ||
| 4753 | //绘制成团图片 | 4793 | //绘制成团图片 |
| 4754 | - var ct_img = "../../../images/share/ct_num.png"; | 4794 | + var ct_img = "../../../../images/share/ct_num.png"; |
| 4755 | context.drawImage(ct_img, 40 * unit, 740 * unit, 120 * unit, 30 * unit); | 4795 | context.drawImage(ct_img, 40 * unit, 740 * unit, 120 * unit, 30 * unit); |
| 4756 | var ct_num = th.data.prom_act.ct_num; | 4796 | var ct_num = th.data.prom_act.ct_num; |
| 4757 | context.setFontSize(14 * unit) | 4797 | context.setFontSize(14 * unit) |
| @@ -4834,7 +4874,81 @@ Page({ | @@ -4834,7 +4874,81 @@ Page({ | ||
| 4834 | //---二维吗图--- | 4874 | //---二维吗图--- |
| 4835 | context.drawImage(vpath, 390 * unit, 726 * unit, 136 * unit, 136 * unit); | 4875 | context.drawImage(vpath, 390 * unit, 726 * unit, 136 * unit, 136 * unit); |
| 4836 | } | 4876 | } |
| 4837 | - break | 4877 | + break; |
| 4878 | + | ||
| 4879 | + | ||
| 4880 | + case 9: | ||
| 4881 | + | ||
| 4882 | + //---画线--- | ||
| 4883 | + context.setLineWidth(1 * unit) | ||
| 4884 | + context.moveTo(32 * unit, 680 * unit) | ||
| 4885 | + context.lineTo(520 * unit, 680 * unit) | ||
| 4886 | + context.stroke(); | ||
| 4887 | + | ||
| 4888 | + //---文字--- | ||
| 4889 | + context.setFillStyle("black") | ||
| 4890 | + context.setFontSize(24 * unit) | ||
| 4891 | + context.font = 'normal bold 18px'; | ||
| 4892 | + context.fillText(th.data.sto_sele_name_1, 40 * unit, 720 * unit); | ||
| 4893 | + | ||
| 4894 | + //还差N人,即可成团 | ||
| 4895 | + let group_num = th.data.luckGoInfo.group_num; | ||
| 4896 | + let num_joined = th.data.luckGoInfo.num; | ||
| 4897 | + let delta1 = group_num - num_joined; | ||
| 4898 | + let width_delta1 = ut.measureText(delta1, 15); | ||
| 4899 | + context.setFillStyle("black"); | ||
| 4900 | + context.setFontSize(21.3 * unit); | ||
| 4901 | + context.fillText(group_num + "人团，还差", 40 * unit, 772 * unit); | ||
| 4902 | + context.setFillStyle("#FF6768"); | ||
| 4903 | + context.setFontSize(21.3 * unit); | ||
| 4904 | + context.fillText(delta1, 160 * unit, 772 * unit); | ||
| 4905 | + context.setFillStyle("black"); | ||
| 4906 | + context.setFontSize(21.3 * unit); | ||
| 4907 | + context.fillText("人，即可成团", (170 + width_delta1) * unit, 772 * unit); | ||
| 4908 | + | ||
| 4909 | + // N人得商品,N人全额退款 | ||
| 4910 | + let group_win = th.data.luckGoInfo.group_win; | ||
| 4911 | + let delta2 = group_num - group_win; | ||
| 4912 | + let width_delta2 = ut.measureText(delta2, 16); | ||
| 4913 | + let width_groupNum = ut.measureText(group_num, 15); | ||
| 4914 | + let width_groupWin = ut.measureText(group_win, 15); | ||
| 4915 | + context.setFillStyle("#FF6768"); | ||
| 4916 | + context.setFontSize(21.3 * unit); | ||
| 4917 | + context.fillText(group_win, 40 * unit, 806 * unit); | ||
| 4918 | + context.setFillStyle("black"); | ||
| 4919 | + context.setFontSize(21.3 * unit); | ||
| 4920 | + context.fillText("人得商品，", (54 + width_groupWin) * unit, 806 * unit); | ||
| 4921 | + context.setFillStyle("#FF6768"); | ||
| 4922 | + context.setFontSize(21.3 * unit); | ||
| 4923 | + context.fillText(delta2, 160 * unit, 806 * unit); | ||
| 4924 | + context.setFillStyle("black"); | ||
| 4925 | + context.setFontSize(21.3 * unit); | ||
| 4926 | + context.fillText("人全额退款", (170 + width_delta2) * unit, 806 * unit); | ||
| 4927 | + | ||
| 4928 | + // 并得帮团惊喜礼品 | ||
| 4929 | + context.setFillStyle("black") | ||
| 4930 | + context.setFontSize(21.3 * unit) | ||
| 4931 | + context.fillText("并得帮团", 40 * unit, 840 * unit); | ||
| 4932 | + context.setFillStyle("#FF6768") | ||
| 4933 | + context.setFontSize(21.3 * unit) | ||
| 4934 | + context.fillText("惊喜礼品", 130 * unit, 840 * unit); | ||
| 4935 | + context.setFillStyle("black") | ||
| 4936 | + context.setFontSize(21.3 * unit) | ||
| 4937 | + context.fillText("！", 220 * unit, 840 * unit); | ||
| 4938 | + | ||
| 4939 | + | ||
| 4940 | + //---二维吗图--- | ||
| 4941 | + //-- 自定义海报 -- | ||
| 4942 | + if (th.data.poster) { | ||
| 4943 | + var erm_x = parseFloat(th.data.poster.ewm_x) * 2; | ||
| 4944 | + var erm_y = parseFloat(th.data.poster.ewm_y) * 2; | ||
| 4945 | + context.drawImage(vpath, erm_x * unit, erm_y * unit, 136 * unit, 136 * unit); | ||
| 4946 | + } else { | ||
| 4947 | + //---二维吗图--- | ||
| 4948 | + context.drawImage(vpath, 390 * unit, 726 * unit, 136 * unit, 136 * unit); | ||
| 4949 | + } | ||
| 4950 | + | ||
| 4951 | + break; | ||
| 4838 | 4952 | ||
| 4839 | 4953 | ||
| 4840 | } | 4954 | } |
| @@ -6068,9 +6182,9 @@ Page({ | @@ -6068,9 +6182,9 @@ Page({ | ||
| 6068 | 6182 | ||
| 6069 | // 查看奖励 | 6183 | // 查看奖励 |
| 6070 | showReward: function() { | 6184 | showReward: function() { |
| 6071 | - this.setData({ | ||
| 6072 | - showReward: true, | ||
| 6073 | - }); | 6185 | + |
| 6186 | + this.getPrizes(this.data.luckGoInfo.type); | ||
| 6187 | + | ||
| 6074 | }, | 6188 | }, |
| 6075 | 6189 | ||
| 6076 | // 关闭奖励 | 6190 | // 关闭奖励 |
| @@ -6080,5 +6194,108 @@ Page({ | @@ -6080,5 +6194,108 @@ Page({ | ||
| 6080 | }); | 6194 | }); |
| 6081 | }, | 6195 | }, |
| 6082 | 6196 | ||
| 6197 | + | ||
| 6198 | + // 获取优惠券奖励和服务项目奖励 | ||
| 6199 | + getPrizes: function(type) { | ||
| 6200 | + // let currentItem = this.data.list.pageData[currentItemIndex]; | ||
| 6201 | + // let type = type; | ||
| 6202 | + let self = this; | ||
| 6203 | + let app = getApp(); | ||
| 6204 | + // 分割type字符串 | ||
| 6205 | + let typeArr = this.splitStringToArr(type); | ||
| 6206 | + let prizesArr = []; | ||
| 6207 | + let promiseArr = []; | ||
| 6208 | + typeArr.forEach(function(item) { | ||
| 6209 | + | ||
| 6210 | + let obj = {}; | ||
| 6211 | + obj.type = item; | ||
| 6212 | + | ||
| 6213 | + let promise = new Promise((resolve, reject) => { | ||
| 6214 | + switch(item) { | ||
| 6215 | + case 1: { //积分 | ||
| 6216 | + obj.name = '积分'; | ||
| 6217 | + obj.num = 'point'; | ||
| 6218 | + prizesArr.push(obj); | ||
| 6219 | + resolve(); | ||
| 6220 | + break; | ||
| 6221 | + }; | ||
| 6222 | + case 2: { //成长值 | ||
| 6223 | + obj.name = '成长值'; | ||
| 6224 | + obj.num = 'grow'; | ||
| 6225 | + prizesArr.push(obj); | ||
| 6226 | + resolve(); | ||
| 6227 | + break; | ||
| 6228 | + }; | ||
| 6229 | + case 3: { //优惠券 | ||
| 6230 | + app.request.promiseGet('/api/weshop/prom/luckyCoupon/page', { | ||
| 6231 | + data: { | ||
| 6232 | + store_id: os.stoid, | ||
| 6233 | + aid: self.data.luckGoInfo.id, | ||
| 6234 | + } | ||
| 6235 | + }).then(res => { | ||
| 6236 | + if(res.data.code == 0) { | ||
| 6237 | + obj.couponList = res.data.data.pageData; | ||
| 6238 | + prizesArr.push(obj); | ||
| 6239 | + resolve(); | ||
| 6240 | + }; | ||
| 6241 | + }); | ||
| 6242 | + break; | ||
| 6243 | + }; | ||
| 6244 | + case 4: { //服务项目 | ||
| 6245 | + app.request.promiseGet('/api/weshop/prom/luckyService/page', { | ||
| 6246 | + data: { | ||
| 6247 | + store_id: os.stoid, | ||
| 6248 | + aid: self.data.luckGoInfo.id, | ||
| 6249 | + } | ||
| 6250 | + }).then(res => { | ||
| 6251 | + if(res.data.code == 0) { | ||
| 6252 | + obj.serviceList = res.data.data.pageData; | ||
| 6253 | + prizesArr.push(obj); | ||
| 6254 | + resolve(); | ||
| 6255 | + }; | ||
| 6256 | + }); | ||
| 6257 | + break; | ||
| 6258 | + }; | ||
| 6259 | + case 5: { //预存金额 | ||
| 6260 | + obj.name = 'prestore_name'; | ||
| 6261 | + obj.num = 'prestore_money'; | ||
| 6262 | + prizesArr.push(obj); | ||
| 6263 | + resolve(); | ||
| 6264 | + break; | ||
| 6265 | + }; | ||
| 6266 | + }; | ||
| 6267 | + }); | ||
| 6268 | + | ||
| 6269 | + promiseArr.push(promise); | ||
| 6270 | + | ||
| 6271 | + | ||
| 6272 | + Promise.all(promiseArr).then(()=> { | ||
| 6273 | + self.setData({ | ||
| 6274 | + prizesArr, | ||
| 6275 | + showReward: true, | ||
| 6276 | + }); | ||
| 6277 | + }); | ||
| 6278 | + | ||
| 6279 | + | ||
| 6280 | + | ||
| 6281 | + }); | ||
| 6282 | + | ||
| 6283 | + | ||
| 6284 | + | ||
| 6285 | + }, | ||
| 6286 | + | ||
| 6287 | + // 将type字符串分割成数组 | ||
| 6288 | + splitStringToArr: function(typeStr) { | ||
| 6289 | + var index; | ||
| 6290 | + var newTypeArr = []; | ||
| 6291 | + var typeStrArr = typeStr.split(','); | ||
| 6292 | + typeStrArr.forEach(function(item) { | ||
| 6293 | + index = parseInt(item); | ||
| 6294 | + newTypeArr.push(index); | ||
| 6295 | + }); | ||
| 6296 | + // console.log('newTypeArr', newTypeArr); | ||
| 6297 | + return newTypeArr; | ||
| 6298 | + }, | ||
| 6299 | + | ||
| 6083 | 6300 | ||
| 6084 | }); | 6301 | }); |
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
| @@ -883,13 +883,14 @@ | @@ -883,13 +883,14 @@ | ||
| 883 | <!-- 线上销售的时候，要判断库存量， 线下库存的时候不用判断 --> | 883 | <!-- 线上销售的时候，要判断库存量， 线下库存的时候不用判断 --> |
| 884 | <block wx:if="{{(sele_g.store_count>0 && sales_rules==1) || sales_rules==2 }}"> | 884 | <block wx:if="{{(sele_g.store_count>0 && sales_rules==1) || sales_rules==2 }}"> |
| 885 | <view class="btn-container f1"> | 885 | <view class="btn-container f1"> |
| 886 | - <view bindtap="openSpecModel" data-ind="1" class="btn-yellow flex f1 fdc jc-center"> | 886 | + <view bindtap="openSpecModel_pt" data-ind="1" class="btn-yellow flex f1 fdc jc-center"> |
| 887 | <view class="lh1"><text class="rmb lh1">{{filters.toFix(data.market_price,2)}}</text></view> | 887 | <view class="lh1"><text class="rmb lh1">{{filters.toFix(data.market_price,2)}}</text></view> |
| 888 | <view class="lh1 fs pdt4">单独购买</view> | 888 | <view class="lh1 fs pdt4">单独购买</view> |
| 889 | </view> | 889 | </view> |
| 890 | <!-- data-ind="2" --> | 890 | <!-- data-ind="2" --> |
| 891 | - <view class="btn-red f1 flex ai-center jc-center" | ||
| 892 | - bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" data-action="buy">立即参团2</view> | 891 | + <!-- openSpecModel_pt --> |
| 892 | + <view class="btn-red f1 flex ai-center jc-center" bindtap="openSpecModel_pt" data-openSpecModal_ind="{{openSpecModal_ind}}" data-action="buy" data-ind="0">立即参团</view> | ||
| 893 | + <!-- <view class="btn-red f1 flex ai-center jc-center" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" data-action="buy">立即参团</view> --> | ||
| 893 | </view> | 894 | </view> |
| 894 | <!-- <view bindtap="openSpecModel" data-ind="1" class="btn-buy flex fdc jc-center"> | 895 | <!-- <view bindtap="openSpecModel" data-ind="1" class="btn-buy flex fdc jc-center"> |
| 895 | <view class="lh1"><text class="rmb lh1">189.00</text></view> | 896 | <view class="lh1"><text class="rmb lh1">189.00</text></view> |
| @@ -1548,12 +1549,54 @@ | @@ -1548,12 +1549,54 @@ | ||
| 1548 | <text class="iconfont icon-close fs32 c-7b" bindtap="closeReward"></text> | 1549 | <text class="iconfont icon-close fs32 c-7b" bindtap="closeReward"></text> |
| 1549 | </view> | 1550 | </view> |
| 1550 | <view class="popup-list"> | 1551 | <view class="popup-list"> |
| 1551 | - <view class="popup-list-item" wx:for="{{filters.showByType(luckGoInfo.type)}}"> | ||
| 1552 | - <view class="img-container"><image class="img-block" src="../../../../images/bk.png"></image></view> | ||
| 1553 | - <view class="f1"> | ||
| 1554 | - <view class="ellipsis-2 popup-title pdl20">{{typeArr[item-1].name == '预存金额' ? luckGoInfo.prestore_name:typeArr[item-1].name}}</view> | ||
| 1555 | - <view class="fs24 t-r pdt16 c-7b">数量：<text class="c-red">{{luckGoInfo[typeArr[item-1]['key']]}}</text></view> | ||
| 1556 | - </view> | 1552 | + <view class="popup-list"> |
| 1553 | + | ||
| 1554 | + <block wx:for="{{prizesArr}}"> | ||
| 1555 | + <!-- 优惠券奖励 --> | ||
| 1556 | + <block wx:if="{{item.type == 3}}"> | ||
| 1557 | + <view class="popup-list-item" wx:for="{{item.couponList}}" wx:for-item="i"> | ||
| 1558 | + <view class="img-container"><image class="img-block" src="{{iurl + 'miniapp/images/luckDraw/yhq.png'}}"></image></view> | ||
| 1559 | + <view class="f1 pdl20"> | ||
| 1560 | + <view class="ellipsis-2 popup-title">优惠券-{{i.name}}</view> | ||
| 1561 | + <view class="fs24 t-r pdt16 c-7b">数量：<text class="c-red">{{i.num}}</text></view> | ||
| 1562 | + </view> | ||
| 1563 | + </view> | ||
| 1564 | + </block> | ||
| 1565 | + <!-- 服务项目奖励 --> | ||
| 1566 | + <block wx:elif="{{item.type == 4}}"> | ||
| 1567 | + <view class="popup-list-item" wx:for="{{item.serviceList}}" wx:for-item="i"> | ||
| 1568 | + <view class="img-container"><image class="img-block" src="{{iurl + 'miniapp/images/luckDraw/fw.png'}}"></image></view> | ||
| 1569 | + <view class="f1 pdl20"> | ||
| 1570 | + <view class="ellipsis-2 popup-title">服务项目-{{i.name}}</view> | ||
| 1571 | + <view class="fs24 t-r pdt16 c-7b">数量：<text class="c-red">{{i.num}}</text></view> | ||
| 1572 | + </view> | ||
| 1573 | + </view> | ||
| 1574 | + </block> | ||
| 1575 | + <!-- 预存金额 --> | ||
| 1576 | + <block wx:elif="{{item.type == 5}}"> | ||
| 1577 | + <view class="popup-list-item"> | ||
| 1578 | + <view class="img-container"><image class="img-block" src="{{iurl + 'miniapp/images/luckDraw/jf.png'}}"></image></view> | ||
| 1579 | + <view class="f1 pdl20"> | ||
| 1580 | + <view class="ellipsis-2 popup-title">{{luckGoInfo[item.name]}}</view> | ||
| 1581 | + <view class="fs24 t-r pdt16 c-7b">金额：<text class="c-red">{{filters.div100(luckGoInfo[item.num])}}</text></view> | ||
| 1582 | + </view> | ||
| 1583 | + </view> | ||
| 1584 | + </block> | ||
| 1585 | + <!-- 其他奖励 --> | ||
| 1586 | + <block wx:else> | ||
| 1587 | + <view class="popup-list-item"> | ||
| 1588 | + <view class="img-container"> | ||
| 1589 | + <image class="img-block" src="{{iurl + 'miniapp/images/luckDraw/lb.png'}}" wx:if="{{item.type == 1}}"></image> | ||
| 1590 | + <image class="img-block" src="{{iurl + 'miniapp/images/luckDraw/czz.png'}}" wx:elif="{{item.type == 2}}"></image> | ||
| 1591 | + </view> | ||
| 1592 | + <view class="f1 pdl20"> | ||
| 1593 | + <view class="ellipsis-2 popup-title">{{item.name}}</view> | ||
| 1594 | + <view class="fs24 t-r pdt16 c-7b">数量：<text class="c-red">{{luckGoInfo[item.num]}}</text></view> | ||
| 1595 | + </view> | ||
| 1596 | + </view> | ||
| 1597 | + </block> | ||
| 1598 | + </block> | ||
| 1599 | + | ||
| 1557 | </view> | 1600 | </view> |
| 1558 | 1601 | ||
| 1559 | </view> | 1602 | </view> |
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss
| @@ -1130,8 +1130,8 @@ left:31rpx;} | @@ -1130,8 +1130,8 @@ left:31rpx;} | ||
| 1130 | } | 1130 | } |
| 1131 | /* 评价的用户边框 */ | 1131 | /* 评价的用户边框 */ |
| 1132 | .middle-user-frame{ | 1132 | .middle-user-frame{ |
| 1133 | - height: 65rpx; | ||
| 1134 | - overflow: hidden; | 1133 | + /* height: 65rpx; |
| 1134 | + overflow: hidden; */ | ||
| 1135 | } | 1135 | } |
| 1136 | .middle-user{ | 1136 | .middle-user{ |
| 1137 | height: 25; | 1137 | height: 25; |
| @@ -3094,12 +3094,13 @@ button.custom-service::after{ | @@ -3094,12 +3094,13 @@ button.custom-service::after{ | ||
| 3094 | 3094 | ||
| 3095 | .popup-list-item { | 3095 | .popup-list-item { |
| 3096 | display: flex; | 3096 | display: flex; |
| 3097 | + align-items: center; | ||
| 3097 | padding: 20rpx; | 3098 | padding: 20rpx; |
| 3098 | } | 3099 | } |
| 3099 | 3100 | ||
| 3100 | .popup-list-item .img-container { | 3101 | .popup-list-item .img-container { |
| 3101 | - width: 140rpx; | ||
| 3102 | - height: 140rpx; | 3102 | + width: 120rpx; |
| 3103 | + height: 100rpx; | ||
| 3103 | } | 3104 | } |
| 3104 | 3105 | ||
| 3105 | .popup-title { | 3106 | .popup-title { |
packageC/pages/luckyGo/luckyGo_list/luckyGo_list.js
| 1 | -var t = require("../../../../utils/util.js"), | ||
| 2 | - ut = t, | ||
| 3 | - e = require("../../../../utils/common.js"), | ||
| 4 | - a = require("../../../../utils/wxParse/wxParse.js"), | ||
| 5 | - s = getApp(), | ||
| 6 | - i = s.request, | ||
| 7 | - rq = i, | ||
| 8 | - oo = s.globalData, | ||
| 9 | - o = s.globalData.setting, | ||
| 10 | - os = o; | ||
| 11 | -var regeneratorRuntime = require('../../../../utils/runtime.js'); | ||
| 12 | -var e = getApp(),oo = e.globalData.setting; | ||
| 13 | - | ||
| 14 | - | ||
| 15 | const app = getApp(); | 1 | const app = getApp(); |
| 16 | let self = null; | 2 | let self = null; |
| 17 | 3 | ||
| 18 | Page({ | 4 | Page({ |
| 19 | data: { | 5 | data: { |
| 20 | - wu:false, | ||
| 21 | - imageurl: os.imghost,//有礼派图片地址, | ||
| 22 | - iurl: os.imghost,//有礼派图片地址, | ||
| 23 | - pt_state:0, | ||
| 24 | - order : null,//订单数据 | ||
| 25 | - currentTab: 0, | ||
| 26 | - current:0, | ||
| 27 | - ordertx:[],//头像 | ||
| 28 | - baseUrl: "/api/weshop/order/page?1=1", | ||
| 29 | - resourceUrl: e.globalData.setting.resourceUrl, | ||
| 30 | - currentPage: 1, | ||
| 31 | - requestData: null, | ||
| 32 | - original_img:null, | ||
| 33 | - timer:null, | ||
| 34 | - | ||
| 35 | - | ||
| 36 | - | ||
| 37 | - | ||
| 38 | tabArr: ['全部','参团中','已团中','未团中'], | 6 | tabArr: ['全部','参团中','已团中','未团中'], |
| 39 | currentTabIndex: 0, | 7 | currentTabIndex: 0, |
| 40 | 8 | ||
| @@ -44,6 +12,24 @@ Page({ | @@ -44,6 +12,24 @@ Page({ | ||
| 44 | noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据 | 12 | noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据 |
| 45 | pageNum: 1, // 当前页数 | 13 | pageNum: 1, // 当前页数 |
| 46 | showReward: false, | 14 | showReward: false, |
| 15 | + prizesArr: [], | ||
| 16 | + | ||
| 17 | + typeArr: [{ | ||
| 18 | + key: 'point', | ||
| 19 | + name: '积分', | ||
| 20 | + },{ | ||
| 21 | + key: 'grow', | ||
| 22 | + name: '成长值', | ||
| 23 | + },{ | ||
| 24 | + key: 'point', | ||
| 25 | + name: '优惠券', | ||
| 26 | + },{ | ||
| 27 | + key: 'prestore_name', | ||
| 28 | + name: '项目服务', | ||
| 29 | + },{ | ||
| 30 | + key: 'prestore_money', | ||
| 31 | + name: '预存金额', | ||
| 32 | + }], | ||
| 47 | }, | 33 | }, |
| 48 | 34 | ||
| 49 | onLoad: function () { | 35 | onLoad: function () { |
| @@ -64,7 +50,6 @@ Page({ | @@ -64,7 +50,6 @@ Page({ | ||
| 64 | isLogin: true, | 50 | isLogin: true, |
| 65 | }); | 51 | }); |
| 66 | 52 | ||
| 67 | - | ||
| 68 | let data = { | 53 | let data = { |
| 69 | store_id: app.globalData.setting.stoid, | 54 | store_id: app.globalData.setting.stoid, |
| 70 | user_id: this.data.userInfo.user_id, | 55 | user_id: this.data.userInfo.user_id, |
| @@ -128,11 +113,11 @@ Page({ | @@ -128,11 +113,11 @@ Page({ | ||
| 128 | break; | 113 | break; |
| 129 | }; | 114 | }; |
| 130 | case 2: { | 115 | case 2: { |
| 131 | - currentData.team_status = 1; | 116 | + currentData.team_status = 2; |
| 132 | break; | 117 | break; |
| 133 | }; | 118 | }; |
| 134 | case 3: { | 119 | case 3: { |
| 135 | - currentData.team_status = 2; | 120 | + currentData.team_status = 1; |
| 136 | break; | 121 | break; |
| 137 | }; | 122 | }; |
| 138 | }; | 123 | }; |
| @@ -219,10 +204,12 @@ Page({ | @@ -219,10 +204,12 @@ Page({ | ||
| 219 | }, | 204 | }, |
| 220 | 205 | ||
| 221 | //查看奖励 | 206 | //查看奖励 |
| 222 | - showReward: function() { | 207 | + showReward: function(e) { |
| 223 | this.setData({ | 208 | this.setData({ |
| 224 | - showReward: true, | 209 | + currentItemIndex: e.target.dataset.index, |
| 210 | + currentItemAid: e.target.dataset.aid, | ||
| 225 | }); | 211 | }); |
| 212 | + this.getPrizes(this.data.currentItemIndex); | ||
| 226 | }, | 213 | }, |
| 227 | 214 | ||
| 228 | //关闭奖励 | 215 | //关闭奖励 |
| @@ -233,208 +220,100 @@ Page({ | @@ -233,208 +220,100 @@ Page({ | ||
| 233 | }, | 220 | }, |
| 234 | 221 | ||
| 235 | 222 | ||
| 223 | + // 获取优惠券奖励和服务项目奖励 | ||
| 224 | + getPrizes: function(currentItemIndex) { | ||
| 225 | + let currentItem = this.data.list.pageData[currentItemIndex]; | ||
| 226 | + let type = currentItem.type; | ||
| 227 | + | ||
| 228 | + // 分割type字符串 | ||
| 229 | + let typeArr = this.splitStringToArr(type); | ||
| 230 | + let prizesArr = []; | ||
| 231 | + let promiseArr = []; | ||
| 232 | + typeArr.forEach(function(item) { | ||
| 233 | + | ||
| 234 | + let obj = {}; | ||
| 235 | + obj.type = item; | ||
| 236 | + | ||
| 237 | + let promise = new Promise((resolve, reject) => { | ||
| 238 | + switch(item) { | ||
| 239 | + case 1: { //积分 | ||
| 240 | + obj.name = '积分'; | ||
| 241 | + obj.num = 'point'; | ||
| 242 | + prizesArr.push(obj); | ||
| 243 | + resolve(); | ||
| 244 | + break; | ||
| 245 | + }; | ||
| 246 | + case 2: { //成长值 | ||
| 247 | + obj.name = '成长值'; | ||
| 248 | + obj.num = 'grow'; | ||
| 249 | + prizesArr.push(obj); | ||
| 250 | + resolve(); | ||
| 251 | + break; | ||
| 252 | + }; | ||
| 253 | + case 3: { //优惠券 | ||
| 254 | + app.request.promiseGet('/api/weshop/prom/luckyCoupon/page', { | ||
| 255 | + data: { | ||
| 256 | + store_id: os.stoid, | ||
| 257 | + aid: self.data.currentItemAid, | ||
| 258 | + } | ||
| 259 | + }).then(res => { | ||
| 260 | + if(res.data.code == 0) { | ||
| 261 | + obj.couponList = res.data.data.pageData; | ||
| 262 | + prizesArr.push(obj); | ||
| 263 | + resolve(); | ||
| 264 | + }; | ||
| 265 | + }); | ||
| 266 | + break; | ||
| 267 | + }; | ||
| 268 | + case 4: { //服务项目 | ||
| 269 | + app.request.promiseGet('/api/weshop/prom/luckyService/page', { | ||
| 270 | + data: { | ||
| 271 | + store_id: os.stoid, | ||
| 272 | + aid: self.data.currentItemAid, | ||
| 273 | + } | ||
| 274 | + }).then(res => { | ||
| 275 | + if(res.data.code == 0) { | ||
| 276 | + obj.serviceList = res.data.data.pageData; | ||
| 277 | + prizesArr.push(obj); | ||
| 278 | + resolve(); | ||
| 279 | + }; | ||
| 280 | + }); | ||
| 281 | + break; | ||
| 282 | + }; | ||
| 283 | + case 5: { //预存金额 | ||
| 284 | + obj.name = 'prestore_name'; | ||
| 285 | + obj.num = 'prestore_money'; | ||
| 286 | + prizesArr.push(obj); | ||
| 287 | + resolve(); | ||
| 288 | + break; | ||
| 289 | + }; | ||
| 290 | + }; | ||
| 291 | + }); | ||
| 292 | + | ||
| 293 | + promiseArr.push(promise); | ||
| 294 | + | ||
| 295 | + | ||
| 296 | + Promise.all(promiseArr).then(()=> { | ||
| 297 | + self.setData({ | ||
| 298 | + prizesArr, | ||
| 299 | + showReward: true, | ||
| 300 | + }); | ||
| 301 | + }); | ||
| 302 | + | ||
| 303 | + }); | ||
| 304 | + }, | ||
| 236 | 305 | ||
| 306 | + // 将type字符串分割成数组 | ||
| 307 | + splitStringToArr: function(typeStr) { | ||
| 308 | + var index; | ||
| 309 | + var newTypeArr = []; | ||
| 310 | + var typeStrArr = typeStr.split(','); | ||
| 311 | + typeStrArr.forEach(function(item) { | ||
| 312 | + index = parseInt(item); | ||
| 313 | + newTypeArr.push(index); | ||
| 314 | + }); | ||
| 315 | + return newTypeArr; | ||
| 316 | + }, | ||
| 237 | 317 | ||
| 238 | - | ||
| 239 | - | ||
| 240 | - | ||
| 241 | - | ||
| 242 | - | ||
| 243 | - | ||
| 244 | - | ||
| 245 | - | ||
| 246 | - | ||
| 247 | - | ||
| 248 | - | ||
| 249 | - | ||
| 250 | - | ||
| 251 | - /** | ||
| 252 | - * 点击tab切换 | ||
| 253 | - */ | ||
| 254 | - // swichNav: function (e) { | ||
| 255 | - // this.data.requestData=[]; | ||
| 256 | - // this.data.currentPage=1; | ||
| 257 | - // var that = this; | ||
| 258 | - | ||
| 259 | - // if (that.data.order == null){ | ||
| 260 | - // that.setData({ | ||
| 261 | - // wu:true | ||
| 262 | - // }) | ||
| 263 | - // } | ||
| 264 | - | ||
| 265 | - // if (this.data.currentTab === e.target.dataset.current) { | ||
| 266 | - // return false; | ||
| 267 | - // } else { | ||
| 268 | - // that.setData({ | ||
| 269 | - // currentTab: e.target.dataset.current, | ||
| 270 | - // }) | ||
| 271 | - // that.init(e.target.dataset.current); | ||
| 272 | - // } | ||
| 273 | - // }, | ||
| 274 | - | ||
| 275 | - // async init(current) { | ||
| 276 | - // var where="1=1"; | ||
| 277 | - // var user_id = getApp().globalData.user_id; | ||
| 278 | - // switch (current){ | ||
| 279 | - // case "1": | ||
| 280 | - // where+="&pt_status=1"; | ||
| 281 | - // break; | ||
| 282 | - // case "2": | ||
| 283 | - // where += "&pt_ok=1"; | ||
| 284 | - // break; | ||
| 285 | - // case "3": | ||
| 286 | - // where += "&pt_status=3"; | ||
| 287 | - // break; | ||
| 288 | - // } | ||
| 289 | - | ||
| 290 | - // var goods_id = 0,//商品ID, | ||
| 291 | - // original_img = [],//商品图片 | ||
| 292 | - // ee = this, | ||
| 293 | - // ordertx=[],//头像 | ||
| 294 | - // order = null,//订单数据 | ||
| 295 | - // goods = null,//商品数据 | ||
| 296 | - // users = null,//会员数据 | ||
| 297 | - // order_goods=null;//订单商品表 | ||
| 298 | - | ||
| 299 | - // //获取订单表的信息根据活动user_id,pt_prom_id>0 AND pay_time>0 | ||
| 300 | - // /*--- | ||
| 301 | - // await getApp().request.promiseGet("/api/weshop/order/page?"+where, { | ||
| 302 | - // data: { is_pt:1,store_id: os.stoid, user_id: user_id, pageSize: 6, page: this.data.currentPage,} | ||
| 303 | - // }).then(res => { | ||
| 304 | - // order = res.data.data.pageData; | ||
| 305 | - // this.data.currentPage++; | ||
| 306 | - // })--*/ | ||
| 307 | - | ||
| 308 | - // await getApp().request.promiseGet("/api/weshop/order/pageTuan?"+where, { | ||
| 309 | - // data: { is_pt:1,store_id: os.stoid, user_id: user_id, pageSize: 6, page: this.data.currentPage,} | ||
| 310 | - // }).then(res => { | ||
| 311 | - // order = res.data.data.pageData; | ||
| 312 | - // this.data.currentPage++; | ||
| 313 | - // }) | ||
| 314 | - | ||
| 315 | - | ||
| 316 | - // wx.showLoading({ title: "加载中"}); | ||
| 317 | - // for (i = 0; i < order.length; i++) { | ||
| 318 | - // //获取订单从表信息 | ||
| 319 | - // await getApp().request.promiseGet("/api/weshop/ordergoods/pageGoods", { | ||
| 320 | - // data: { store_id: os.stoid, order_id: order[i].order_id } | ||
| 321 | - // }).then(res => { | ||
| 322 | - // order_goods = res.data.data.pageData; | ||
| 323 | - // order[i].order_goods = order_goods; | ||
| 324 | - // order[i].gimage = ee.data.imageurl + order_goods[0].original_img; | ||
| 325 | - // }) | ||
| 326 | - | ||
| 327 | - | ||
| 328 | - // //获取订单表信息根据上面查询的订单号order[i].pt_listno | ||
| 329 | - // await getApp().request.promiseGet("/api/weshop/order/pagePtList", { | ||
| 330 | - // data: { store_id: os.stoid, pt_listno: order[i].pt_listno,pageSize:60,page:1} | ||
| 331 | - // }).then(res => { | ||
| 332 | - // //console.log("ordertx"); | ||
| 333 | - // ordertx = res.data.data.pageData; | ||
| 334 | - // //console.log(ordertx); | ||
| 335 | - // order[i].tx=ordertx; | ||
| 336 | - // }) | ||
| 337 | - | ||
| 338 | - | ||
| 339 | - | ||
| 340 | - // if (order[i].is_zsorder== 4) { | ||
| 341 | - // var num = 0; | ||
| 342 | - // var jt_data = JSON.parse(order[i].ct_rylist); | ||
| 343 | - // for (var m in jt_data) { | ||
| 344 | - // if (jt_data[m].rynum > num) num = jt_data[m].rynum; | ||
| 345 | - // } | ||
| 346 | - // order[i].max_ct_num = num; | ||
| 347 | - // } | ||
| 348 | - | ||
| 349 | - // var sf_num = order[i].ct_num; | ||
| 350 | - // if (order[i].ct_num>=3){ sf_num=3;} | ||
| 351 | - // sf_num=sf_num-ordertx.length; | ||
| 352 | - // if(sf_num>0) { | ||
| 353 | - // var arr = []; | ||
| 354 | - // for(var j=0;j<sf_num;j++){ | ||
| 355 | - // arr.push(j); | ||
| 356 | - // } | ||
| 357 | - // order[i].sf_num=arr; | ||
| 358 | - // } | ||
| 359 | - | ||
| 360 | - // } | ||
| 361 | - // //设置值 | ||
| 362 | - // for (var ii = 0; ii < order.length;ii++){ | ||
| 363 | - // this.data.requestData.push(order[ii]); | ||
| 364 | - // } | ||
| 365 | - | ||
| 366 | - // wx.hideLoading(); | ||
| 367 | - // ee.setData({ order: this.data.requestData, ordertx: ordertx, isgo:1}); | ||
| 368 | - // }, | ||
| 369 | - | ||
| 370 | - // //---滚动到底部加载更多--- | ||
| 371 | - // onReachBottom: function () { | ||
| 372 | - // this.init(this.data.currentTab); | ||
| 373 | - // }, | ||
| 374 | - | ||
| 375 | - // resetData: function () { | ||
| 376 | - // n.resetConfig(), this.data.order = null, this.data.currentPage = 1; | ||
| 377 | - // }, | ||
| 378 | - | ||
| 379 | - // //----跳转到拼单success展示----- | ||
| 380 | - // go_team_success:function(e) { | ||
| 381 | - // var order_sn=e.currentTarget.dataset.ordsn; | ||
| 382 | - // wx.navigateTo({ | ||
| 383 | - // url: "/pages/team/team_success/team_success?ordersn=" + order_sn, | ||
| 384 | - // }); | ||
| 385 | - // }, | ||
| 386 | - | ||
| 387 | - // onHide:function(){ | ||
| 388 | - // //--清理定时器-- | ||
| 389 | - // clearInterval(this.timer); | ||
| 390 | - // }, | ||
| 391 | - | ||
| 392 | - // //----倒计时函数----- | ||
| 393 | - // countDown() { | ||
| 394 | - // var th=this; | ||
| 395 | - // // 获取当前时间，同时得到活动结束时间数组 | ||
| 396 | - // let newTime =ut.gettimestamp(); | ||
| 397 | - // var endTimeList = this.data.order; | ||
| 398 | - | ||
| 399 | - // if(endTimeList==null) return null | ||
| 400 | - // // 对结束时间进行处理渲染到页面 | ||
| 401 | - // for (var i = 0; i < endTimeList.length;i++){ | ||
| 402 | - // var o = endTimeList[i]; | ||
| 403 | - // if(o.kt_end_time==undefined) continue; | ||
| 404 | - // var endTime = o.kt_end_time; | ||
| 405 | - // let obj = null; | ||
| 406 | - // // 如果活动未结束，对时间进行处理 | ||
| 407 | - // if (endTime - newTime > 0){ | ||
| 408 | - // let time = (endTime - newTime); | ||
| 409 | - // // 获取天、时、分、秒 | ||
| 410 | - // let day = parseInt(time / (60 * 60 * 24)); | ||
| 411 | - // let hou = parseInt(time % (60 * 60 * 24) / 3600); | ||
| 412 | - // let min = parseInt(time % (60 * 60 * 24) % 3600 / 60); | ||
| 413 | - // let sec = parseInt(time % (60 * 60 * 24) % 3600 % 60); | ||
| 414 | - // obj = { | ||
| 415 | - // day: this.timeFormat(day), hou: this.timeFormat(hou), min: this.timeFormat(min), sec: this.timeFormat(sec) | ||
| 416 | - // } | ||
| 417 | - // }else{ | ||
| 418 | - // //活动已结束，全部设置为'00' | ||
| 419 | - // obj = { day: '00', hou: '00', min: '00', sec: '00' } | ||
| 420 | - // } | ||
| 421 | - | ||
| 422 | - // var txt ="order["+i+"].djs"; | ||
| 423 | - // th.setData({ [txt]: obj}); | ||
| 424 | - // } | ||
| 425 | - // }, | ||
| 426 | - // //---小于10的格式化函数---- | ||
| 427 | - // timeFormat(param) { | ||
| 428 | - // return param < 10 ? '0' + param : param; | ||
| 429 | - // }, | ||
| 430 | - | ||
| 431 | - images_err:function(e){ | ||
| 432 | - var txt = e.currentTarget.dataset.err; | ||
| 433 | - var ob={}; | ||
| 434 | - ob[txt] = this.data.imageurl + "/miniapp/images/default_g_img.gif"; | ||
| 435 | - this.setData(ob); | ||
| 436 | - } | ||
| 437 | - | ||
| 438 | - | ||
| 439 | }) | 318 | }) |
| 440 | 319 |
packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxml
| @@ -10,8 +10,8 @@ | @@ -10,8 +10,8 @@ | ||
| 10 | <!-- <view class="list-item" wx:for="{{list.pageData}}"> --> | 10 | <!-- <view class="list-item" wx:for="{{list.pageData}}"> --> |
| 11 | <view class="pd20" bindtap="go" data-url="/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id={{item.order_id}}"> | 11 | <view class="pd20" bindtap="go" data-url="/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id={{item.order_id}}"> |
| 12 | <view class="pdr40 arrow" wx:if="{{item.team_status == 0}}">参团中，还差<text class="c-red">{{filters.difference(item.num, item.group_num)}}</text>人</view> | 12 | <view class="pdr40 arrow" wx:if="{{item.team_status == 0}}">参团中，还差<text class="c-red">{{filters.difference(item.num, item.group_num)}}</text>人</view> |
| 13 | - <view class="pdr40 arrow" wx:elif="{{item.team_status == 1}}">已团中，{{item.shipping_status == 0 ? '待发货':'已发货'}}</view> | ||
| 14 | - <view class="pdr40 arrow" wx:elif="{{item.team_status == 2}}">未团中，已退款</view> | 13 | + <view class="pdr40 arrow" wx:elif="{{item.team_status == 2}}">已团中，{{item.shipping_status == 0 ? '待发货':'已发货'}}</view> |
| 14 | + <view class="pdr40 arrow" wx:elif="{{item.team_status == 1}}">未团中，已退款</view> | ||
| 15 | </view> | 15 | </view> |
| 16 | <view class="flex pd20"> | 16 | <view class="flex pd20"> |
| 17 | <view class="img-container"> | 17 | <view class="img-container"> |
| @@ -24,16 +24,15 @@ | @@ -24,16 +24,15 @@ | ||
| 24 | <text class="rmb fs40 c-red">{{filters.price(item.group_price)}}</text> | 24 | <text class="rmb fs40 c-red">{{filters.price(item.group_price)}}</text> |
| 25 | <view class="fs24 del pdl10 c-c7">零售价<text class="rmb">{{item.market_price}}</text></view> | 25 | <view class="fs24 del pdl10 c-c7">零售价<text class="rmb">{{item.market_price}}</text></view> |
| 26 | </view> | 26 | </view> |
| 27 | - <view class="c-red fs24">未团中可获得帮团奖励</view> | 27 | + <view class="c-red fs24" wx:if="{{item.team_status != 2}}">未团中可获得帮团奖励</view> |
| 28 | </view> | 28 | </view> |
| 29 | </view> | 29 | </view> |
| 30 | <view class="flex ai-center pd20 bdt fs24 jc_sb"> | 30 | <view class="flex ai-center pd20 bdt fs24 jc_sb"> |
| 31 | <view>共1件，实付金额：<text class="rmb">{{item.user_money}}</text></view> | 31 | <view>共1件，实付金额：<text class="rmb">{{item.user_money}}</text></view> |
| 32 | <view class="flex"> | 32 | <view class="flex"> |
| 33 | <view class="btn gray" bindtap="go" data-url="/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id={{item.order_id}}&team_status={{item.team_status}}">查看订单</view> | 33 | <view class="btn gray" bindtap="go" data-url="/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id={{item.order_id}}&team_status={{item.team_status}}">查看订单</view> |
| 34 | - <view class="btn c-red mgl20" wx:if="{{item.team_status == 0}}" bindtap="go" data-url="/packageC/pages/luckyGo/luckyGo_details/luckyGo_details?group_id={{item.aid}}&goods_id={{item.goods_id}}&goods_name={{item.goods_name}}">邀请好友</view> | ||
| 35 | - <!-- "&group_id=" + th.data.param.group_id + "&goods_id=" + th.data.param.goods_id + "&goods_name=" + th.data.bn_goods.goods_name --> | ||
| 36 | - <view class="btn c-red mgl20" wx:if="{{item.team_status == 2}}" bindtap="showReward">查看奖励</view> | 34 | + <view class="btn c-red mgl20" wx:if="{{item.team_status == 0}}" bindtap="go" data-url="/packageC/pages/luckyGo/luckyGo_details/luckyGo_details?group_id={{item.aid}}&goods_id={{item.goods_id}}&goods_name={{item.goods_name}}&team_id={{item.team_id}}&&from=list">邀请好友</view> |
| 35 | + <view class="btn c-red mgl20" wx:if="{{item.team_status == 1}}" bindtap="showReward" data-index="{{index}}" data-aid="{{item.aid}}">查看奖励</view> | ||
| 37 | </view> | 36 | </view> |
| 38 | </view> | 37 | </view> |
| 39 | </view> | 38 | </view> |
| @@ -41,8 +40,6 @@ | @@ -41,8 +40,6 @@ | ||
| 41 | </view> | 40 | </view> |
| 42 | 41 | ||
| 43 | 42 | ||
| 44 | - | ||
| 45 | - | ||
| 46 | <view class="popup-container" wx:if="{{showReward}}"> | 43 | <view class="popup-container" wx:if="{{showReward}}"> |
| 47 | <view class="popup"> | 44 | <view class="popup"> |
| 48 | <view class="pd20 flex jc_sb"> | 45 | <view class="pd20 flex jc_sb"> |
| @@ -50,18 +47,58 @@ | @@ -50,18 +47,58 @@ | ||
| 50 | <text class="iconfont icon-close fs32 c-7b" bindtap="closeReward"></text> | 47 | <text class="iconfont icon-close fs32 c-7b" bindtap="closeReward"></text> |
| 51 | </view> | 48 | </view> |
| 52 | <view class="popup-list"> | 49 | <view class="popup-list"> |
| 53 | - <view class="popup-list-item" wx:for="{{filters.showByType(luckGoInfo.type)}}"> | ||
| 54 | - <view class="img-container"><image class="img-block" src="../../../../images/bk.png"></image></view> | ||
| 55 | - <view class="f1"> | ||
| 56 | - <view class="ellipsis-2 popup-title pdl20">{{typeArr[item-1].name}}</view> | ||
| 57 | - <view class="fs24 t-r pdt16 c-7b">数量：<text class="c-red">{{luckGoInfo[typeArr[item-1]['key']]}}</text></view> | ||
| 58 | - </view> | ||
| 59 | - </view> | ||
| 60 | - | 50 | + <block wx:for="{{prizesArr}}"> |
| 51 | + <!-- 优惠券奖励 --> | ||
| 52 | + <block wx:if="{{item.type == 3}}"> | ||
| 53 | + <view class="popup-list-item" wx:for="{{item.couponList}}" wx:for-item="i"> | ||
| 54 | + <view class="img-container"><image class="img-block" src="{{imghost + 'miniapp/images/luckDraw/yhq.png'}}"></image></view> | ||
| 55 | + <view class="f1"> | ||
| 56 | + <view class="ellipsis-2 popup-title">优惠券-{{i.name}}</view> | ||
| 57 | + <view class="fs24 t-r pdt16 c-7b">数量：<text class="c-red">{{i.num}}</text></view> | ||
| 58 | + </view> | ||
| 59 | + </view> | ||
| 60 | + </block> | ||
| 61 | + <!-- 服务项目奖励 --> | ||
| 62 | + <block wx:elif="{{item.type == 4}}"> | ||
| 63 | + <view class="popup-list-item" wx:for="{{item.serviceList}}" wx:for-item="i"> | ||
| 64 | + <view class="img-container"><image class="img-block" src="{{imghost + 'miniapp/images/luckDraw/fw.png'}}"></image></view> | ||
| 65 | + <view class="f1"> | ||
| 66 | + <view class="ellipsis-2 popup-title">服务项目-{{i.name}}</view> | ||
| 67 | + <view class="fs24 t-r pdt16 c-7b">数量：<text class="c-red">{{i.num}}</text></view> | ||
| 68 | + </view> | ||
| 69 | + </view> | ||
| 70 | + </block> | ||
| 71 | + <!-- 预存金额 --> | ||
| 72 | + <block wx:elif="{{item.type == 5}}"> | ||
| 73 | + <view class="popup-list-item"> | ||
| 74 | + <view class="img-container"><image class="img-block" src="{{imghost + 'miniapp/images/luckDraw/jf.png'}}"></image></view> | ||
| 75 | + <view class="f1"> | ||
| 76 | + <view class="ellipsis-2 popup-title">{{list.pageData[currentItemIndex][item.name]}}</view> | ||
| 77 | + <view class="fs24 t-r pdt16 c-7b">金额：<text class="c-red">{{filters.div100(list.pageData[currentItemIndex][item.num])}}</text></view> | ||
| 78 | + </view> | ||
| 79 | + </view> | ||
| 80 | + </block> | ||
| 81 | + <!-- 其他奖励 --> | ||
| 82 | + <block wx:else> | ||
| 83 | + <view class="popup-list-item"> | ||
| 84 | + <view class="img-container"> | ||
| 85 | + <image class="img-block" src="{{imghost + 'miniapp/images/luckDraw/lb.png'}}" wx:if="{{item.type == 1}}"></image> | ||
| 86 | + <image class="img-block" src="{{imghost + 'miniapp/images/luckDraw/czz.png'}}" wx:elif="{{item.type == 2}}"></image> | ||
| 87 | + </view> | ||
| 88 | + <view class="f1"> | ||
| 89 | + <view class="ellipsis-2 popup-title">{{item.name}}</view> | ||
| 90 | + <view class="fs24 t-r pdt16 c-7b">数量：<text class="c-red">{{list.pageData[currentItemIndex][item.num]}}</text></view> | ||
| 91 | + </view> | ||
| 92 | + </view> | ||
| 93 | + </block> | ||
| 94 | + </block> | ||
| 95 | + | ||
| 61 | </view> | 96 | </view> |
| 62 | </view> | 97 | </view> |
| 63 | </view> | 98 | </view> |
| 64 | 99 | ||
| 100 | + <!-- <view class="fs24 t-r pdt16 c-7b">数量：<text class="c-red">{{list.pageData[currentItemIndex][typeArr[item-1]['key']]}}</text></view> --> | ||
| 101 | + | ||
| 65 | 102 | ||
| 66 | 103 | ||
| 67 | <view class="no-more" hidden="{{!noMore}}" wx:if="{{list.pageData.length !== 0}}">—— 已经到底啦 ——</view> | 104 | <view class="no-more" hidden="{{!noMore}}" wx:if="{{list.pageData.length !== 0}}">—— 已经到底啦 ——</view> |
packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxss
| @@ -127,16 +127,20 @@ page { | @@ -127,16 +127,20 @@ page { | ||
| 127 | color: #AF481D; | 127 | color: #AF481D; |
| 128 | } | 128 | } |
| 129 | 129 | ||
| 130 | - | 130 | +.popup-list { |
| 131 | + max-height: 700rpx; | ||
| 132 | + overflow-y: auto; | ||
| 133 | +} | ||
| 131 | 134 | ||
| 132 | .popup-list-item { | 135 | .popup-list-item { |
| 133 | display: flex; | 136 | display: flex; |
| 137 | + align-items: center; | ||
| 134 | padding: 20rpx; | 138 | padding: 20rpx; |
| 135 | } | 139 | } |
| 136 | 140 | ||
| 137 | .popup-list-item .img-container { | 141 | .popup-list-item .img-container { |
| 138 | - width: 140rpx; | ||
| 139 | - height: 140rpx; | 142 | + width: 120rpx; |
| 143 | + height: 100rpx; | ||
| 140 | } | 144 | } |
| 141 | 145 | ||
| 142 | .popup-title { | 146 | .popup-title { |
packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml
| @@ -19,8 +19,8 @@ | @@ -19,8 +19,8 @@ | ||
| 19 | <view class="shop_name">门店：{{order.pickname}}</view> | 19 | <view class="shop_name">门店：{{order.pickname}}</view> |
| 20 | <!-- <view>{{order.order_status_detail}}</view> --> | 20 | <!-- <view>{{order.order_status_detail}}</view> --> |
| 21 | <view wx:if="{{team_status == 0}}">参团中</view> | 21 | <view wx:if="{{team_status == 0}}">参团中</view> |
| 22 | - <view wx:elif="{{team_status == 1}}">已团中 | {{order.shipping_status == 0 ? '待发货':'已发货'}}</view> | ||
| 23 | - <view wx:elif="{{team_status == 2}}">未团中 | 已退款</view> | 22 | + <view wx:elif="{{team_status == 2}}">已团中 | {{order.shipping_status == 0 ? '待发货':'已发货'}}</view> |
| 23 | + <view wx:elif="{{team_status == 1}}">未团中 | 已退款</view> | ||
| 24 | </view> | 24 | </view> |
| 25 | <!--wx:if="{{item.return_btn!=4}}" --> | 25 | <!--wx:if="{{item.return_btn!=4}}" --> |
| 26 | <view class="order-detail pd20" wx:for="{{order.order_goods}}" wx:key="{{index}}" > | 26 | <view class="order-detail pd20" wx:for="{{order.order_goods}}" wx:key="{{index}}" > |
| @@ -152,16 +152,17 @@ | @@ -152,16 +152,17 @@ | ||
| 152 | </view> | 152 | </view> |
| 153 | 153 | ||
| 154 | <!-- 幸运购 --> | 154 | <!-- 幸运购 --> |
| 155 | - <view class="price-information information"> | 155 | + <view class="price-information information" wx:if="{{order.is_back == 1}}"> |
| 156 | <view class="title">退款信息</view> | 156 | <view class="title">退款信息</view> |
| 157 | 157 | ||
| 158 | <view class="item"> | 158 | <view class="item"> |
| 159 | <view>退款金额</view> | 159 | <view>退款金额</view> |
| 160 | - <view>￥0.01</view> | 160 | + <view wx:if="{{order.tail_pay_type==1}}">￥{{filters.toFix(order.user_money+order.pt_tail_money,2)}}</view> |
| 161 | + <view wx:else>￥{{filters.toFix(order.user_money,2)}}</view> | ||
| 161 | </view> | 162 | </view> |
| 162 | <view class="item"> | 163 | <view class="item"> |
| 163 | <view>退款时间</view> | 164 | <view>退款时间</view> |
| 164 | - <view>2021-10-11 18:00:00</view> | 165 | + <view>{{filters.format_time(order.is_back_time, 1)}}</view> |
| 165 | </view> | 166 | </view> |
| 166 | <view class="item"> | 167 | <view class="item"> |
| 167 | <view>退款方式</view> | 168 | <view>退款方式</view> |
packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxss
| @@ -37,7 +37,7 @@ | @@ -37,7 +37,7 @@ | ||
| 37 | padding-right: 40rpx; | 37 | padding-right: 40rpx; |
| 38 | padding-left: 40rpx; */ | 38 | padding-left: 40rpx; */ |
| 39 | background-color: #fff; | 39 | background-color: #fff; |
| 40 | - color: #f23030; | 40 | + color: #FF6768; |
| 41 | justify-content: space-between; | 41 | justify-content: space-between; |
| 42 | display: flex; | 42 | display: flex; |
| 43 | } | 43 | } |
pages/cart/cart/cart.js
| @@ -356,32 +356,79 @@ Page({ | @@ -356,32 +356,79 @@ Page({ | ||
| 356 | 356 | ||
| 357 | //--判断优惠活动有没有过期-- | 357 | //--判断优惠活动有没有过期-- |
| 358 | else if (item.prom_type == 3) { | 358 | else if (item.prom_type == 3) { |
| 359 | - var isok = 1; | ||
| 360 | - await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + item.goods_id + "/1", {}).then(res => { | ||
| 361 | - if (res.data.code == 0) { | ||
| 362 | - var r_data = res.data.data; | ||
| 363 | - if (!r_data.promGoodsLists) { | 359 | + var isok = 1,is_g_prom=0; |
| 360 | + //因为有全场优惠活动，商品参加的活动还未开始 | ||
| 361 | + var url="/api/weshop/activitylist/getGoodActInfo"; | ||
| 362 | + var req_data={ | ||
| 363 | + store_id:os.stoid,goodsidlist:item.goods_id,is_detail:1,user_id:user_id | ||
| 364 | + }; | ||
| 365 | + await getApp().request.promiseGet(url, {data:req_data}).then(async function (res) { | ||
| 366 | + if(res.data.code==0 && res.data.data && res.data.data.length){ | ||
| 367 | + for(let i in res.data.data){ | ||
| 368 | + let item=res.data.data[i]; | ||
| 369 | + if(item.prom_type==3) { | ||
| 370 | + is_g_prom=1; break; | ||
| 371 | + } | ||
| 372 | + } | ||
| 373 | + } | ||
| 374 | + }) | ||
| 375 | + | ||
| 376 | + if(is_g_prom){ | ||
| 377 | + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + item.goods_id + "/1", {}).then(res => { | ||
| 378 | + if (res.data.code == 0) { | ||
| 379 | + var r_data = res.data.data; | ||
| 380 | + if (!r_data.promGoodsLists) { | ||
| 381 | + var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; | ||
| 382 | + getApp().request.delete(url, {}); | ||
| 383 | + //商品已经无活动 | ||
| 384 | + isok = 0; | ||
| 385 | + }else{ | ||
| 386 | + //如果活动的ID不一样，说明原先的活动已经没有参与了或者过期了 | ||
| 387 | + if(item.prom_id!=r_data.promGoodsLists[0].prom_id ){ | ||
| 388 | + var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; | ||
| 389 | + getApp().request.delete(url, {}); | ||
| 390 | + //商品已经下架 | ||
| 391 | + isok = 0; | ||
| 392 | + } | ||
| 393 | + } | ||
| 394 | + | ||
| 395 | + } else { | ||
| 364 | var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; | 396 | var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; |
| 365 | getApp().request.delete(url, {}); | 397 | getApp().request.delete(url, {}); |
| 366 | - //商品已经无活动 | 398 | + //商品已经下架 |
| 367 | isok = 0; | 399 | isok = 0; |
| 368 | - }else{ | ||
| 369 | - //如果活动的ID不一样，说明原先的活动已经没有参与了或者过期了 | ||
| 370 | - if(item.prom_id!=r_data.promGoodsLists[0].prom_id ){ | ||
| 371 | - var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; | ||
| 372 | - getApp().request.delete(url, {}); | ||
| 373 | - //商品已经下架 | ||
| 374 | - isok = 0; | ||
| 375 | - } | ||
| 376 | - } | ||
| 377 | - | ||
| 378 | - } else { | ||
| 379 | - var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; | ||
| 380 | - getApp().request.delete(url, {}); | ||
| 381 | - //商品已经下架 | ||
| 382 | - isok = 0; | ||
| 383 | - } | ||
| 384 | - }) | 400 | + } |
| 401 | + }) | ||
| 402 | + | ||
| 403 | + }else{ | ||
| 404 | + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromNormal/" + os.stoid + "/" + item.goods_id, {}).then(res => { | ||
| 405 | + if (res.data.code == 0) { | ||
| 406 | + var r_data = res.data.data; | ||
| 407 | + if (!r_data.promGoodsLists) { | ||
| 408 | + var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; | ||
| 409 | + getApp().request.delete(url, {}); | ||
| 410 | + //商品已经无活动 | ||
| 411 | + isok = 0; | ||
| 412 | + }else{ | ||
| 413 | + //如果活动的ID不一样，说明原先的活动已经没有参与了或者过期了 | ||
| 414 | + if(item.prom_id!=r_data.promGoodsLists[0].prom_id ){ | ||
| 415 | + var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; | ||
| 416 | + getApp().request.delete(url, {}); | ||
| 417 | + //商品已经下架 | ||
| 418 | + isok = 0; | ||
| 419 | + } | ||
| 420 | + } | ||
| 421 | + | ||
| 422 | + } else { | ||
| 423 | + var url = '/api/weshop/cart/del/' + oo.stoid + '/' + item.id; | ||
| 424 | + getApp().request.delete(url, {}); | ||
| 425 | + //商品已经下架 | ||
| 426 | + isok = 0; | ||
| 427 | + } | ||
| 428 | + }) | ||
| 429 | + | ||
| 430 | + } | ||
| 431 | + | ||
| 385 | if (!isok) continue; | 432 | if (!isok) continue; |
| 386 | } | 433 | } |
| 387 | else if (item.prom_type == 7) { | 434 | else if (item.prom_type == 7) { |
| @@ -1423,9 +1470,28 @@ Page({ | @@ -1423,9 +1470,28 @@ Page({ | ||
| 1423 | 1470 | ||
| 1424 | //----------------------更新购物数量，加减,调用接口--------------------- | 1471 | //----------------------更新购物数量，加减,调用接口--------------------- |
| 1425 | postCardList: function(t, item, pitem) { | 1472 | postCardList: function(t, item, pitem) { |
| 1473 | + var e = this,th=e,user_id = getApp().globalData.user_id; | ||
| 1474 | + function normal_check(store_count,goodsinfo,wareIds) { | ||
| 1475 | + //--- 看一下是不是线下库存 --- | ||
| 1476 | + if(th.data.sales_rules==2 && goodsinfo.prom_type!=7){ | ||
| 1477 | + th.check_down_line(t, pitem, item,wareIds); | ||
| 1478 | + }else{ | ||
| 1479 | + if (t.goods_num > store_count) { | ||
| 1480 | + wx.showModal({ | ||
| 1481 | + title: '提示', | ||
| 1482 | + content: '购买数量超出商品库存' | ||
| 1483 | + }); | ||
| 1484 | + var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; | ||
| 1485 | + e.setData({ | ||
| 1486 | + [txt]: store_count | ||
| 1487 | + }); | ||
| 1488 | + e.doCheckAll(); | ||
| 1489 | + t.goods_num=store_count; | ||
| 1490 | + } | ||
| 1491 | + e.update_cart(t, pitem, item); | ||
| 1492 | + } | ||
| 1493 | + } | ||
| 1426 | 1494 | ||
| 1427 | - var e = this,th=e; | ||
| 1428 | - var user_id = getApp().globalData.user_id; | ||
| 1429 | // console.log('update'); | 1495 | // console.log('update'); |
| 1430 | // console.log('9995959595959',t); | 1496 | // console.log('9995959595959',t); |
| 1431 | rq.get("/api/weshop/goods/get/" + oo.stoid + "/" + t.goods_id, { | 1497 | rq.get("/api/weshop/goods/get/" + oo.stoid + "/" + t.goods_id, { |
| @@ -1456,12 +1522,8 @@ Page({ | @@ -1456,12 +1522,8 @@ Page({ | ||
| 1456 | th.setData({[txt]:promgoodsbuynum}); | 1522 | th.setData({[txt]:promgoodsbuynum}); |
| 1457 | } | 1523 | } |
| 1458 | goodsbuynum = buy_num_data.goodsbuynum; | 1524 | goodsbuynum = buy_num_data.goodsbuynum; |
| 1459 | - | ||
| 1460 | - | ||
| 1461 | - // console.log('goodsbuynum===========', goodsbuynum); | ||
| 1462 | - }) | ||
| 1463 | 1525 | ||
| 1464 | - | 1526 | + }) |
| 1465 | 1527 | ||
| 1466 | var buyed_mum2 = t.goods_num + goodsbuynum; | 1528 | var buyed_mum2 = t.goods_num + goodsbuynum; |
| 1467 | if (buyed_mum2 > limit && limit > 0) { | 1529 | if (buyed_mum2 > limit && limit > 0) { |
| @@ -1482,129 +1544,174 @@ Page({ | @@ -1482,129 +1544,174 @@ Page({ | ||
| 1482 | } | 1544 | } |
| 1483 | 1545 | ||
| 1484 | 1546 | ||
| 1485 | - if (goodsinfo.prom_type == 1) { | ||
| 1486 | - //读取秒杀 | ||
| 1487 | - rq.get("/api/ms/flash_sale/getFlashSaleOne/" + oo.stoid + "/" + goodsinfo.prom_id, { | ||
| 1488 | - isShowLoading: 0, | ||
| 1489 | - success: function(res_d) { | ||
| 1490 | - | ||
| 1491 | - if(res_d.data.code==0 && res_d.data.data){ | ||
| 1492 | - if (t.goods_num > store_count) { | ||
| 1493 | - wx.showModal({ | ||
| 1494 | - title: '提示', | ||
| 1495 | - content: '购买数量超出商品库存' | ||
| 1496 | - }); | ||
| 1497 | - var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; | ||
| 1498 | - e.setData({ | ||
| 1499 | - [txt]: store_count | ||
| 1500 | - }); | ||
| 1501 | - e.doCheckAll(); | ||
| 1502 | - | ||
| 1503 | - t.goods_num=store_count; | ||
| 1504 | - e.update_cart(t, pitem, item); | 1547 | + switch (goodsinfo.prom_type){ |
| 1548 | + case 1: | ||
| 1549 | + //读取秒杀 | ||
| 1550 | + rq.get("/api/ms/flash_sale/getFlashSaleOne/" + oo.stoid + "/" + goodsinfo.prom_id, { | ||
| 1551 | + isShowLoading: 0, | ||
| 1552 | + success: function(res_d) { | ||
| 1553 | + if(res_d.data.code==0 && res_d.data.data){ | ||
| 1554 | + if (t.goods_num > store_count) { | ||
| 1555 | + wx.showModal({ | ||
| 1556 | + title: '提示', | ||
| 1557 | + content: '购买数量超出商品库存' | ||
| 1558 | + }); | ||
| 1559 | + var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; | ||
| 1560 | + e.setData({ | ||
| 1561 | + [txt]: store_count | ||
| 1562 | + }); | ||
| 1563 | + e.doCheckAll(); | ||
| 1505 | 1564 | ||
| 1506 | - return false; | ||
| 1507 | - } | 1565 | + t.goods_num=store_count; |
| 1566 | + e.update_cart(t, pitem, item); | ||
| 1508 | 1567 | ||
| 1509 | - var false_data = res_d.data.data; | ||
| 1510 | - //--判断库存-- | ||
| 1511 | - if (t.goods_num > false_data.goods_num - false_data.buy_num) { | ||
| 1512 | - wx.showModal({ | ||
| 1513 | - title: '提示', | ||
| 1514 | - content: '购买数量超出活动库存' | ||
| 1515 | - }); | ||
| 1516 | - var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; | ||
| 1517 | - e.setData({ | ||
| 1518 | - [txt]: false_data.goods_num - false_data.buy_num | ||
| 1519 | - }); | ||
| 1520 | - e.doCheckAll(); | ||
| 1521 | - | ||
| 1522 | - t.goods_num=false_data.goods_num - false_data.buy_num; | ||
| 1523 | - e.update_cart(t, pitem, item); | 1568 | + return false; |
| 1569 | + } | ||
| 1524 | 1570 | ||
| 1525 | - return false; | ||
| 1526 | - } | 1571 | + var false_data = res_d.data.data; |
| 1572 | + //--判断库存-- | ||
| 1573 | + if (t.goods_num > false_data.goods_num - false_data.buy_num) { | ||
| 1574 | + wx.showModal({ | ||
| 1575 | + title: '提示', | ||
| 1576 | + content: '购买数量超出活动库存' | ||
| 1577 | + }); | ||
| 1578 | + var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; | ||
| 1579 | + e.setData({ | ||
| 1580 | + [txt]: false_data.goods_num - false_data.buy_num | ||
| 1581 | + }); | ||
| 1582 | + e.doCheckAll(); | ||
| 1527 | 1583 | ||
| 1528 | - //--判断redis数量是否已经超出-- | ||
| 1529 | - if (t.goods_num > false_data.redisnum) { | ||
| 1530 | - wx.showModal({ | ||
| 1531 | - title: '提示', | ||
| 1532 | - content: '购买数量超出商品库存' | ||
| 1533 | - }); | ||
| 1534 | - var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; | ||
| 1535 | - e.setData({ | ||
| 1536 | - [txt]: false_data.redisnum | ||
| 1537 | - }); | ||
| 1538 | - e.doCheckAll(); | ||
| 1539 | - | ||
| 1540 | - t.goods_num=false_data.redisnum; | ||
| 1541 | - e.update_cart(t, pitem, item); | 1584 | + t.goods_num=false_data.goods_num - false_data.buy_num; |
| 1585 | + e.update_cart(t, pitem, item); | ||
| 1542 | 1586 | ||
| 1587 | + return false; | ||
| 1588 | + } | ||
| 1543 | 1589 | ||
| 1544 | - return false; | ||
| 1545 | - } | 1590 | + //--判断redis数量是否已经超出-- |
| 1591 | + if (t.goods_num > false_data.redisnum) { | ||
| 1592 | + wx.showModal({ | ||
| 1593 | + title: '提示', | ||
| 1594 | + content: '购买数量超出商品库存' | ||
| 1595 | + }); | ||
| 1596 | + var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; | ||
| 1597 | + e.setData({ | ||
| 1598 | + [txt]: false_data.redisnum | ||
| 1599 | + }); | ||
| 1600 | + e.doCheckAll(); | ||
| 1546 | 1601 | ||
| 1547 | - //--活动的限购是不是要判断-- | ||
| 1548 | - if (t.goods_num + promgoodsbuynum > false_data.buy_limit && false_data.buy_limit > 0) { | ||
| 1549 | - wx.showModal({ | ||
| 1550 | - title: '提示', | ||
| 1551 | - content: '购买数量超出秒杀限购' | ||
| 1552 | - }); | ||
| 1553 | - var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; | ||
| 1554 | - e.setData({ | ||
| 1555 | - [txt]: false_data.false_data.buy_limit | ||
| 1556 | - }); | ||
| 1557 | - e.doCheckAll(); | ||
| 1558 | - | ||
| 1559 | - t.goods_num=false_data.false_data.buy_limit; | ||
| 1560 | - e.update_cart(t, pitem, item); | ||
| 1561 | - return false; | ||
| 1562 | - } | ||
| 1563 | - e.update_cart(t, pitem, item); | 1602 | + t.goods_num=false_data.redisnum; |
| 1603 | + e.update_cart(t, pitem, item); | ||
| 1604 | + return false; | ||
| 1605 | + } | ||
| 1564 | 1606 | ||
| 1565 | - }else{ | ||
| 1566 | - //--- 看一下是不是线下库存 --- | ||
| 1567 | - if(th.data.sales_rules==2){ | ||
| 1568 | - th.check_down_line(t, pitem, item,wareIds); | ||
| 1569 | - }else{ | ||
| 1570 | - if (t.goods_num > store_count) { | 1607 | + //--活动的限购是不是要判断-- |
| 1608 | + if (t.goods_num + promgoodsbuynum > false_data.buy_limit && false_data.buy_limit > 0) { | ||
| 1571 | wx.showModal({ | 1609 | wx.showModal({ |
| 1572 | title: '提示', | 1610 | title: '提示', |
| 1573 | - content: '购买数量超出商品库存' | 1611 | + content: '购买数量超出秒杀限购' |
| 1574 | }); | 1612 | }); |
| 1575 | var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; | 1613 | var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; |
| 1576 | e.setData({ | 1614 | e.setData({ |
| 1577 | - [txt]: store_count | 1615 | + [txt]: false_data.buy_limit |
| 1578 | }); | 1616 | }); |
| 1579 | e.doCheckAll(); | 1617 | e.doCheckAll(); |
| 1618 | + t.goods_num=(false_data.buy_limit-promgoodsbuynum)?false_data.buy_limit-promgoodsbuynum:0; | ||
| 1619 | + e.update_cart(t, pitem, item); | ||
| 1580 | return false; | 1620 | return false; |
| 1581 | } | 1621 | } |
| 1582 | e.update_cart(t, pitem, item); | 1622 | e.update_cart(t, pitem, item); |
| 1623 | + | ||
| 1624 | + }else{ | ||
| 1625 | + normal_check(store_count,goodsinfo,wareIds); | ||
| 1583 | } | 1626 | } |
| 1584 | } | 1627 | } |
| 1628 | + }) | ||
| 1629 | + break; | ||
| 1630 | + case 2: | ||
| 1631 | + getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + goodsinfo.goods_id + "/" + goodsinfo.prom_id, { | ||
| 1632 | + }).then(res => { | ||
| 1633 | + if(res.data.code==0 && res.data.data){ | ||
| 1634 | + if (t.goods_num > store_count) { | ||
| 1635 | + wx.showModal({ | ||
| 1636 | + title: '提示', | ||
| 1637 | + content: '购买数量超出商品库存' | ||
| 1638 | + }); | ||
| 1639 | + var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; | ||
| 1640 | + e.setData({ | ||
| 1641 | + [txt]: store_count | ||
| 1642 | + }); | ||
| 1643 | + e.doCheckAll(); | ||
| 1644 | + | ||
| 1645 | + t.goods_num=store_count; | ||
| 1646 | + e.update_cart(t, pitem, item); | ||
| 1647 | + | ||
| 1648 | + return false; | ||
| 1649 | + } | ||
| 1650 | + | ||
| 1651 | + var gr_data = res.data.data; | ||
| 1652 | + //--判断库存-- | ||
| 1653 | + if (t.goods_num > gr_data.goods_num - gr_data.buy_num) { | ||
| 1654 | + wx.showModal({ | ||
| 1655 | + title: '提示', | ||
| 1656 | + content: '购买数量超出活动库存' | ||
| 1657 | + }); | ||
| 1658 | + var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; | ||
| 1659 | + e.setData({ | ||
| 1660 | + [txt]: gr_data.goods_num - gr_data.buy_num | ||
| 1661 | + }); | ||
| 1662 | + e.doCheckAll(); | ||
| 1663 | + | ||
| 1664 | + t.goods_num=gr_data.goods_num - gr_data.buy_num; | ||
| 1665 | + e.update_cart(t, pitem, item); | ||
| 1666 | + | ||
| 1667 | + return false; | ||
| 1668 | + } | ||
| 1669 | + | ||
| 1670 | + //--判断redis数量是否已经超出-- | ||
| 1671 | + if (t.goods_num > gr_data.redisnum) { | ||
| 1672 | + wx.showModal({ | ||
| 1673 | + title: '提示', | ||
| 1674 | + content: '购买数量超出商品库存' | ||
| 1675 | + }); | ||
| 1676 | + var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; | ||
| 1677 | + e.setData({ | ||
| 1678 | + [txt]: gr_data.redisnum | ||
| 1679 | + }); | ||
| 1680 | + e.doCheckAll(); | ||
| 1681 | + | ||
| 1682 | + t.goods_num=gr_data.redisnum; | ||
| 1683 | + e.update_cart(t, pitem, item); | ||
| 1684 | + return false; | ||
| 1685 | + } | ||
| 1686 | + | ||
| 1687 | + //--活动的限购是不是要判断-- | ||
| 1688 | + if (t.goods_num + promgoodsbuynum > gr_data.buy_limit && gr_data.buy_limit > 0) { | ||
| 1689 | + wx.showModal({ | ||
| 1690 | + title: '提示', | ||
| 1691 | + content: '购买数量超出团购限购' | ||
| 1692 | + }); | ||
| 1693 | + var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; | ||
| 1694 | + e.setData({ | ||
| 1695 | + [txt]: gr_data.buy_limit | ||
| 1696 | + }); | ||
| 1697 | + e.doCheckAll(); | ||
| 1698 | + | ||
| 1699 | + t.goods_num=(gr_data.buy_limit-promgoodsbuynum)?gr_data.buy_limit-promgoodsbuynum:0; | ||
| 1700 | + e.update_cart(t, pitem, item); | ||
| 1701 | + return false; | ||
| 1702 | + } | ||
| 1703 | + e.update_cart(t, pitem, item); | ||
| 1704 | + | ||
| 1705 | + }else{ | ||
| 1706 | + normal_check(store_count,goodsinfo,wareIds); | ||
| 1707 | + } | ||
| 1708 | + }) | ||
| 1585 | 1709 | ||
| 1586 | - } | ||
| 1587 | - }) | ||
| 1588 | - } else { | ||
| 1589 | - //--- 看一下是不是线下库存 --- | ||
| 1590 | - if(th.data.sales_rules==2 && goodsinfo.prom_type!=7){ | ||
| 1591 | - th.check_down_line(t, pitem, item,wareIds); | ||
| 1592 | - }else{ | ||
| 1593 | - if (t.goods_num > store_count) { | ||
| 1594 | - wx.showModal({ | ||
| 1595 | - title: '提示', | ||
| 1596 | - content: '购买数量超出商品库存' | ||
| 1597 | - }); | ||
| 1598 | - var txt = "requestData[" + pitem + "].goods[" + item + "].goods_num"; | ||
| 1599 | - e.setData({ | ||
| 1600 | - [txt]: store_count | ||
| 1601 | - }); | ||
| 1602 | - e.doCheckAll(); | ||
| 1603 | - t.goods_num=store_count; | ||
| 1604 | - } | ||
| 1605 | - e.update_cart(t, pitem, item); | ||
| 1606 | - } | ||
| 1607 | - } | 1710 | + break; |
| 1711 | + default: | ||
| 1712 | + normal_check(store_count,goodsinfo,wareIds); | ||
| 1713 | + break | ||
| 1714 | + } | ||
| 1608 | } | 1715 | } |
| 1609 | }); | 1716 | }); |
| 1610 | }, | 1717 | }, |
| @@ -1733,8 +1840,6 @@ Page({ | @@ -1733,8 +1840,6 @@ Page({ | ||
| 1733 | }, | 1840 | }, |
| 1734 | 1841 | ||
| 1735 | 1842 | ||
| 1736 | - | ||
| 1737 | - | ||
| 1738 | //-------下拉刷新--------- | 1843 | //-------下拉刷新--------- |
| 1739 | onPullDownRefresh: function(t) { | 1844 | onPullDownRefresh: function(t) { |
| 1740 | this.getCardList(); | 1845 | this.getCardList(); |
| @@ -1749,7 +1854,6 @@ Page({ | @@ -1749,7 +1854,6 @@ Page({ | ||
| 1749 | title:"计算中" | 1854 | title:"计算中" |
| 1750 | }) | 1855 | }) |
| 1751 | } | 1856 | } |
| 1752 | - | ||
| 1753 | var garr=this.data.requestData; | 1857 | var garr=this.data.requestData; |
| 1754 | var check_is_goods_selected=0; | 1858 | var check_is_goods_selected=0; |
| 1755 | if(garr) { | 1859 | if(garr) { |
| @@ -1779,9 +1883,10 @@ Page({ | @@ -1779,9 +1883,10 @@ Page({ | ||
| 1779 | for (var j = 0; j < i_arr.length; j++) { | 1883 | for (var j = 0; j < i_arr.length; j++) { |
| 1780 | if (i_arr[j].selected && i_arr[j].is_gift != 1) { | 1884 | if (i_arr[j].selected && i_arr[j].is_gift != 1) { |
| 1781 | 1885 | ||
| 1782 | - if (i_arr[j].is_pd_normal) { | 1886 | + if (i_arr[j].is_pd_normal || i_arr[j].prom_type==0 || i_arr[j].prom_type==3) { |
| 1783 | normal_arr[i_arr[j].goods_id] = 1; | 1887 | normal_arr[i_arr[j].goods_id] = 1; |
| 1784 | } | 1888 | } |
| 1889 | + | ||
| 1785 | //map 的key是不会重复，会覆盖，， | 1890 | //map 的key是不会重复，会覆盖，， |
| 1786 | var ie = { | 1891 | var ie = { |
| 1787 | goods_id: i_arr[j].goods_id, | 1892 | goods_id: i_arr[j].goods_id, |
| @@ -1886,6 +1991,7 @@ Page({ | @@ -1886,6 +1991,7 @@ Page({ | ||
| 1886 | 1991 | ||
| 1887 | var promgoodsbuynum = 0; | 1992 | var promgoodsbuynum = 0; |
| 1888 | var goodsbuynum = 0; | 1993 | var goodsbuynum = 0; |
| 1994 | + | ||
| 1889 | //--要获得商品，该用户买了多少件,同步应用-- | 1995 | //--要获得商品，该用户买了多少件,同步应用-- |
| 1890 | await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", { | 1996 | await getApp().request.promiseGet("/api/weshop/ordergoods/getUserBuyGoodsNum", { |
| 1891 | data: { | 1997 | data: { |
| @@ -1935,7 +2041,6 @@ Page({ | @@ -1935,7 +2041,6 @@ Page({ | ||
| 1935 | return false; | 2041 | return false; |
| 1936 | } | 2042 | } |
| 1937 | } | 2043 | } |
| 1938 | - | ||
| 1939 | if (num > val.redisnum && val.redisnum && !normal_arr[val.goods_id]) { | 2044 | if (num > val.redisnum && val.redisnum && !normal_arr[val.goods_id]) { |
| 1940 | isok = 0; | 2045 | isok = 0; |
| 1941 | gname = val.goods_name; | 2046 | gname = val.goods_name; |
pages/cart/cart2/cart2.js
| @@ -983,6 +983,7 @@ Page({ | @@ -983,6 +983,7 @@ Page({ | ||
| 983 | //t.data.data.shop_price = tt.data.data.prom_price; | 983 | //t.data.data.shop_price = tt.data.data.prom_price; |
| 984 | t.data.data.shop_price = tt.data.data.prom_user_price; | 984 | t.data.data.shop_price = tt.data.data.prom_user_price; |
| 985 | th.data.ckeck_quan_price=0; | 985 | th.data.ckeck_quan_price=0; |
| 986 | + gd.is_xz_yh=1; | ||
| 986 | } else { | 987 | } else { |
| 987 | t.data.data.prom_id = 0; | 988 | t.data.data.prom_id = 0; |
| 988 | t.data.data.prom_type = 0; | 989 | t.data.data.prom_type = 0; |
| @@ -1022,9 +1023,13 @@ Page({ | @@ -1022,9 +1023,13 @@ Page({ | ||
| 1022 | t.data.data.prom_type = 0; | 1023 | t.data.data.prom_type = 0; |
| 1023 | } | 1024 | } |
| 1024 | 1025 | ||
| 1025 | - th.data.ckeck_quan_price = t.data.data.shop_price * gg.goods_num; | ||
| 1026 | - th.data.check_quan_price_list = t.data.data.shop_price * gg.goods_num + ""; | ||
| 1027 | - th.data.check_quan_ware_list = t.data.data.erpwareid + ""; | 1026 | + if(tt.data.data.isQuan){ |
| 1027 | + th.data.ckeck_quan_price = t.data.data.shop_price * gg.goods_num; | ||
| 1028 | + th.data.check_quan_price_list = t.data.data.shop_price * gg.goods_num + ""; | ||
| 1029 | + th.data.check_quan_ware_list = t.data.data.erpwareid + ""; | ||
| 1030 | + }else{ | ||
| 1031 | + gd.is_xz_yh=1; | ||
| 1032 | + } | ||
| 1028 | 1033 | ||
| 1029 | th.setData({ | 1034 | th.setData({ |
| 1030 | bn_goods: gd, | 1035 | bn_goods: gd, |
| @@ -1420,7 +1425,7 @@ Page({ | @@ -1420,7 +1425,7 @@ Page({ | ||
| 1420 | } | 1425 | } |
| 1421 | 1426 | ||
| 1422 | //--如果是物流，且选择了地址，就要开始显示包邮券，且包邮券也已经优惠了优惠活动的金额-- | 1427 | //--如果是物流，且选择了地址，就要开始显示包邮券，且包邮券也已经优惠了优惠活动的金额-- |
| 1423 | - if (cart_item.exp_type == 0 && th.data.user_addr != null) { | 1428 | + if (cart_item.exp_type == 0 && th.data.user_addr != null && !cart_item.is_xz_yh) { |
| 1424 | //看是不是有调用过包邮券 | 1429 | //看是不是有调用过包邮券 |
| 1425 | if (!th.data.isget_by_quan[pickid]) { | 1430 | if (!th.data.isget_by_quan[pickid]) { |
| 1426 | //--判断要不要显示包邮券,调用接口，因为有for循环--- | 1431 | //--判断要不要显示包邮券,调用接口，因为有for循环--- |
| @@ -1428,7 +1433,8 @@ Page({ | @@ -1428,7 +1433,8 @@ Page({ | ||
| 1428 | data: { | 1433 | data: { |
| 1429 | store_id: os.stoid, | 1434 | store_id: os.stoid, |
| 1430 | isuse: 0, | 1435 | isuse: 0, |
| 1431 | - condition: q_conditin, | 1436 | + //condition: q_conditin, |
| 1437 | + condition:cart_item.ckeck_quan_price, | ||
| 1432 | user_id: getApp().globalData.user_id, | 1438 | user_id: getApp().globalData.user_id, |
| 1433 | pageSize: 2000 | 1439 | pageSize: 2000 |
| 1434 | } | 1440 | } |
| @@ -1453,10 +1459,10 @@ Page({ | @@ -1453,10 +1459,10 @@ Page({ | ||
| 1453 | } | 1459 | } |
| 1454 | if (arr) { | 1460 | if (arr) { |
| 1455 | th.data.get_by_quan_list_cart[pickid] = arr; | 1461 | th.data.get_by_quan_list_cart[pickid] = arr; |
| 1456 | - //th.setData({get_by_quan_list_cart:th.data.get_by_quan_list_cart}); | ||
| 1457 | - if (th.data.is_b_now) { | ||
| 1458 | - th.setData({get_by_quan_list: arr}); | ||
| 1459 | - } | 1462 | + th.setData({get_by_quan_list_cart:th.data.get_by_quan_list_cart}); |
| 1463 | + //if (th.data.is_b_now) { | ||
| 1464 | + // th.setData({get_by_quan_list: arr}); | ||
| 1465 | + //} | ||
| 1460 | } | 1466 | } |
| 1461 | th.data.isget_by_quan[pickid] = 1; | 1467 | th.data.isget_by_quan[pickid] = 1; |
| 1462 | } | 1468 | } |
| @@ -3428,6 +3434,19 @@ Page({ | @@ -3428,6 +3434,19 @@ Page({ | ||
| 3428 | if (gd.prom_type == 1 || gd.is_gift || gd.prom_type == 7) { | 3434 | if (gd.prom_type == 1 || gd.is_gift || gd.prom_type == 7) { |
| 3429 | continue; | 3435 | continue; |
| 3430 | } | 3436 | } |
| 3437 | + | ||
| 3438 | + //--如果是团购，要判断有没有限制使用优惠券 | ||
| 3439 | + if(gd.prom_type == 2){ | ||
| 3440 | + var prom1=null; | ||
| 3441 | + await getApp().request.promiseGet("/api/weshop/goods/groupBuy/getActInfo/" + os.stoid + "/" + gd.goods_id + "/" + gd.prom_id, { | ||
| 3442 | + }).then(res => { | ||
| 3443 | + if (res.data.code == 0) prom1 = res.data.data; | ||
| 3444 | + }) | ||
| 3445 | + if(!prom1.isQuan){ | ||
| 3446 | + continue; | ||
| 3447 | + } | ||
| 3448 | + } | ||
| 3449 | + | ||
| 3431 | //如果有限制使用优惠券，就要返回 | 3450 | //如果有限制使用优惠券，就要返回 |
| 3432 | if (gd.prom_type == 3) { | 3451 | if (gd.prom_type == 3) { |
| 3433 | if (th.data.prom_goods_map[pickup_id][gd.prom_id].is_xz_yh) continue; | 3452 | if (th.data.prom_goods_map[pickup_id][gd.prom_id].is_xz_yh) continue; |
| @@ -3466,6 +3485,7 @@ Page({ | @@ -3466,6 +3485,7 @@ Page({ | ||
| 3466 | arr[ind].ckeck_quan_price = ckeck_quan_price - cut_price; | 3485 | arr[ind].ckeck_quan_price = ckeck_quan_price - cut_price; |
| 3467 | arr[ind].check_quan_ware_list = check_quan_ware_list; | 3486 | arr[ind].check_quan_ware_list = check_quan_ware_list; |
| 3468 | arr[ind].check_quan_price_list = check_quan_price_list; | 3487 | arr[ind].check_quan_price_list = check_quan_price_list; |
| 3488 | + arr[ind].is_xz_yh = is_xz_yh; | ||
| 3469 | 3489 | ||
| 3470 | //是否关闭使用优惠券 | 3490 | //是否关闭使用优惠券 |
| 3471 | if (th.data.is_close_quan != 1 && !is_xz_yh) { | 3491 | if (th.data.is_close_quan != 1 && !is_xz_yh) { |
| @@ -3475,7 +3495,7 @@ Page({ | @@ -3475,7 +3495,7 @@ Page({ | ||
| 3475 | data: { | 3495 | data: { |
| 3476 | storeId: oo.stoid, | 3496 | storeId: oo.stoid, |
| 3477 | userId: app.globalData.user_id, | 3497 | userId: app.globalData.user_id, |
| 3478 | - BuySum: ckeck_quan_price, | 3498 | + BuySum: arr[ind].ckeck_quan_price, |
| 3479 | WareIds: check_quan_ware_list, | 3499 | WareIds: check_quan_ware_list, |
| 3480 | pageSize: 100 | 3500 | pageSize: 100 |
| 3481 | } | 3501 | } |
pages/giftpack/buygiftpack/giftpackbuy.js
| @@ -296,5 +296,31 @@ Page({ | @@ -296,5 +296,31 @@ Page({ | ||
| 296 | var th = this; | 296 | var th = this; |
| 297 | var url = e.currentTarget.dataset.url; | 297 | var url = e.currentTarget.dataset.url; |
| 298 | getApp().goto(url); | 298 | getApp().goto(url); |
| 299 | - } | 299 | + }, |
| 300 | + | ||
| 301 | + onShareAppMessage: function (e) { | ||
| 302 | + var curPage=this; | ||
| 303 | + var pagePath = curPage.route; //当前页面url | ||
| 304 | + if (pagePath.indexOf('/') != 0) { | ||
| 305 | + pagePath = '/' + pagePath; | ||
| 306 | + } | ||
| 307 | + return { | ||
| 308 | + title: "专享礼包", | ||
| 309 | + path:pagePath, | ||
| 310 | + } | ||
| 311 | + }, | ||
| 312 | + | ||
| 313 | + onShareTimeline() { | ||
| 314 | + var curPage=this; | ||
| 315 | + var pagePath = curPage.route; //当前页面url | ||
| 316 | + if (pagePath.indexOf('/') != 0) { | ||
| 317 | + pagePath = '/' + pagePath; | ||
| 318 | + } | ||
| 319 | + return { | ||
| 320 | + title: '专享礼包', | ||
| 321 | + imageUrl: this.data.ad_data.ad_code, | ||
| 322 | + path: pagePath, | ||
| 323 | + } | ||
| 324 | + }, | ||
| 325 | + | ||
| 300 | }) | 326 | }) |
| 301 | \ No newline at end of file | 327 | \ No newline at end of file |
pages/goods/goodsInfo/goodsInfo.js
| @@ -469,7 +469,7 @@ Page({ | @@ -469,7 +469,7 @@ Page({ | ||
| 469 | } else { | 469 | } else { |
| 470 | //要用接口是获取距离，js的计算不准 | 470 | //要用接口是获取距离，js的计算不准 |
| 471 | getApp().request.promiseGet("/api/weshop/pickup/list", { | 471 | getApp().request.promiseGet("/api/weshop/pickup/list", { |
| 472 | - data: { store_id: os.stoid, pickup_id: e.pickup_id, lat: th.data.lat, lon: th.data.lon }, | 472 | + data: { store_id: os.stoid, pickup_id: e.pickup_id, lat: th.data.lat, lon: th.data.lon,isstop:0,is_pos:1 }, |
| 473 | }).then(res => { | 473 | }).then(res => { |
| 474 | if (res.data.code == 0) { | 474 | if (res.data.code == 0) { |
| 475 | e = res.data.data.pageData[0]; | 475 | e = res.data.data.pageData[0]; |
| @@ -798,9 +798,14 @@ Page({ | @@ -798,9 +798,14 @@ Page({ | ||
| 798 | }); | 798 | }); |
| 799 | } | 799 | } |
| 800 | 800 | ||
| 801 | - //-- 把商品的赋值 -- | 801 | + //-- 把商品的赋值,同时给活动赋值 -- |
| 802 | ee.data.fir_goods = JSON.parse(JSON.stringify(t.data.data)); | 802 | ee.data.fir_goods = JSON.parse(JSON.stringify(t.data.data)); |
| 803 | - if(ee.data.prom_type!=1 && ee.data.prom_type!=4 && ee.data.prom_type!=6 && ee.data.prom_type!=2) | 803 | + if(t.data.data.prom_type && t.data.data.prom_id){ |
| 804 | + ee.data.prom_type=t.data.data.prom_type; | ||
| 805 | + ee.data.prom_id=t.data.data.prom_id; | ||
| 806 | + } | ||
| 807 | + | ||
| 808 | + if(ee.data.prom_type!=1 && ee.data.prom_type!=4 && ee.data.prom_type!=6 && ee.data.prom_type!=2) | ||
| 804 | ee.check_is_youhui(ee.data.gid); | 809 | ee.check_is_youhui(ee.data.gid); |
| 805 | 810 | ||
| 806 | t.data.data.on_time = ut.formatTime(t.data.data.on_time, 'yyyy-MM-dd hh:mm:ss'); | 811 | t.data.data.on_time = ut.formatTime(t.data.data.on_time, 'yyyy-MM-dd hh:mm:ss'); |
| @@ -2252,16 +2257,10 @@ Page({ | @@ -2252,16 +2257,10 @@ Page({ | ||
| 2252 | if (res.data.code == 0) prom = res.data.data; | 2257 | if (res.data.code == 0) prom = res.data.data; |
| 2253 | }) | 2258 | }) |
| 2254 | break | 2259 | break |
| 2255 | - | ||
| 2256 | case 8: | 2260 | case 8: |
| 2257 | continue; | 2261 | continue; |
| 2258 | - | ||
| 2259 | - case 8: | ||
| 2260 | - continue; | ||
| 2261 | - | ||
| 2262 | } | 2262 | } |
| 2263 | 2263 | ||
| 2264 | - | ||
| 2265 | } | 2264 | } |
| 2266 | //---如果有活动，不算在一起--- | 2265 | //---如果有活动，不算在一起--- |
| 2267 | if (prom) { | 2266 | if (prom) { |
| @@ -2498,12 +2497,14 @@ Page({ | @@ -2498,12 +2497,14 @@ Page({ | ||
| 2498 | store_id: o.stoid, | 2497 | store_id: o.stoid, |
| 2499 | distr_type: g_distr_type, | 2498 | distr_type: g_distr_type, |
| 2500 | isstop: 0, | 2499 | isstop: 0, |
| 2500 | + is_pos:1, | ||
| 2501 | pageSize: 2000 | 2501 | pageSize: 2000 |
| 2502 | } | 2502 | } |
| 2503 | } else { | 2503 | } else { |
| 2504 | dd = { | 2504 | dd = { |
| 2505 | store_id: o.stoid, | 2505 | store_id: o.stoid, |
| 2506 | isstop: 0, | 2506 | isstop: 0, |
| 2507 | + is_pos:1, | ||
| 2507 | pageSize: 2000 | 2508 | pageSize: 2000 |
| 2508 | } | 2509 | } |
| 2509 | } | 2510 | } |
| @@ -3023,44 +3024,24 @@ Page({ | @@ -3023,44 +3024,24 @@ Page({ | ||
| 3023 | getApp().request.get("/api/weshop/goods/groupBuy/getActInfo/" +os.stoid + "/" +gid+"/"+ prom_id, { | 3024 | getApp().request.get("/api/weshop/goods/groupBuy/getActInfo/" +os.stoid + "/" +gid+"/"+ prom_id, { |
| 3024 | success: function (t) { | 3025 | success: function (t) { |
| 3025 | if (t.data.code != 0) { | 3026 | if (t.data.code != 0) { |
| 3026 | - ee.setData({ | ||
| 3027 | - prom_type: 0, | ||
| 3028 | - isshow: 1, | ||
| 3029 | - }); | ||
| 3030 | - ee.get_sku(os.stoid, ee.data.data, gid); | ||
| 3031 | - ee.get_sto(); | 3027 | + ee.get_normal(gid); |
| 3032 | return false; | 3028 | return false; |
| 3033 | } | 3029 | } |
| 3034 | //----已经结束----- | 3030 | //----已经结束----- |
| 3035 | if (t.data.data.is_end == 1) { | 3031 | if (t.data.data.is_end == 1) { |
| 3036 | - ee.setData({ | ||
| 3037 | - prom_type: 0, | ||
| 3038 | - isshow: 1, | ||
| 3039 | - }); | ||
| 3040 | - ee.get_sku(os.stoid, ee.data.data, gid); | ||
| 3041 | - ee.get_sto(); | 3032 | + ee.get_normal(gid); |
| 3042 | return false; | 3033 | return false; |
| 3043 | } | 3034 | } |
| 3044 | //----已经过期----- | 3035 | //----已经过期----- |
| 3045 | var now = ut.gettimestamp(); | 3036 | var now = ut.gettimestamp(); |
| 3046 | if (t.data.data.end_time < now || t.data.data.start_time>now) { | 3037 | if (t.data.data.end_time < now || t.data.data.start_time>now) { |
| 3047 | - ee.setData({ | ||
| 3048 | - prom_type: 0, | ||
| 3049 | - isshow: 1, | ||
| 3050 | - }); | ||
| 3051 | - ee.get_sku(os.stoid, ee.data.data, gid); | ||
| 3052 | - ee.get_sto(); | 3038 | + ee.get_normal(gid); |
| 3053 | return false; | 3039 | return false; |
| 3054 | } | 3040 | } |
| 3055 | 3041 | ||
| 3056 | /*-- 还没有开始预热的也不显示 --*/ | 3042 | /*-- 还没有开始预热的也不显示 --*/ |
| 3057 | if (t.data.data.show_time > now) { | 3043 | if (t.data.data.show_time > now) { |
| 3058 | - ee.setData({ | ||
| 3059 | - prom_type: 0, | ||
| 3060 | - isshow: 1, | ||
| 3061 | - }); | ||
| 3062 | - ee.get_sku(os.stoid, ee.data.data, gid); | ||
| 3063 | - ee.get_sto(); | 3044 | + ee.get_normal(gid); |
| 3064 | return false; | 3045 | return false; |
| 3065 | } | 3046 | } |
| 3066 | 3047 | ||
| @@ -3135,43 +3116,23 @@ Page({ | @@ -3135,43 +3116,23 @@ Page({ | ||
| 3135 | getApp().request.get("/api/ms/flash_sale/getNew/" +os.stoid + "/" +user_id+"/"+ prom_id, { | 3116 | getApp().request.get("/api/ms/flash_sale/getNew/" +os.stoid + "/" +user_id+"/"+ prom_id, { |
| 3136 | success: function (t) { | 3117 | success: function (t) { |
| 3137 | if (t.data.code != 0) { | 3118 | if (t.data.code != 0) { |
| 3138 | - ee.setData({ | ||
| 3139 | - prom_type: 0, | ||
| 3140 | - isshow: 1, | ||
| 3141 | - }); | ||
| 3142 | - ee.get_sku(os.stoid, ee.data.data, gid); | ||
| 3143 | - ee.get_sto(); | 3119 | + ee.get_normal(gid); |
| 3144 | return false; | 3120 | return false; |
| 3145 | } | 3121 | } |
| 3146 | //----已经结束----- | 3122 | //----已经结束----- |
| 3147 | if (t.data.data.is_end == 1) { | 3123 | if (t.data.data.is_end == 1) { |
| 3148 | - ee.setData({ | ||
| 3149 | - prom_type: 0, | ||
| 3150 | - isshow: 1, | ||
| 3151 | - }); | ||
| 3152 | - ee.get_sku(os.stoid, ee.data.data, gid); | ||
| 3153 | - ee.get_sto(); | 3124 | + ee.get_normal(gid); |
| 3154 | return false; | 3125 | return false; |
| 3155 | } | 3126 | } |
| 3156 | //----已经过期----- | 3127 | //----已经过期----- |
| 3157 | var now = ut.gettimestamp(); | 3128 | var now = ut.gettimestamp(); |
| 3158 | if (t.data.data.end_time < now) { | 3129 | if (t.data.data.end_time < now) { |
| 3159 | - ee.setData({ | ||
| 3160 | - prom_type: 0, | ||
| 3161 | - isshow: 1, | ||
| 3162 | - }); | ||
| 3163 | - ee.get_sku(os.stoid, ee.data.data, gid); | ||
| 3164 | - ee.get_sto(); | 3130 | + ee.get_normal(gid); |
| 3165 | return false; | 3131 | return false; |
| 3166 | } | 3132 | } |
| 3167 | /*-- 还没有开始预热的也不显示 --*/ | 3133 | /*-- 还没有开始预热的也不显示 --*/ |
| 3168 | if (t.data.data.show_time > now) { | 3134 | if (t.data.data.show_time > now) { |
| 3169 | - ee.setData({ | ||
| 3170 | - prom_type: 0, | ||
| 3171 | - isshow: 1, | ||
| 3172 | - }); | ||
| 3173 | - ee.get_sku(os.stoid, ee.data.data, gid); | ||
| 3174 | - ee.get_sto(); | 3135 | + ee.get_normal(gid); |
| 3175 | return false; | 3136 | return false; |
| 3176 | } | 3137 | } |
| 3177 | 3138 | ||
| @@ -3304,9 +3265,7 @@ Page({ | @@ -3304,9 +3265,7 @@ Page({ | ||
| 3304 | ee.get_sto(); | 3265 | ee.get_sto(); |
| 3305 | 3266 | ||
| 3306 | } else { | 3267 | } else { |
| 3307 | - ee.setData({ prom_type: 0, isshow: 1, }); | ||
| 3308 | - ee.get_sku(os.stoid, ee.data.data, gid); | ||
| 3309 | - ee.get_sto(); | 3268 | + ee.get_normal(gid); |
| 3310 | return false; | 3269 | return false; |
| 3311 | } | 3270 | } |
| 3312 | }) | 3271 | }) |
| @@ -3331,44 +3290,25 @@ Page({ | @@ -3331,44 +3290,25 @@ Page({ | ||
| 3331 | success: function (t) { | 3290 | success: function (t) { |
| 3332 | console.log(t,3124); | 3291 | console.log(t,3124); |
| 3333 | if (t.data.code != 0) { | 3292 | if (t.data.code != 0) { |
| 3334 | - ee.setData({ | ||
| 3335 | - prom_type: 0, | ||
| 3336 | - isshow: 1, | ||
| 3337 | - }); | ||
| 3338 | - ee.get_sku(os.stoid, ee.data.data, gid); | ||
| 3339 | - ee.get_sto(); | ||
| 3340 | - return false; | 3293 | + ee.get_normal(gid); |
| 3294 | + return false; | ||
| 3341 | } | 3295 | } |
| 3342 | //----已经结束----- | 3296 | //----已经结束----- |
| 3343 | if (t.data.data.is_end == 1) { | 3297 | if (t.data.data.is_end == 1) { |
| 3344 | - ee.setData({ | ||
| 3345 | - prom_type: 0, | ||
| 3346 | - isshow: 1, | ||
| 3347 | - }); | ||
| 3348 | - ee.get_sku(os.stoid, ee.data.data, gid); | ||
| 3349 | - return false; | 3298 | + ee.get_normal(gid); |
| 3299 | + return false; | ||
| 3350 | } | 3300 | } |
| 3351 | //----已经过期----- | 3301 | //----已经过期----- |
| 3352 | var now = ut.gettimestamp(); | 3302 | var now = ut.gettimestamp(); |
| 3353 | if (t.data.data.end_time < now) { | 3303 | if (t.data.data.end_time < now) { |
| 3354 | - ee.setData({ | ||
| 3355 | - prom_type: 0, | ||
| 3356 | - isshow: 1, | ||
| 3357 | - }); | ||
| 3358 | - ee.get_sku(os.stoid, ee.data.data, gid); | ||
| 3359 | - ee.get_sto(); | ||
| 3360 | - return false; | 3304 | + ee.get_normal(gid); |
| 3305 | + return false; | ||
| 3361 | } | 3306 | } |
| 3362 | 3307 | ||
| 3363 | /*-- 还没有开始预热的也不显示 --*/ | 3308 | /*-- 还没有开始预热的也不显示 --*/ |
| 3364 | if (t.data.data.show_time > now) { | 3309 | if (t.data.data.show_time > now) { |
| 3365 | - ee.setData({ | ||
| 3366 | - prom_type: 0, | ||
| 3367 | - isshow: 1, | ||
| 3368 | - }); | ||
| 3369 | - ee.get_sku(os.stoid, ee.data.data, gid); | ||
| 3370 | - ee.get_sto(); | ||
| 3371 | - return false; | 3310 | + ee.get_normal(gid); |
| 3311 | + return false; | ||
| 3372 | } | 3312 | } |
| 3373 | 3313 | ||
| 3374 | /*-- 判断拼单是否启用 --*/ | 3314 | /*-- 判断拼单是否启用 --*/ |
| @@ -6055,9 +5995,21 @@ Page({ | @@ -6055,9 +5995,21 @@ Page({ | ||
| 6055 | corpId: id, | 5995 | corpId: id, |
| 6056 | success(res) {} | 5996 | success(res) {} |
| 6057 | }) | 5997 | }) |
| 5998 | + }, | ||
| 5999 | + | ||
| 6000 | + get_normal(gid){ | ||
| 6001 | + this.setData({ | ||
| 6002 | + prom_type: 0, | ||
| 6003 | + isshow: 1, | ||
| 6004 | + }); | ||
| 6005 | + this.get_sku(os.stoid, this.data.data, gid); | ||
| 6006 | + this.get_sto(); | ||
| 6007 | + this.check_is_youhui(gid,1); | ||
| 6008 | + this.data.is_normal=1; | ||
| 6058 | } | 6009 | } |
| 6059 | 6010 | ||
| 6060 | 6011 | ||
| 6061 | 6012 | ||
| 6062 | 6013 | ||
| 6014 | + | ||
| 6063 | }); | 6015 | }); |
pages/goods/goodsList/goodsList.js
| @@ -42,7 +42,9 @@ Page({ | @@ -42,7 +42,9 @@ Page({ | ||
| 42 | } | 42 | } |
| 43 | 43 | ||
| 44 | var th=this; | 44 | var th=this; |
| 45 | - a.init(this, "", "requestData"); | 45 | + |
| 46 | + //a.init(this, "", "requestData"); | ||
| 47 | + | ||
| 46 | var url = this.data.baseUrl; | 48 | var url = this.data.baseUrl; |
| 47 | this.data.is_new=t.is_new; | 49 | this.data.is_new=t.is_new; |
| 48 | this.data.is_hot=t.is_hot; | 50 | this.data.is_hot=t.is_hot; |
| @@ -171,10 +173,12 @@ Page({ | @@ -171,10 +173,12 @@ Page({ | ||
| 171 | } | 173 | } |
| 172 | this.resetData(), this.requestGoodsList(url); | 174 | this.resetData(), this.requestGoodsList(url); |
| 173 | }, | 175 | }, |
| 174 | - requestGoodsList: function(t) { | ||
| 175 | - var e = this; | 176 | + requestGoodsList:function(t) { |
| 177 | + if(this.data.loading) return false; | ||
| 178 | + this.data.loading=1; | ||
| 179 | + var e = this,th=e; | ||
| 176 | this.data.requestUrl = t; | 180 | this.data.requestUrl = t; |
| 177 | - | 181 | + |
| 178 | //不是商品分组的，不是默认排序的 | 182 | //不是商品分组的，不是默认排序的 |
| 179 | if(t.indexOf("group_id")==-1 || e.data.tabname!="sort" ){ | 183 | if(t.indexOf("group_id")==-1 || e.data.tabname!="sort" ){ |
| 180 | t += "&orderField=" + e.data.tabname; | 184 | t += "&orderField=" + e.data.tabname; |
| @@ -182,14 +186,94 @@ Page({ | @@ -182,14 +186,94 @@ Page({ | ||
| 182 | } | 186 | } |
| 183 | 187 | ||
| 184 | t +="&page=" + e.data.currentPage; | 188 | t +="&page=" + e.data.currentPage; |
| 185 | - a.request(t, | ||
| 186 | - function(t) { | ||
| 187 | - e.setData({is_go:1}); | ||
| 188 | - e.data.currentPage++, null == e.data.allData && (e.data.allData = Object.assign({}, t.data.result)), | ||
| 189 | - wx.stopPullDownRefresh(); | ||
| 190 | - }, | ||
| 191 | - null, { is_mainshow: 1, isonsale: 1, store_id: oo.stoid} | ||
| 192 | - ); | 189 | + getApp().request.promiseGet(t, {data:{is_mainshow: 1, isonsale: 1, store_id: oo.stoid}}).then(async res=>{ |
| 190 | + th.data.loading=0; | ||
| 191 | + e.setData({is_go:1}); | ||
| 192 | + if(ut.ajax_ok(res)){ | ||
| 193 | + e.data.currentPage++; | ||
| 194 | + if(!e.data.requestData) e.data.requestData=[]; | ||
| 195 | + for(let i in res.data.data.pageData){ | ||
| 196 | + let item=res.data.data.pageData[i]; | ||
| 197 | + item.original_img = th.data.url + item.original_img; | ||
| 198 | + | ||
| 199 | + var url="/api/weshop/activitylist/getGoodActInfo"; | ||
| 200 | + var req_data={ | ||
| 201 | + store_id:oo.stoid,goodsidlist:item.goods_id,is_detail:1 | ||
| 202 | + }; | ||
| 203 | + //获取商品的实际活动 | ||
| 204 | + await getApp().request.promiseGet(url, {data:req_data}).then(res=>{ | ||
| 205 | + if(res.data.code==0 && res.data.data && res.data.data.length==1){ | ||
| 206 | + item.prom_type=res.data.data[0].prom_type; | ||
| 207 | + item.prom_id=res.data.data[0].act_id; | ||
| 208 | + } | ||
| 209 | + }) | ||
| 210 | + | ||
| 211 | + var prom_type = item.prom_type; //0普通商品 1秒杀 6拼单 2团购 4积分购 | ||
| 212 | + var prom_id=item.prom_id; | ||
| 213 | + var now=ut.gettimestamp(); | ||
| 214 | + var url = ""; | ||
| 215 | + switch (prom_type){ | ||
| 216 | + case 1: | ||
| 217 | + var user_id=getApp().globalData.user_id; | ||
| 218 | + if(!user_id) user_id=0; | ||
| 219 | + url = "/api/ms/flash_sale/getNew/" +oo.stoid + "/" +user_id+"/"+ prom_id; | ||
| 220 | + break; | ||
| 221 | + case 2: | ||
| 222 | + url ="/api/weshop/goods/groupBuy/getActInfo/" +oo.stoid + "/" +item.goods_id+"/"+ prom_id | ||
| 223 | + break; | ||
| 224 | + case 4: | ||
| 225 | + url ="/api/weshop/integralbuy/get/"+oo.stoid +"/"+prom_id; | ||
| 226 | + break; | ||
| 227 | + case 6: | ||
| 228 | + url = "/api/weshop/teamlist/get/" + oo.stoid + "/" + prom_id; | ||
| 229 | + break; | ||
| 230 | + case 8: | ||
| 231 | + var presell_id = prom_id; | ||
| 232 | + var url1 = "/api/weshop/marketing/marketingPresellList/list"; | ||
| 233 | + var rd= { | ||
| 234 | + store_id: oo.stoid, | ||
| 235 | + presell_id: presell_id, | ||
| 236 | + goods_id: val.goods_id | ||
| 237 | + } | ||
| 238 | + //------获取预售从表---------- | ||
| 239 | + await getApp().request.promiseGet(url1, { | ||
| 240 | + data: rd | ||
| 241 | + }).then(res => { | ||
| 242 | + if (res.data.code == 0 && res.data.data && res.data.data.length > 0) { | ||
| 243 | + var arr = res.data.data[0]; | ||
| 244 | + item.prom_price = arr.luck_goods_price; | ||
| 245 | + item.sales_sum=arr.buy_goodnum+(arr.virtual_qty?arr.virtual_qty:0); | ||
| 246 | + } | ||
| 247 | + }) | ||
| 248 | + break; | ||
| 249 | + default: | ||
| 250 | + break | ||
| 251 | + } | ||
| 252 | + if(url!=null && url!=''){ | ||
| 253 | + await getApp().request.promiseGet(url, {}).then(res => { | ||
| 254 | + var prom =null; | ||
| 255 | + if(res && res.data) prom=res.data.data; | ||
| 256 | + if (prom != null && prom.is_end==0 && prom.end_time>now && (prom.start_time<now || (prom.show_time && prom.show_time<now)) ) { | ||
| 257 | + item.prom_price = res.data.data.price; | ||
| 258 | + if(res.data.data.user_price) item.prom_price=res.data.data.user_price; | ||
| 259 | + var vNum=res.data.data.virtual_num?res.data.data.virtual_num:0; | ||
| 260 | + var vNum1=res.data.data.virtualNum?res.data.data.virtualNum:0; | ||
| 261 | + var vNum2=res.data.data.virtual?res.data.data.virtual:0; | ||
| 262 | + item.sales_sum=res.data.data.buy_num+(vNum+vNum1+vNum2); | ||
| 263 | + }else{ | ||
| 264 | + item.prom_type=0; | ||
| 265 | + item.prom_id=0; | ||
| 266 | + item.prom_price=null; | ||
| 267 | + } | ||
| 268 | + }) | ||
| 269 | + } | ||
| 270 | + | ||
| 271 | + e.data.requestData.push(item); | ||
| 272 | + e.setData({requestData: e.data.requestData}) | ||
| 273 | + } | ||
| 274 | + } | ||
| 275 | + }) | ||
| 276 | + wx.stopPullDownRefresh(); | ||
| 193 | }, | 277 | }, |
| 194 | onReachBottom: function() { | 278 | onReachBottom: function() { |
| 195 | a.canloadMore() && this.requestGoodsList(this.data.requestUrl); | 279 | a.canloadMore() && this.requestGoodsList(this.data.requestUrl); |
pages/goods/goodsList/goodsList.wxml
| @@ -62,7 +62,7 @@ | @@ -62,7 +62,7 @@ | ||
| 62 | <view class="item-cont"> | 62 | <view class="item-cont"> |
| 63 | <view class="title ellipsis-2">{{item.goods_name}}</view> | 63 | <view class="title ellipsis-2">{{item.goods_name}}</view> |
| 64 | <!-- 判断是否有活动价 --> | 64 | <!-- 判断是否有活动价 --> |
| 65 | - <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2}}"> | 65 | + <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_id>0 }}"> |
| 66 | <view class="flex on"> | 66 | <view class="flex on"> |
| 67 | <!-- 活动价 --> | 67 | <!-- 活动价 --> |
| 68 | <view class="price"> | 68 | <view class="price"> |
pages/goods/search/search.js
| @@ -31,7 +31,6 @@ Page({ | @@ -31,7 +31,6 @@ Page({ | ||
| 31 | 31 | ||
| 32 | onLoad: function(t) { | 32 | onLoad: function(t) { |
| 33 | this.data.rq_data=t; | 33 | this.data.rq_data=t; |
| 34 | - | ||
| 35 | //接受有没有导购的参数 | 34 | //接受有没有导购的参数 |
| 36 | var first_leader=t.first_leader; | 35 | var first_leader=t.first_leader; |
| 37 | if(first_leader){ | 36 | if(first_leader){ |
| @@ -95,7 +94,7 @@ Page({ | @@ -95,7 +94,7 @@ Page({ | ||
| 95 | 94 | ||
| 96 | 95 | ||
| 97 | }) | 96 | }) |
| 98 | - e.init(this, "", "requestData"); | 97 | + //e.init(this, "", "requestData"); |
| 99 | var url = this.data.baseUrl; | 98 | var url = this.data.baseUrl; |
| 100 | 99 | ||
| 101 | //扫一扫过来，显示搜索的内容 | 100 | //扫一扫过来，显示搜索的内容 |
| @@ -112,9 +111,8 @@ Page({ | @@ -112,9 +111,8 @@ Page({ | ||
| 112 | 111 | ||
| 113 | if (url != this.data.baseUrl) return this.requestSearch(url); | 112 | if (url != this.data.baseUrl) return this.requestSearch(url); |
| 114 | this.openSearchModal(); | 113 | this.openSearchModal(); |
| 115 | - | ||
| 116 | - // 获取历史搜索记录 | ||
| 117 | - this.getHistorySearch(); | 114 | + // 获取历史搜索记录 |
| 115 | + this.getHistorySearch(); | ||
| 118 | }, | 116 | }, |
| 119 | changeTab: function(t) { | 117 | changeTab: function(t) { |
| 120 | var ord = t.currentTarget.dataset.href; | 118 | var ord = t.currentTarget.dataset.href; |
| @@ -134,24 +132,100 @@ Page({ | @@ -134,24 +132,100 @@ Page({ | ||
| 134 | 132 | ||
| 135 | //-----------真的调用地址进行搜索------------ | 133 | //-----------真的调用地址进行搜索------------ |
| 136 | requestSearch: function(t) { | 134 | requestSearch: function(t) { |
| 137 | - var a = this; | ||
| 138 | - | 135 | + if(this.data.loading) return false; |
| 136 | + this.data.loading=1; | ||
| 137 | + var e = this,th=e; | ||
| 139 | if(getApp().globalData.userInfo){ | 138 | if(getApp().globalData.userInfo){ |
| 140 | t += "&user_id=" + getApp().globalData.userInfo.user_id; | 139 | t += "&user_id=" + getApp().globalData.userInfo.user_id; |
| 141 | } | 140 | } |
| 141 | + this.data.requestUrl = t; | ||
| 142 | + getApp().request.promiseGet(t, {data:{is_mainshow: 1, isonsale: 1, store_id: oo.stoid,orderField: e.data.tabname, orderType: e.data.adname, page: e.data.currentPage}}).then(async res=>{ | ||
| 143 | + th.data.loading=0; | ||
| 144 | + if(ut.ajax_ok(res)){ | ||
| 145 | + if(!e.data.requestData) e.data.requestData=[]; | ||
| 146 | + for(let i in res.data.data.pageData){ | ||
| 147 | + let item=res.data.data.pageData[i]; | ||
| 148 | + item.original_img = th.data.url + item.original_img; | ||
| 149 | + | ||
| 150 | + var url="/api/weshop/activitylist/getGoodActInfo"; | ||
| 151 | + var req_data={ | ||
| 152 | + store_id:oo.stoid,goodsidlist:item.goods_id,is_detail:1 | ||
| 153 | + }; | ||
| 154 | + //获取商品的实际活动 | ||
| 155 | + await getApp().request.promiseGet(url, {data:req_data}).then(res=>{ | ||
| 156 | + if(res.data.code==0 && res.data.data && res.data.data.length==1){ | ||
| 157 | + item.prom_type=res.data.data[0].prom_type; | ||
| 158 | + item.prom_id=res.data.data[0].act_id; | ||
| 159 | + } | ||
| 160 | + }) | ||
| 161 | + | ||
| 162 | + var prom_type = item.prom_type; //0普通商品 1秒杀 6拼单 2团购 4积分购 | ||
| 163 | + var prom_id=item.prom_id; | ||
| 164 | + var now=ut.gettimestamp(); | ||
| 165 | + var url = ""; | ||
| 166 | + switch (prom_type){ | ||
| 167 | + case 1: | ||
| 168 | + var user_id=getApp().globalData.user_id; | ||
| 169 | + if(!user_id) user_id=0; | ||
| 170 | + url = "/api/ms/flash_sale/getNew/" +oo.stoid + "/" +user_id+"/"+ prom_id; | ||
| 171 | + break; | ||
| 172 | + case 2: | ||
| 173 | + url ="/api/weshop/goods/groupBuy/getActInfo/" +oo.stoid + "/" +item.goods_id+"/"+ prom_id | ||
| 174 | + break; | ||
| 175 | + case 4: | ||
| 176 | + url ="/api/weshop/integralbuy/get/"+oo.stoid +"/"+prom_id; | ||
| 177 | + break; | ||
| 178 | + case 6: | ||
| 179 | + url = "/api/weshop/teamlist/get/" + oo.stoid + "/" + prom_id; | ||
| 180 | + break; | ||
| 181 | + case 8: | ||
| 182 | + var presell_id = prom_id; | ||
| 183 | + var url1 = "/api/weshop/marketing/marketingPresellList/list"; | ||
| 184 | + var rd= { | ||
| 185 | + store_id: oo.stoid, | ||
| 186 | + presell_id: presell_id, | ||
| 187 | + goods_id: val.goods_id | ||
| 188 | + } | ||
| 189 | + //------获取预售从表---------- | ||
| 190 | + await getApp().request.promiseGet(url1, { | ||
| 191 | + data: rd | ||
| 192 | + }).then(res => { | ||
| 193 | + if (res.data.code == 0 && res.data.data && res.data.data.length > 0) { | ||
| 194 | + var arr = res.data.data[0]; | ||
| 195 | + item.prom_price = arr.luck_goods_price; | ||
| 196 | + item.sales_sum=arr.buy_goodnum+(arr.virtual_qty?arr.virtual_qty:0); | ||
| 197 | + } | ||
| 198 | + }) | ||
| 199 | + break; | ||
| 200 | + default: | ||
| 201 | + break | ||
| 202 | + } | ||
| 203 | + if(url!=null && url!=''){ | ||
| 204 | + await getApp().request.promiseGet(url, {}).then(res => { | ||
| 205 | + var prom =null; | ||
| 206 | + if(res && res.data) prom=res.data.data; | ||
| 207 | + if (prom != null && prom.is_end==0 && prom.end_time>now && (prom.start_time<now || (prom.show_time && prom.show_time<now)) ) { | ||
| 208 | + item.prom_price = res.data.data.price; | ||
| 209 | + if(res.data.data.user_price) item.prom_price=res.data.data.user_price; | ||
| 210 | + var vNum=res.data.data.virtual_num?res.data.data.virtual_num:0; | ||
| 211 | + var vNum1=res.data.data.virtualNum?res.data.data.virtualNum:0; | ||
| 212 | + var vNum2=res.data.data.virtual?res.data.data.virtual:0; | ||
| 213 | + item.sales_sum=res.data.data.buy_num+(vNum+vNum1+vNum2); | ||
| 214 | + }else{ | ||
| 215 | + item.prom_type=0; | ||
| 216 | + item.prom_id=0; | ||
| 217 | + item.prom_price=null; | ||
| 218 | + } | ||
| 219 | + }) | ||
| 220 | + } | ||
| 221 | + th.data.requestData.push(item); | ||
| 222 | + e.setData({requestData: e.data.requestData}); | ||
| 223 | + e.closeSearchModal(); | ||
| 224 | + } | ||
| 225 | + } | ||
| 226 | + | ||
| 227 | + }) | ||
| 142 | 228 | ||
| 143 | - this.data.requestUrl = t, | ||
| 144 | - //t += "&orderField=" + a.data.tabname; | ||
| 145 | - //t += "&orderType=" + a.data.adname; | ||
| 146 | - //t += "&page=" + a.data.currentPage, | ||
| 147 | - e.request(t, function(t) { | ||
| 148 | - a.data.currentPage++ , | ||
| 149 | - null == a.data.allData && (a.data.allData = t.data.data.pageData), | ||
| 150 | - a.closeSearchModal(); | ||
| 151 | - }, | ||
| 152 | - null, { is_mainshow: 1, isonsale: 1, store_id: oo.stoid, | ||
| 153 | - orderField: a.data.tabname, orderType: a.data.adname, page: a.data.currentPage} | ||
| 154 | - ); | ||
| 155 | }, | 229 | }, |
| 156 | onReachBottom: function() { | 230 | onReachBottom: function() { |
| 157 | this.data.openSearchModal || e.canloadMore() && this.requestSearch(this.data.requestUrl); | 231 | this.data.openSearchModal || e.canloadMore() && this.requestSearch(this.data.requestUrl); |
pages/goods/search/search.wxml
| @@ -35,7 +35,7 @@ | @@ -35,7 +35,7 @@ | ||
| 35 | <view class="item-cont"> | 35 | <view class="item-cont"> |
| 36 | <view class="title ellipsis-2">{{item.goods_name}}</view> | 36 | <view class="title ellipsis-2">{{item.goods_name}}</view> |
| 37 | <!-- 判断是否有活动价，小程序没有有团购和拼单 --> | 37 | <!-- 判断是否有活动价，小程序没有有团购和拼单 --> |
| 38 | - <block wx:if="{{(item.prom_price>0 || item.prom_integral) && item.prom_type!=2 && item.prom_id>0}}"> | 38 | + <block wx:if="{{(item.prom_price>0 || item.prom_integral) && item.prom_id>0}}"> |
| 39 | <!-- 活动价 --> | 39 | <!-- 活动价 --> |
| 40 | <view class="price"> | 40 | <view class="price"> |
| 41 | <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text> | 41 | <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text> |
pages/index/index/index.js
| @@ -17,6 +17,7 @@ var d = getApp().globalData; | @@ -17,6 +17,7 @@ var d = getApp().globalData; | ||
| 17 | 17 | ||
| 18 | var full_screen = require('full_screen.js'); | 18 | var full_screen = require('full_screen.js'); |
| 19 | 19 | ||
| 20 | + | ||
| 20 | Page({ | 21 | Page({ |
| 21 | data: { | 22 | data: { |
| 22 | url: o.imghost, | 23 | url: o.imghost, |
| @@ -86,8 +87,6 @@ Page({ | @@ -86,8 +87,6 @@ Page({ | ||
| 86 | }, | 87 | }, |
| 87 | 88 | ||
| 88 | onLoad: async function (tt) { | 89 | onLoad: async function (tt) { |
| 89 | - console.log("进入首页-------------"); | ||
| 90 | - console.log(tt); | ||
| 91 | var th = this; | 90 | var th = this; |
| 92 | var first_leader = tt.first_leader; | 91 | var first_leader = tt.first_leader; |
| 93 | if (!first_leader && tt.scene) { | 92 | if (!first_leader && tt.scene) { |
| @@ -139,8 +138,8 @@ Page({ | @@ -139,8 +138,8 @@ Page({ | ||
| 139 | var pages = getCurrentPages(); //获取加载的页面 | 138 | var pages = getCurrentPages(); //获取加载的页面 |
| 140 | var currentPage = pages[pages.length - 1]; //获取当前页面的对象 | 139 | var currentPage = pages[pages.length - 1]; //获取当前页面的对象 |
| 141 | 140 | ||
| 142 | - console.log("当前路由"); | ||
| 143 | - console.log(currentPage.route); | 141 | + // console.log("当前路由"); |
| 142 | + // console.log(currentPage.route); | ||
| 144 | 143 | ||
| 145 | 144 | ||
| 146 | th.setappdata(ob); | 145 | th.setappdata(ob); |
| @@ -173,7 +172,6 @@ Page({ | @@ -173,7 +172,6 @@ Page({ | ||
| 173 | getApp().request.promiseGet('/api/weshop/redmoney/redConfig/get/' + getApp().globalData.setting.stoid, { | 172 | getApp().request.promiseGet('/api/weshop/redmoney/redConfig/get/' + getApp().globalData.setting.stoid, { |
| 174 | data: {} | 173 | data: {} |
| 175 | }).then(function (data) { | 174 | }).then(function (data) { |
| 176 | - // console.log('909090909090----->', data.data.code); | ||
| 177 | let code = data.data.code; | 175 | let code = data.data.code; |
| 178 | if (code == 0) { | 176 | if (code == 0) { |
| 179 | 177 | ||
| @@ -230,6 +228,7 @@ Page({ | @@ -230,6 +228,7 @@ Page({ | ||
| 230 | if (new_nav == "") { | 228 | if (new_nav == "") { |
| 231 | th.is_new(); | 229 | th.is_new(); |
| 232 | } | 230 | } |
| 231 | + // sty | ||
| 233 | setTimeout(function () { | 232 | setTimeout(function () { |
| 234 | if (getApp().globalData.user_id) getApp().requestCardNum(th); | 233 | if (getApp().globalData.user_id) getApp().requestCardNum(th); |
| 235 | }, 500) | 234 | }, 500) |
| @@ -392,6 +391,7 @@ Page({ | @@ -392,6 +391,7 @@ Page({ | ||
| 392 | active: index //数字是当前页面在tabbar的索引 | 391 | active: index //数字是当前页面在tabbar的索引 |
| 393 | }) | 392 | }) |
| 394 | 393 | ||
| 394 | + //sty | ||
| 395 | getApp().requestCardNum(this); | 395 | getApp().requestCardNum(this); |
| 396 | } | 396 | } |
| 397 | 397 | ||
| @@ -421,6 +421,22 @@ Page({ | @@ -421,6 +421,22 @@ Page({ | ||
| 421 | getApp().globalData.isLoad_ad = 1; | 421 | getApp().globalData.isLoad_ad = 1; |
| 422 | } | 422 | } |
| 423 | }, 1500) | 423 | }, 1500) |
| 424 | + | ||
| 425 | + | ||
| 426 | + // 获取幸运购活动列表 | ||
| 427 | + getApp().request.promiseGet('/api/weshop/prom/luckyActivity/page', { | ||
| 428 | + data: { | ||
| 429 | + store_id: getApp().globalData.setting.stoid, | ||
| 430 | + is_end: 0, | ||
| 431 | + timetype: 1, | ||
| 432 | + } | ||
| 433 | + }).then(res => { | ||
| 434 | + if(res.data.code == 0) { | ||
| 435 | + th.setData({ | ||
| 436 | + luckGo_list: res.data.data.pageData.slice(0,3), | ||
| 437 | + }); | ||
| 438 | + } | ||
| 439 | + }); | ||
| 424 | 440 | ||
| 425 | 441 | ||
| 426 | 442 | ||
| @@ -601,6 +617,14 @@ Page({ | @@ -601,6 +617,14 @@ Page({ | ||
| 601 | }); | 617 | }); |
| 602 | } | 618 | } |
| 603 | }) | 619 | }) |
| 620 | + | ||
| 621 | + | ||
| 622 | + | ||
| 623 | + | ||
| 624 | + | ||
| 625 | + | ||
| 626 | + | ||
| 627 | + | ||
| 604 | //---调用信息--- | 628 | //---调用信息--- |
| 605 | // this.requestRecommend(); | 629 | // this.requestRecommend(); |
| 606 | this.setData({ | 630 | this.setData({ |
| @@ -615,6 +639,7 @@ Page({ | @@ -615,6 +639,7 @@ Page({ | ||
| 615 | th.is_new(); | 639 | th.is_new(); |
| 616 | } | 640 | } |
| 617 | 641 | ||
| 642 | + // sty | ||
| 618 | setTimeout(function () { | 643 | setTimeout(function () { |
| 619 | if (getApp().globalData.user_id) getApp().requestCardNum(th); | 644 | if (getApp().globalData.user_id) getApp().requestCardNum(th); |
| 620 | }, 500) | 645 | }, 500) |
| @@ -1140,6 +1165,8 @@ Page({ | @@ -1140,6 +1165,8 @@ Page({ | ||
| 1140 | } | 1165 | } |
| 1141 | var url=e.currentTarget.dataset.url; | 1166 | var url=e.currentTarget.dataset.url; |
| 1142 | getApp().goto(url); | 1167 | getApp().goto(url); |
| 1143 | - } | 1168 | + }, |
| 1169 | + | ||
| 1170 | + | ||
| 1144 | 1171 | ||
| 1145 | }); | 1172 | }); |
| 1146 | \ No newline at end of file | 1173 | \ No newline at end of file |
pages/index/index/index.wxml
| @@ -229,43 +229,46 @@ | @@ -229,43 +229,46 @@ | ||
| 229 | 229 | ||
| 230 | 230 | ||
| 231 | <!--幸运购--> | 231 | <!--幸运购--> |
| 232 | - <view class="seckill" wx:if="{{false}}"> | ||
| 233 | - <navigator bindtap="go_pre" data-url="/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList" hover-class="none"> | ||
| 234 | - <view class="seckill-time"> | ||
| 235 | - <view class="classname flex ai_c"> | ||
| 236 | - <i class="iconfont icon-luck"></i> | ||
| 237 | - <text class="bold fs30">幸运购</text> | ||
| 238 | - </view> | ||
| 239 | - <view class="flex ai_c seckill-list"> | ||
| 240 | - <text class="fs24 xc-marfin-right">查看全部</text> | ||
| 241 | - <image class="arrow-right" src="{{url}}/miniapp/images/icon-arrowdown.png"></image> | 232 | + <!--幸运购--> |
| 233 | + <view class="seckill" wx:if="{{luckGo_list && luckGo_list.length != 0}}"> | ||
| 234 | + <navigator bindtap="go_url" data-url="/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList" hover-class="none"> | ||
| 235 | + <view class="seckill-time"> | ||
| 236 | + <view class="classname flex ai_c"> | ||
| 237 | + <i class="iconfont icon-luck"></i> | ||
| 238 | + <text class="bold fs30">幸运购</text> | ||
| 239 | + </view> | ||
| 240 | + <view class="flex ai_c seckill-list"> | ||
| 241 | + <text class="fs24 xc-marfin-right">查看全部</text> | ||
| 242 | + <image class="arrow-right" src="{{url}}/miniapp/images/icon-arrowdown.png"></image> | ||
| 243 | + </view> | ||
| 242 | </view> | 244 | </view> |
| 243 | - </view> | ||
| 244 | - </navigator> | ||
| 245 | - <view class="seckill-list luck"> | ||
| 246 | - <view class="list-item" wx:for="{{3}}"> | ||
| 247 | - <view class="flex ai-center"> | ||
| 248 | - <view class="img-container"><image class="img-block" src="../../../images/bk.png"></image></view> | ||
| 249 | - <view class="pdl20 flex fdc jc_sb f1"> | ||
| 250 | - | ||
| 251 | - <view class="ellipsis-2 name fs28">我是商品</view> | ||
| 252 | - <view> | ||
| 253 | - <view class="flex ai-center"> | ||
| 254 | - <text class="rmb c-red">189.00</text> | ||
| 255 | - <view class="del fs22 c-a pdl10">零售价:<text class="rmb">155</text></view> | ||
| 256 | - </view> | ||
| 257 | - <view class="flex jc_sb"> | ||
| 258 | - <progress class="pdr20 f1 progress" percent="50" activeColor="#FF6768" backgroundColor="#d0d0d0" border-radius="12" stroke-width="12" data-content="1人已参团"></progress> | ||
| 259 | - <view class="btn fs26">去参团</view> | 245 | + </navigator> |
| 246 | + <view class="seckill-list luck"> | ||
| 247 | + <view class="list-item" wx:for="{{luckGo_list}}" bindtap="go_url" data-url="/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id={{item.goods_id}}&group_id={{item.id}}" wx:if="{{item.status == 1}}"> | ||
| 248 | + <view class="flex ai-center"> | ||
| 249 | + <view class="img-container"><image class="img-block" src="{{url + item.original_img}}" data-val="{{item.original_img}}" | ||
| 250 | + data-errorimg="luckGo_list[{{index}}].original_img" binderror="bind_bnerr2" lazy-load="true"></image></view> | ||
| 251 | + <view class="pdl20 flex fdc jc_sb f1"> | ||
| 252 | + | ||
| 253 | + <view class="ellipsis-2 name fs28" data-content="{{item.group_num}}人团">{{item.title}}</view> | ||
| 254 | + <view> | ||
| 255 | + <view class="flex ai-center"> | ||
| 256 | + <text class="rmb c-red">{{filter.price(item.group_price)}}</text> | ||
| 257 | + <view class="del fs22 c-a pdl10">零售价:<text class="rmb">{{item.market_price}}</text></view> | ||
| 258 | + </view> | ||
| 259 | + <view class="flex jc_sb"> | ||
| 260 | + <progress class="pdr20 f1 progress" percent="{{filter.percent(item.num, item.group_num)}}" activeColor="#FF6768" backgroundColor="#d0d0d0" border-radius="12" stroke-width="12" data-content="{{item.num}}人已参团"></progress> | ||
| 261 | + <view class="btn fs26">去参团</view> | ||
| 262 | + <!-- &title=狐狸3号测速003&prom_type=7&prom_id=468 --> | ||
| 263 | + </view> | ||
| 260 | </view> | 264 | </view> |
| 265 | + | ||
| 261 | </view> | 266 | </view> |
| 262 | - | ||
| 263 | </view> | 267 | </view> |
| 268 | + <view class="fs24 pdt10 c-7b">*<text class="c-red">{{item.group_num}}</text>人成团，<text class="c-red">{{item.group_win}}</text>人得商品，<text class="c-red">{{item.group_num - item.group_win}}</text>人全额退款并得<text class="c-red">惊喜礼品</text>！</view> | ||
| 264 | </view> | 269 | </view> |
| 265 | - <view class="fs24 pdt10 c-7b">*<text class="c-red">5</text>人成团，<text class="c-red">5</text>人得商品，<text class="c-red">5</text>人全额退款并得<text class="c-red">惊喜礼品</text>！</view> | ||
| 266 | </view> | 270 | </view> |
| 267 | </view> | 271 | </view> |
| 268 | - </view> | ||
| 269 | 272 | ||
| 270 | 273 | ||
| 271 | 274 |
pages/index/index/index.wxss
| @@ -1151,7 +1151,7 @@ page { | @@ -1151,7 +1151,7 @@ page { | ||
| 1151 | } | 1151 | } |
| 1152 | 1152 | ||
| 1153 | .luck .name::before { | 1153 | .luck .name::before { |
| 1154 | - content: '5人团'; | 1154 | + content: attr(data-content); |
| 1155 | background-color: #FF6768; | 1155 | background-color: #FF6768; |
| 1156 | color: white; | 1156 | color: white; |
| 1157 | font-size: 26rpx; | 1157 | font-size: 26rpx; |
pages/user/order_detail/order_detail.js
| @@ -370,7 +370,6 @@ Page({ | @@ -370,7 +370,6 @@ Page({ | ||
| 370 | th.toast(content); | 370 | th.toast(content); |
| 371 | return false; | 371 | return false; |
| 372 | } | 372 | } |
| 373 | - | ||
| 374 | //当是组合优惠的时候 | 373 | //当是组合优惠的时候 |
| 375 | if(good.prom_type==7){ | 374 | if(good.prom_type==7){ |
| 376 | //如果有组合购 | 375 | //如果有组合购 |
| @@ -439,30 +438,72 @@ Page({ | @@ -439,30 +438,72 @@ Page({ | ||
| 439 | 438 | ||
| 440 | //如果优惠促销和搭配购的时候 | 439 | //如果优惠促销和搭配购的时候 |
| 441 | if((good.prom_type==3 || good.prom_type==5) && good.is_collocation!=1 && good.is_gift!=1){ | 440 | if((good.prom_type==3 || good.prom_type==5) && good.is_collocation!=1 && good.is_gift!=1){ |
| 442 | - var p_ok=1; | ||
| 443 | - await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid+"/"+good.goods_id+"/0", {}).then(res => { | ||
| 444 | - if(res.data.code==0){ | ||
| 445 | - var r_data=res.data.data; | ||
| 446 | - if(!r_data.collocationPromList && good.prom_type==5){ | ||
| 447 | - | ||
| 448 | - var content=good.goods_name+'未找到活动,请取消订单重新购买'; | ||
| 449 | - th.toast(content); | ||
| 450 | - p_ok=0; | ||
| 451 | - } | ||
| 452 | - if(!r_data.promGoodsLists && good.prom_type==3){ | ||
| 453 | - | ||
| 454 | - var content=good.goods_name+'未找到活动,请取消订单重新购买'; | ||
| 455 | - th.toast(content); | ||
| 456 | - p_ok=0; | ||
| 457 | - } | ||
| 458 | - }else{ | ||
| 459 | - | ||
| 460 | - var content=good.goods_name+'未找到活动,请取消订单重新购买'; | ||
| 461 | - th.toast(content); | ||
| 462 | - p_ok=0; | ||
| 463 | - } | ||
| 464 | - }) | ||
| 465 | - if(!p_ok) return false; | 441 | + var p_ok = 1,is_g_prom=0; |
| 442 | + //因为有全场优惠活动，商品参加的活动还未开始 | ||
| 443 | + var url="/api/weshop/activitylist/getGoodActInfo"; | ||
| 444 | + var req_data={ | ||
| 445 | + store_id:os.stoid,goodsidlist:good.goods_id,is_detail:1,user_id:user_id | ||
| 446 | + }; | ||
| 447 | + await getApp().request.promiseGet(url, {data:req_data}).then(async function (res) { | ||
| 448 | + if(res.data.code==0 && res.data.data && res.data.data.length){ | ||
| 449 | + for(let i in res.data.data){ | ||
| 450 | + let item=res.data.data[i]; | ||
| 451 | + if(item.prom_type==3) { | ||
| 452 | + is_g_prom=1; break; | ||
| 453 | + } | ||
| 454 | + } | ||
| 455 | + } | ||
| 456 | + }) | ||
| 457 | + if(is_g_prom){ | ||
| 458 | + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0", {}).then(res => { | ||
| 459 | + if (res.data.code == 0) { | ||
| 460 | + var r_data = res.data.data; | ||
| 461 | + if (!r_data.collocationPromList && good.prom_type == 5) { | ||
| 462 | + | ||
| 463 | + var content = good.goods_name + '未找到活动,请取消订单重新购买'; | ||
| 464 | + th.toast(content) | ||
| 465 | + p_ok = 0; | ||
| 466 | + } | ||
| 467 | + if (!r_data.promGoodsLists && good.prom_type == 3) { | ||
| 468 | + | ||
| 469 | + var content = good.goods_name + '未找到活动,请取消订单重新购买'; | ||
| 470 | + th.toast(content); | ||
| 471 | + p_ok = 0; | ||
| 472 | + } | ||
| 473 | + } else { | ||
| 474 | + | ||
| 475 | + var content = good.goods_name + '未找到活动,请取消订单重新购买' | ||
| 476 | + th.toast(content); | ||
| 477 | + p_ok = 0; | ||
| 478 | + } | ||
| 479 | + }) | ||
| 480 | + }else{ | ||
| 481 | + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromNormal/" + os.stoid + "/" + good.goods_id, {}).then(res => { | ||
| 482 | + if (res.data.code == 0) { | ||
| 483 | + var r_data = res.data.data; | ||
| 484 | + if (!r_data.collocationPromList && good.prom_type == 5) { | ||
| 485 | + | ||
| 486 | + var content = good.goods_name + '未找到活动,请取消订单重新购买'; | ||
| 487 | + th.toast(content) | ||
| 488 | + | ||
| 489 | + p_ok = 0; | ||
| 490 | + } | ||
| 491 | + if (!r_data.promGoodsLists && good.prom_type == 3) { | ||
| 492 | + | ||
| 493 | + var content = good.goods_name + '未找到活动,请取消订单重新购买'; | ||
| 494 | + th.toast(content); | ||
| 495 | + p_ok = 0; | ||
| 496 | + } | ||
| 497 | + } else { | ||
| 498 | + | ||
| 499 | + var content = good.goods_name + '未找到活动,请取消订单重新购买' | ||
| 500 | + th.toast(content); | ||
| 501 | + p_ok = 0; | ||
| 502 | + } | ||
| 503 | + }) | ||
| 504 | + | ||
| 505 | + } | ||
| 506 | + if (!p_ok) return false; | ||
| 466 | } | 507 | } |
| 467 | 508 | ||
| 468 | //商品的普通购买 ，不要进行判断 | 509 | //商品的普通购买 ，不要进行判断 |
| @@ -1074,15 +1115,43 @@ Page({ | @@ -1074,15 +1115,43 @@ Page({ | ||
| 1074 | 1115 | ||
| 1075 | //如果有优惠促销的时候,要看下商品的优惠活动有没有过期 | 1116 | //如果有优惠促销的时候,要看下商品的优惠活动有没有过期 |
| 1076 | if(g_item.prom_type==3 || good.prom_type==3){ | 1117 | if(g_item.prom_type==3 || good.prom_type==3){ |
| 1077 | - await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/1", {}).then(res => { | ||
| 1078 | - if (res.data.code == 0) { | ||
| 1079 | - var r_data = res.data.data; | ||
| 1080 | - if (r_data.promGoodsLists) { | ||
| 1081 | - b_item.prom_type=3; | ||
| 1082 | - b_item.prom_id=r_data.promGoodsLists[0].prom_id; | ||
| 1083 | - } | ||
| 1084 | - } | ||
| 1085 | - }) | 1118 | + var is_g_prom=0; |
| 1119 | + //因为有全场优惠活动，商品参加的活动还未开始 | ||
| 1120 | + var url="/api/weshop/activitylist/getGoodActInfo"; | ||
| 1121 | + var req_data={ | ||
| 1122 | + store_id:os.stoid,goodsidlist:good.goods_id,is_detail:1,user_id:user_id | ||
| 1123 | + }; | ||
| 1124 | + await getApp().request.promiseGet(url, {data:req_data}).then(async function (res) { | ||
| 1125 | + if(res.data.code==0 && res.data.data && res.data.data.length){ | ||
| 1126 | + for(let i in res.data.data){ | ||
| 1127 | + let item=res.data.data[i]; | ||
| 1128 | + if(item.prom_type==3) { | ||
| 1129 | + is_g_prom=1; break; | ||
| 1130 | + } | ||
| 1131 | + } | ||
| 1132 | + } | ||
| 1133 | + }) | ||
| 1134 | + if(is_g_prom) { | ||
| 1135 | + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/1", {}).then(res => { | ||
| 1136 | + if (res.data.code == 0) { | ||
| 1137 | + var r_data = res.data.data; | ||
| 1138 | + if (r_data.promGoodsLists) { | ||
| 1139 | + b_item.prom_type = 3; | ||
| 1140 | + b_item.prom_id = r_data.promGoodsLists[0].prom_id; | ||
| 1141 | + } | ||
| 1142 | + } | ||
| 1143 | + }) | ||
| 1144 | + }else{ | ||
| 1145 | + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromNormal/" + os.stoid + "/" + good.goods_id, {}).then(res => { | ||
| 1146 | + if (res.data.code == 0) { | ||
| 1147 | + var r_data = res.data.data; | ||
| 1148 | + if (r_data.promGoodsLists) { | ||
| 1149 | + b_item.prom_type = 3; | ||
| 1150 | + b_item.prom_id = r_data.promGoodsLists[0].prom_id; | ||
| 1151 | + } | ||
| 1152 | + } | ||
| 1153 | + }) | ||
| 1154 | + } | ||
| 1086 | } | 1155 | } |
| 1087 | 1156 | ||
| 1088 | 1157 |
pages/user/order_list/order_list.js
| @@ -620,34 +620,73 @@ Page({ | @@ -620,34 +620,73 @@ Page({ | ||
| 620 | } | 620 | } |
| 621 | } | 621 | } |
| 622 | 622 | ||
| 623 | - | ||
| 624 | - | ||
| 625 | //如果优惠促销和搭配购的时候 | 623 | //如果优惠促销和搭配购的时候 |
| 626 | if ((good.prom_type == 3 || good.prom_type == 5) && good.is_gift != 1 && good.is_collocation != 1) { | 624 | if ((good.prom_type == 3 || good.prom_type == 5) && good.is_gift != 1 && good.is_collocation != 1) { |
| 627 | - var p_ok = 1; | ||
| 628 | - await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0", {}).then(res => { | ||
| 629 | - if (res.data.code == 0) { | ||
| 630 | - var r_data = res.data.data; | ||
| 631 | - if (!r_data.collocationPromList && good.prom_type == 5) { | 625 | + var p_ok = 1,is_g_prom=0; |
| 626 | + //因为有全场优惠活动，商品参加的活动还未开始 | ||
| 627 | + var url="/api/weshop/activitylist/getGoodActInfo"; | ||
| 628 | + var req_data={ | ||
| 629 | + store_id:os.stoid,goodsidlist:good.goods_id,is_detail:1,user_id:user_id | ||
| 630 | + }; | ||
| 631 | + await getApp().request.promiseGet(url, {data:req_data}).then(async function (res) { | ||
| 632 | + if(res.data.code==0 && res.data.data && res.data.data.length){ | ||
| 633 | + for(let i in res.data.data){ | ||
| 634 | + let item=res.data.data[i]; | ||
| 635 | + if(item.prom_type==3) { | ||
| 636 | + is_g_prom=1; break; | ||
| 637 | + } | ||
| 638 | + } | ||
| 639 | + } | ||
| 640 | + }) | ||
| 641 | + if(is_g_prom){ | ||
| 642 | + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/0", {}).then(res => { | ||
| 643 | + if (res.data.code == 0) { | ||
| 644 | + var r_data = res.data.data; | ||
| 645 | + if (!r_data.collocationPromList && good.prom_type == 5) { | ||
| 646 | + | ||
| 647 | + var content = good.goods_name + '未找到活动,请取消订单重新购买'; | ||
| 648 | + th.toast(content) | ||
| 649 | + p_ok = 0; | ||
| 650 | + } | ||
| 651 | + if (!r_data.promGoodsLists && good.prom_type == 3) { | ||
| 632 | 652 | ||
| 633 | - var content = good.goods_name + '未找到活动,请取消订单重新购买'; | ||
| 634 | - th.toast(content) | 653 | + var content = good.goods_name + '未找到活动,请取消订单重新购买'; |
| 654 | + th.toast(content); | ||
| 655 | + p_ok = 0; | ||
| 656 | + } | ||
| 657 | + } else { | ||
| 635 | 658 | ||
| 659 | + var content = good.goods_name + '未找到活动,请取消订单重新购买' | ||
| 660 | + th.toast(content); | ||
| 636 | p_ok = 0; | 661 | p_ok = 0; |
| 637 | } | 662 | } |
| 638 | - if (!r_data.promGoodsLists && good.prom_type == 3) { | 663 | + }) |
| 664 | + }else{ | ||
| 665 | + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromNormal/" + os.stoid + "/" + good.goods_id, {}).then(res => { | ||
| 666 | + if (res.data.code == 0) { | ||
| 667 | + var r_data = res.data.data; | ||
| 668 | + if (!r_data.collocationPromList && good.prom_type == 5) { | ||
| 669 | + | ||
| 670 | + var content = good.goods_name + '未找到活动,请取消订单重新购买'; | ||
| 671 | + th.toast(content) | ||
| 672 | + | ||
| 673 | + p_ok = 0; | ||
| 674 | + } | ||
| 675 | + if (!r_data.promGoodsLists && good.prom_type == 3) { | ||
| 639 | 676 | ||
| 640 | - var content = good.goods_name + '未找到活动,请取消订单重新购买'; | 677 | + var content = good.goods_name + '未找到活动,请取消订单重新购买'; |
| 678 | + th.toast(content); | ||
| 679 | + p_ok = 0; | ||
| 680 | + } | ||
| 681 | + } else { | ||
| 682 | + | ||
| 683 | + var content = good.goods_name + '未找到活动,请取消订单重新购买' | ||
| 641 | th.toast(content); | 684 | th.toast(content); |
| 642 | p_ok = 0; | 685 | p_ok = 0; |
| 643 | } | 686 | } |
| 644 | - } else { | 687 | + }) |
| 645 | 688 | ||
| 646 | - var content = good.goods_name + '未找到活动,请取消订单重新购买' | ||
| 647 | - th.toast(content); | ||
| 648 | - p_ok = 0; | ||
| 649 | - } | ||
| 650 | - }) | 689 | + } |
| 651 | if (!p_ok) return false; | 690 | if (!p_ok) return false; |
| 652 | } | 691 | } |
| 653 | 692 | ||
| @@ -1244,15 +1283,44 @@ Page({ | @@ -1244,15 +1283,44 @@ Page({ | ||
| 1244 | 1283 | ||
| 1245 | //如果有优惠促销的时候,要看下商品的优惠活动有没有过期 | 1284 | //如果有优惠促销的时候,要看下商品的优惠活动有没有过期 |
| 1246 | if(g_item.prom_type==3 || good.prom_type==3){ | 1285 | if(g_item.prom_type==3 || good.prom_type==3){ |
| 1247 | - await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/1", {}).then(res => { | ||
| 1248 | - if (res.data.code == 0) { | ||
| 1249 | - var r_data = res.data.data; | ||
| 1250 | - if (r_data.promGoodsLists) { | ||
| 1251 | - b_item.prom_type=3; | ||
| 1252 | - b_item.prom_id=r_data.promGoodsLists[0].prom_id; | 1286 | + var is_g_prom=0; |
| 1287 | + //因为有全场优惠活动，商品参加的活动还未开始 | ||
| 1288 | + var url="/api/weshop/activitylist/getGoodActInfo"; | ||
| 1289 | + var req_data={ | ||
| 1290 | + store_id:os.stoid,goodsidlist:good.goods_id,is_detail:1,user_id:user_id | ||
| 1291 | + }; | ||
| 1292 | + await getApp().request.promiseGet(url, {data:req_data}).then(async function (res) { | ||
| 1293 | + if(res.data.code==0 && res.data.data && res.data.data.length){ | ||
| 1294 | + for(let i in res.data.data){ | ||
| 1295 | + let item=res.data.data[i]; | ||
| 1296 | + if(item.prom_type==3) { | ||
| 1297 | + is_g_prom=1; break; | ||
| 1298 | + } | ||
| 1299 | + } | ||
| 1253 | } | 1300 | } |
| 1301 | + }) | ||
| 1302 | + if(is_g_prom) { | ||
| 1303 | + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + good.goods_id + "/1", {}).then(res => { | ||
| 1304 | + if (res.data.code == 0) { | ||
| 1305 | + var r_data = res.data.data; | ||
| 1306 | + if (r_data.promGoodsLists) { | ||
| 1307 | + b_item.prom_type = 3; | ||
| 1308 | + b_item.prom_id = r_data.promGoodsLists[0].prom_id; | ||
| 1309 | + } | ||
| 1310 | + } | ||
| 1311 | + }) | ||
| 1312 | + }else{ | ||
| 1313 | + await getApp().request.promiseGet("/api/weshop/goods/getGoodsPromNormal/" + os.stoid + "/" + good.goods_id, {}).then(res => { | ||
| 1314 | + if (res.data.code == 0) { | ||
| 1315 | + var r_data = res.data.data; | ||
| 1316 | + if (r_data.promGoodsLists) { | ||
| 1317 | + b_item.prom_type = 3; | ||
| 1318 | + b_item.prom_id = r_data.promGoodsLists[0].prom_id; | ||
| 1319 | + } | ||
| 1320 | + } | ||
| 1321 | + }) | ||
| 1254 | } | 1322 | } |
| 1255 | - }) | 1323 | + |
| 1256 | } | 1324 | } |
| 1257 | 1325 | ||
| 1258 | 1326 |