2 participants
-
Added 2 commits:
- 4a428c7e - 幸运购修改4
- 55d2a0bb - Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
-
Status changed to closed
Showing
22 changed files
components/diy_goodsGroup/diy_goodsGroup.wxss
| ... | ... | @@ -178,6 +178,7 @@ |
| 178 | 178 | height: 90rpx; |
| 179 | 179 | margin-bottom: 10rpx; |
| 180 | 180 | font-size: 28rpx; |
| 181 | + /* word-break: break-all; */ | |
| 181 | 182 | /* white-space: nowrap; |
| 182 | 183 | width: 80%; */ |
| 183 | 184 | } |
| ... | ... | @@ -319,6 +320,7 @@ |
| 319 | 320 | height: 90rpx; |
| 320 | 321 | /* line-height: 40rpx; */ |
| 321 | 322 | margin-top: 10rpx; |
| 323 | + /* word-break: break-all; */ | |
| 322 | 324 | } |
| 323 | 325 | |
| 324 | 326 | .zs_wz2_2l { | ... | ... |
components/diy_seckill/diy_seckill.wxss
packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.js
| ... | ... | @@ -12,8 +12,20 @@ Page({ |
| 12 | 12 | pageNum: 1, // 当前页数 |
| 13 | 13 | }, |
| 14 | 14 | |
| 15 | - onLoad: function () { | |
| 15 | + onLoad: function (options) { | |
| 16 | 16 | self = this; |
| 17 | + | |
| 18 | + var first_leader = options.first_leader; | |
| 19 | + if(first_leader) { | |
| 20 | + app.globalData.first_leader = first_leader; | |
| 21 | + //调用接口判断是不是会员 | |
| 22 | + // app.request.promiseGet("/api/weshop/shoppingGuide/get/" + app.globalData.setting.stoid + "/" + first_leader, {}).then(res => { | |
| 23 | + // if (res.data.code == 0) { | |
| 24 | + // getApp().globalData.guide_id = res.data.data.id; | |
| 25 | + // } | |
| 26 | + // }) | |
| 27 | + }; | |
| 28 | + | |
| 17 | 29 | app.isLogin().then(function(data) { |
| 18 | 30 | self.setData({ |
| 19 | 31 | userInfo: data, |
| ... | ... | @@ -173,5 +185,42 @@ Page({ |
| 173 | 185 | }; |
| 174 | 186 | }, |
| 175 | 187 | |
| 188 | + | |
| 189 | + /** | |
| 190 | + * 用户点击右上角分享 | |
| 191 | + */ | |
| 192 | + onShareAppMessage: function (e) { | |
| 193 | + var pagePath = this.route; //当前页面url | |
| 194 | + if (pagePath.indexOf('/') != 0) { | |
| 195 | + pagePath = '/' + pagePath; | |
| 196 | + } | |
| 197 | + if(getApp().globalData.user_id){ | |
| 198 | + | |
| 199 | + if(pagePath.indexOf("?")>0){ | |
| 200 | + pagePath+="&first_leader="+getApp().globalData.user_id; | |
| 201 | + }else{ | |
| 202 | + pagePath+="?first_leader="+getApp().globalData.user_id; | |
| 203 | + } | |
| 204 | + } | |
| 205 | + return { | |
| 206 | + title: "幸运购活动列表", | |
| 207 | + path: pagePath, | |
| 208 | + } | |
| 209 | + }, | |
| 210 | + | |
| 211 | + // onShareTimeline() { | |
| 212 | + // var store_name = getApp().globalData.config ? getApp().globalData.config.store_name:''; | |
| 213 | + // var pagePath = this.route; //当前页面url | |
| 214 | + | |
| 215 | + // if(!store_name) store_name = getApp().globalData.setting.appName; | |
| 216 | + // if (pagePath.indexOf('/') != 0) { | |
| 217 | + // pagePath = '/' + pagePath; | |
| 218 | + // } | |
| 219 | + // return { | |
| 220 | + // title: store_name + '-幸运购活动列表', | |
| 221 | + // path: pagePath, | |
| 222 | + // } | |
| 223 | + // }, | |
| 224 | + | |
| 176 | 225 | }) |
| 177 | 226 | ... | ... |
packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxml
| ... | ... | @@ -26,7 +26,8 @@ |
| 26 | 26 | </view> |
| 27 | 27 | <view class="flex jc_sb"> |
| 28 | 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">去参团</view> | |
| 29 | + <view class="btn fs26 {{item.goods_num == 0 ? 'gray':''}}" wx:if="{{item.goods_num == 0}}">已抢光</view> | |
| 30 | + <view class="btn fs26" wx:else>去参团</view> | |
| 30 | 31 | </view> |
| 31 | 32 | </view> |
| 32 | 33 | ... | ... |
packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxss
| ... | ... | @@ -20,8 +20,8 @@ page { |
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | .img-container { |
| 23 | - width: 200rpx; | |
| 24 | - height: 200rpx; | |
| 23 | + width: 220rpx; | |
| 24 | + height: 220rpx; | |
| 25 | 25 | border-radius: 14rpx; |
| 26 | 26 | overflow: hidden; |
| 27 | 27 | flex-shrink: 0; |
| ... | ... | @@ -92,3 +92,7 @@ page { |
| 92 | 92 | color: white; |
| 93 | 93 | text-align: center; |
| 94 | 94 | } |
| 95 | + | |
| 96 | +.btn.gray { | |
| 97 | + background-color: #ccc; | |
| 98 | +} | ... | ... |
packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
| ... | ... | @@ -102,7 +102,7 @@ Page({ |
| 102 | 102 | |
| 103 | 103 | |
| 104 | 104 | //先获取物流，再获取用户信息，再展示页面 |
| 105 | - //th.get_wuliu(th.get_info(th.show_page)); | |
| 105 | + th.get_wuliu(th.get_info(th.show_page)); | |
| 106 | 106 | }, |
| 107 | 107 | |
| 108 | 108 | onUnload: function() { |
| ... | ... | @@ -604,7 +604,7 @@ Page({ |
| 604 | 604 | pdata = new Array(); |
| 605 | 605 | var ff = true; |
| 606 | 606 | //------------立即购买------------- |
| 607 | - console.log("buy_new"); | |
| 607 | + // console.log("buy_new"); | |
| 608 | 608 | |
| 609 | 609 | //如果不是阶梯团，或者是普通购买，商家选择了物流，以及地址为空的时候 |
| 610 | 610 | if (th.data.bn_exp_type == 0 && th.data.user_addr == null && (th.data.kt_type != 3 || th.data.bn_goods.is_normal == |
| ... | ... | @@ -649,6 +649,8 @@ Page({ |
| 649 | 649 | 'goods_price': th.data.param.goods_price, //商品总价 |
| 650 | 650 | //'goods_price': th.data.formData.all_price, //商品总价 |
| 651 | 651 | 'shipping_price': th.data.formData.shipping_price, //物流金额 |
| 652 | + 'shipping_code': th.data.bn_exp_type == 1 ? 0 : th.data.wu_arr[th.data.index].code, | |
| 653 | + 'shipping_name': th.data.bn_exp_type == 1 ? '' : th.data.wu_arr[th.data.index].name, | |
| 652 | 654 | 'user_money': th.data.formData.user_money, //使用余额 |
| 653 | 655 | 'total_amount': th.data.formData.total_amount, //订单总价 |
| 654 | 656 | 'order_amount': th.data.formData.order_amount, //应付 |
| ... | ... | @@ -784,10 +786,17 @@ Page({ |
| 784 | 786 | // }, 1); |
| 785 | 787 | util_pay.pay(data.data, function() { |
| 786 | 788 | setTimeout(function() { |
| 787 | - wx.reLaunch({ | |
| 788 | - //url: "/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data, | |
| 789 | - url: "/pages/team/team_success/team_success?ordersn=" + data.data, | |
| 790 | - }) | |
| 789 | + // wx.reLaunch({ | |
| 790 | + // //url: "/pages/payment/pay_success/pay_success?type=1&order_sn="+data.data, | |
| 791 | + // url: "/pages/team/team_success/team_success?ordersn=" + data.data, | |
| 792 | + // }) | |
| 793 | + | |
| 794 | + wx.redirectTo({ | |
| 795 | + url: "/packageC/pages/luckyGo/luckyGo_details/luckyGo_details?type=1&ordersn=" + data.data + | |
| 796 | + "&group_id=" + th.data.param.group_id + "&goods_id=" + th.data.param.goods_id + | |
| 797 | + "&goods_name=" + th.data.bn_goods.goods_name, | |
| 798 | + }); | |
| 799 | + | |
| 791 | 800 | }, 1000) |
| 792 | 801 | }, function() { |
| 793 | 802 | //支付失败 | ... | ... |
packageC/pages/luckyGo/luckyGo_details/luckyGo_details.js
| ... | ... | @@ -306,16 +306,18 @@ Page({ |
| 306 | 306 | // if(ct_price==0) ct_price=min_price; |
| 307 | 307 | // } |
| 308 | 308 | |
| 309 | + | |
| 309 | 310 | //获取大家都在团信息 |
| 310 | - getApp().request.promiseGet("/api/weshop/teamlist/pageteam/1?store_id="+ os.stoid +"&is_end=0&is_show=1" , { | |
| 311 | - data:{page:1,pageSize:2} | |
| 312 | - }).then(res => { | |
| 313 | - if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ | |
| 314 | - pageteam = res.data.data.pageData; | |
| 315 | - ee.setData({pageteam: pageteam,}) | |
| 316 | - } | |
| 311 | + // getApp().request.promiseGet("/api/weshop/teamlist/pageteam/1?store_id="+ os.stoid +"&is_end=0&is_show=1" , { | |
| 312 | + // data:{page:1,pageSize:2} | |
| 313 | + // }).then(res => { | |
| 314 | + // if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length>0){ | |
| 315 | + // pageteam = res.data.data.pageData; | |
| 316 | + // ee.setData({pageteam: pageteam,}) | |
| 317 | + // } | |
| 317 | 318 | |
| 318 | - }) | |
| 319 | + // }) | |
| 320 | + | |
| 319 | 321 | |
| 320 | 322 | //--当是成团的时候的操作-- |
| 321 | 323 | // if(order.pt_status==2 || order.pt_status==4 || order.pt_status==5){ |
| ... | ... | @@ -467,8 +469,10 @@ Page({ |
| 467 | 469 | scene += "_" + getApp().globalData.room_id; |
| 468 | 470 | }; |
| 469 | 471 | ///二微码 |
| 470 | - var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + | |
| 471 | - os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo"; | |
| 472 | + // var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + | |
| 473 | + // os.stoid + "?sceneValue=" + scene + "&pageValue=packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo"; | |
| 474 | + var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + | |
| 475 | + os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo"; | |
| 472 | 476 | |
| 473 | 477 | |
| 474 | 478 | // 读取文件成功则OK-- |
| ... | ... | @@ -954,32 +958,41 @@ Page({ |
| 954 | 958 | |
| 955 | 959 | //------ 分享配置 -------- |
| 956 | 960 | onShareAppMessage: function (e) { |
| 957 | - var th=this; | |
| 958 | - var scene=this.data.teamgroup.id; | |
| 959 | - var url="/pages/team/team_show/team_show?tg_id="+scene; | |
| 960 | - //--分享图片-- | |
| 961 | - var img=th.data.iurl+th.data.teamlist.share_imgurl; | |
| 962 | - //--把会员分享出去-- | |
| 963 | - if(getApp().globalData.user_id){ | |
| 964 | - if(url.indexOf("?")>0) | |
| 965 | - url+="&first_leader="+getApp().globalData.user_id; | |
| 966 | - else | |
| 967 | - url+="?first_leader="+getApp().globalData.user_id; | |
| 961 | + var pagePath = `packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=${this.data.param.goods_id}&prom_type=9&group_id=${this.data.param.group_id}`; //当前页面url | |
| 962 | + console.log('pagePath=====xxxxxx>', pagePath); | |
| 963 | + var imgPath = this.data.iurl + this.data.luckyGoInfo.original_img; | |
| 964 | + if (pagePath.indexOf('/') != 0) { | |
| 965 | + pagePath = '/' + pagePath; | |
| 968 | 966 | } |
| 969 | - // console.log('url+++++>>>>>', url, th.data.teamlist.title); | |
| 970 | - | |
| 971 | - var share_title=th.data.teamlist.title; | |
| 972 | - if(th.data.teamlist.share_title){ | |
| 973 | - share_title=th.data.teamlist.share_title; | |
| 967 | + if(getApp().globalData.user_id){ | |
| 968 | + | |
| 969 | + if(pagePath.indexOf("?")>0){ | |
| 970 | + pagePath+="&first_leader="+getApp().globalData.user_id; | |
| 971 | + }else{ | |
| 972 | + pagePath+="?first_leader="+getApp().globalData.user_id; | |
| 973 | + } | |
| 974 | 974 | } |
| 975 | - | |
| 976 | 975 | return { |
| 977 | - path:url, | |
| 978 | - title: share_title, | |
| 979 | - imageUrl: img, | |
| 976 | + title: "邀你一起参加幸运购", | |
| 977 | + path: pagePath, | |
| 978 | + imageUrl: imgPath, | |
| 980 | 979 | } |
| 981 | 980 | }, |
| 982 | 981 | |
| 982 | + // onShareTimeline() { | |
| 983 | + // // var store_name = getApp().globalData.config ? getApp().globalData.config.store_name:''; | |
| 984 | + // // var pagePath = this.route; //当前页面url | |
| 985 | + | |
| 986 | + // // if(!store_name) store_name = getApp().globalData.setting.appName; | |
| 987 | + // // if (pagePath.indexOf('/') != 0) { | |
| 988 | + // // pagePath = '/' + pagePath; | |
| 989 | + // // } | |
| 990 | + // // return { | |
| 991 | + // // title: store_name + '-幸运购活动列表', | |
| 992 | + // // path: pagePath, | |
| 993 | + // // } | |
| 994 | + // }, | |
| 995 | + | |
| 983 | 996 | clickShare() { |
| 984 | 997 | this.setData({ |
| 985 | 998 | share_hidden: true, | ... | ... |
packageC/pages/luckyGo/luckyGo_details/luckyGo_details.wxml
| ... | ... | @@ -16,7 +16,11 @@ |
| 16 | 16 | <view class="flex-vertical-between"> |
| 17 | 17 | <view> |
| 18 | 18 | <view class="fs40 xc-wc rmb">{{filters.price(luckyGoInfo.group_price)}}</view> |
| 19 | - <view class="fs22 word-line c-7b">零售价<text class="rmb">{{luckyGoInfo.market_price}}</text></view> | |
| 19 | + <view class="fs22 word-line c-7b"> | |
| 20 | + <!-- 手店价<text class="rmb">{{luckyGoInfo.shop_price}}</text> --> | |
| 21 | + <!-- <block wx:if="{{card_field && sele_g[card_field]>0}}"><text class="rmb lh1">{{sele_g[card_field]}}</text></block> | |
| 22 | + <block wx:else><text class="rmb lh1">{{sele_g.shop_price}}</text></block> --> | |
| 23 | + </view> | |
| 20 | 24 | </view> |
| 21 | 25 | <view class="xc-wc fs24"> |
| 22 | 26 | <view> |
| ... | ... | @@ -202,7 +206,7 @@ |
| 202 | 206 | </view> |
| 203 | 207 | <view class="mgl20 t-l"> |
| 204 | 208 | <view>{{item.nickname}}</view> |
| 205 | - <view class="c-7b">参团编号：<text class="c-red">{{item.team_sn}}</text></view> | |
| 209 | + <!-- <view class="c-7b">参团编号：<text class="c-red">{{item.team_sn}}</text></view> --> | |
| 206 | 210 | </view> |
| 207 | 211 | </view> |
| 208 | 212 | |
| ... | ... | @@ -320,7 +324,7 @@ |
| 320 | 324 | </block> |
| 321 | 325 | |
| 322 | 326 | <!-- 分享控件，底部弹出 --> |
| 323 | -<share id="share_button" bind:send="send" bind:cancel="cancel" bind:share_img="saveImageToPhotosAlbum" wx:if="{{share_hidden}}"></share> | |
| 327 | +<share id="share_button" bind:send="onShareAppMessage" bind:cancel="cancel" bind:share_img="saveImageToPhotosAlbum" wx:if="{{share_hidden}}"></share> | |
| 324 | 328 | |
| 325 | 329 | |
| 326 | 330 | <view wx:if="{{showPoster}}"> |
| ... | ... | @@ -346,7 +350,6 @@ |
| 346 | 350 | <!-- 遮罩层 --> |
| 347 | 351 | <view class="mask" bindtap="close_all" catchtouchmove="true" wx:if="{{showRules}}"></view> |
| 348 | 352 | <!-- 规则详情和提示信息弹窗 --> |
| 349 | - <!-- <view class="rule-pop-container" wx:if="{{showRule}}"> --> | |
| 350 | 353 | <view class="rule-pop-container" wx:if="{{showRules}}"> |
| 351 | 354 | <view class="pop-title">规则详情 |
| 352 | 355 | <text class="iconfont icon-guan" bindtap="closeRules"></text> |
| ... | ... | @@ -365,7 +368,7 @@ |
| 365 | 368 | |
| 366 | 369 | |
| 367 | 370 | <view class="pdv20"> |
| 368 | - <view class="btn" bindtap="closeRule">我知道了</view> | |
| 371 | + <view class="btn" bindtap="closeRules">我知道了</view> | |
| 369 | 372 | </view> |
| 370 | 373 | </view> |
| 371 | 374 | ... | ... |
packageC/pages/luckyGo/luckyGo_goodsInfo/buy_pt.wxml
| ... | ... | @@ -18,7 +18,8 @@ |
| 18 | 18 | ￥ {{sele_g.shop_price}} |
| 19 | 19 | </block> |
| 20 | 20 | </view> |
| 21 | - <view class="spec-goods-price" wx:else>￥ {{prom_price || filters.div100(luckGoInfo.group_price)}}</view> | |
| 21 | + <view class="spec-goods-price" wx:else>￥ {{filters.div100(luckGoInfo.group_price)}}</view> | |
| 22 | + <!-- <view class="spec-goods-price" wx:else>￥ bbb{{prom_price || filters.div100(luckGoInfo.group_price)}}</view> --> | |
| 22 | 23 | </view> |
| 23 | 24 | |
| 24 | 25 | <block wx:if="{{is_normal==1}}"> |
| ... | ... | @@ -28,7 +29,7 @@ |
| 28 | 29 | <view class="spec-goods-stock" wx:if="{{def_pick_store && def_pick_store.CanOutQty}}">可售：{{def_pick_store.CanOutQty}}</view> |
| 29 | 30 | <view class="spec-goods-stock" wx:else>可售:0</view> |
| 30 | 31 | </block> |
| 31 | - <block wx:else><view class="spec-goods-stock">可售：{{sele_g.store_count}}</view></block> | |
| 32 | + <block wx:else><view class="spec-goods-stock">可售：{{sele_g.store_count}}</view></block> | |
| 32 | 33 | </view> |
| 33 | 34 | </block> |
| 34 | 35 | <!-- <block wx:if="{{is_normal==0}}"> | ... | ... |
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.js
| ... | ... | @@ -273,6 +273,9 @@ Page({ |
| 273 | 273 | }], |
| 274 | 274 | |
| 275 | 275 | |
| 276 | + luckGoInfo: {}, | |
| 277 | + showDetails: false, | |
| 278 | + | |
| 276 | 279 | }, |
| 277 | 280 | |
| 278 | 281 | //------初始化加载---------- |
| ... | ... | @@ -303,6 +306,40 @@ Page({ |
| 303 | 306 | prom_id, |
| 304 | 307 | }); |
| 305 | 308 | } |
| 309 | + | |
| 310 | + | |
| 311 | + // 检查是否已经购买参团 | |
| 312 | + getApp().request.get("/api/weshop/prom/luckyOrder/getUserOrderInfo/" + o.stoid + "/" + oo.user_id + "/" + prom_id, { | |
| 313 | + success: function(res) { | |
| 314 | + console.log('505=====>', res.data.data); | |
| 315 | + if(res.data.code == 0) { | |
| 316 | + th.setData({ | |
| 317 | + showDetails: true, | |
| 318 | + buyInfo: res.data.data, | |
| 319 | + }); | |
| 320 | + } else { | |
| 321 | + th.setData({ | |
| 322 | + showDetails: false, | |
| 323 | + }); | |
| 324 | + }; | |
| 325 | + } | |
| 326 | + }); | |
| 327 | + // api/weshop/prom/luckyOrder/getUserOrderInfo/{store_id}/{user_id}/{aid} | |
| 328 | + // getApp().request.promiseGet("/api/weshop/pickup/list", { | |
| 329 | + // data: { store_id: os.stoid, pickup_id: e.pickup_id, lat: th.data.lat, lon: th.data.lon,is_pos:1 }, | |
| 330 | + // }).then(res => { | |
| 331 | + // if (res.data.code == 0) { | |
| 332 | + // e = res.data.data.pageData[0]; | |
| 333 | + // if (e) { | |
| 334 | + // e.is_no_dis = ee.is_no_dis; | |
| 335 | + // appd.pk_store = e; | |
| 336 | + // that.set_def_storage(e); | |
| 337 | + // } | |
| 338 | + | |
| 339 | + // } | |
| 340 | + // }) | |
| 341 | + | |
| 342 | + | |
| 306 | 343 | // console.log('type********>>',this.data.prom_type); |
| 307 | 344 | //-- 自定义海报 -- |
| 308 | 345 | // getApp().request.promiseGet("/api/weshop/goods/poster/page", { |
| ... | ... | @@ -1729,9 +1766,12 @@ Page({ |
| 1729 | 1766 | if (e.is_normal == 1) { |
| 1730 | 1767 | this.check_nor_promgood(e.goods_id, function (res) { |
| 1731 | 1768 | if (res && res.cat_id) { |
| 1732 | - e.prom_type = 0; | |
| 1769 | + e.prom_type = 3; | |
| 1733 | 1770 | e.prom_id = res.cat_id; |
| 1734 | - } | |
| 1771 | + } else { | |
| 1772 | + e.prom_type = 0; | |
| 1773 | + // e.prom_id = 0; | |
| 1774 | + } | |
| 1735 | 1775 | s.set_b_now(e); |
| 1736 | 1776 | /*-- |
| 1737 | 1777 | wx.redirectTo({ |
| ... | ... | @@ -1739,8 +1779,8 @@ Page({ |
| 1739 | 1779 | });--*/ |
| 1740 | 1780 | |
| 1741 | 1781 | console.log('11111111111111111111111111======》'); |
| 1742 | - getApp().goto("/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart?is_bnow=1&goods_id=" + e.goods_id); | |
| 1743 | - // getApp().goto("/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart?is_bnow=1&group_id=" + th.data.group_id +"&goods_id=" + e.goods_id + "&alert=" + th.data.luckGoInfo.lc_alert); | |
| 1782 | + // getApp().goto("/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart?is_bnow=1&goods_id=" + e.goods_id); | |
| 1783 | + getApp().goto("/packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart?is_bnow=1&group_id=" + th.data.group_id +"&goods_id=" + e.goods_id + "&alert=" + th.data.luckGoInfo.lc_alert); | |
| 1744 | 1784 | |
| 1745 | 1785 | }) |
| 1746 | 1786 | } else { |
| ... | ... | @@ -4040,11 +4080,12 @@ Page({ |
| 4040 | 4080 | newd['prom_id'] = e.act_id; |
| 4041 | 4081 | } |
| 4042 | 4082 | console.log('aaaaa'); |
| 4083 | + newd['prom_type'] = 0; | |
| 4043 | 4084 | th.buyNow(newd); |
| 4044 | 4085 | }); |
| 4045 | 4086 | } |
| 4046 | 4087 | else { |
| 4047 | - console.log('bbbb'); | |
| 4088 | + // 点击立即参团 | |
| 4048 | 4089 | th.buyNow_pt(newd); |
| 4049 | 4090 | }; |
| 4050 | 4091 | }) |
| ... | ... | @@ -4512,8 +4553,10 @@ Page({ |
| 4512 | 4553 | scene += "_" + getApp().globalData.room_id; |
| 4513 | 4554 | } |
| 4514 | 4555 | ///二微码 |
| 4515 | - var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + | |
| 4516 | - os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo"; | |
| 4556 | + var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + | |
| 4557 | + os.stoid + "?sceneValue=" + scene + "&pageValue=pages/goods/goodsInfo/goodsInfo"; | |
| 4558 | + // var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + | |
| 4559 | + // os.stoid + "?sceneValue=" + scene + "&pageValue=packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo"; | |
| 4517 | 4560 | |
| 4518 | 4561 | console.log(path3); |
| 4519 | 4562 | |
| ... | ... | @@ -4630,9 +4673,9 @@ Page({ |
| 4630 | 4673 | context.setFillStyle("red") |
| 4631 | 4674 | |
| 4632 | 4675 | |
| 4633 | - var pri0 = th.data.data.shop_price; | |
| 4634 | - if (th.data.prom_act) | |
| 4635 | - pri0 = th.data.prom_act.price; | |
| 4676 | + var pri0 = th.data.luckGoInfo.group_price; | |
| 4677 | + // if (th.data.prom_act) | |
| 4678 | + // pri0 = th.data.prom_act.price; | |
| 4636 | 4679 | pri0 = parseFloat(pri0).toFixed(2); |
| 4637 | 4680 | var wd1 = th.data.screenWidth - ut.measureText(pri0, 31 * unit) - 25; |
| 4638 | 4681 | context.fillText("￥", wd1 - 15, 185 * unit); |
| ... | ... | @@ -5202,7 +5245,7 @@ Page({ |
| 5202 | 5245 | tt(); |
| 5203 | 5246 | }, |
| 5204 | 5247 | fail: function (res) { |
| 5205 | - ee.data.share_goods_img = "../../../images/share/default_g_img.gif"; //分享的图片不能用网络的 | |
| 5248 | + ee.data.share_goods_img = "../../../../images/share/default_g_img.gif"; //分享的图片不能用网络的 | |
| 5206 | 5249 | tt(); |
| 5207 | 5250 | } |
| 5208 | 5251 | }); | ... | ... |
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
| ... | ... | @@ -114,7 +114,10 @@ |
| 114 | 114 | <view class="fs50 val">{{filters.toFix(luckGoInfo.group_price/100,2)}}</view> |
| 115 | 115 | </view> |
| 116 | 116 | <view class="word-line fs20 xc-qtunit-price"> |
| 117 | - 手店价￥{{filters.toFix(data.shop_price,2)}} | |
| 117 | + 手店价 | |
| 118 | + <!-- ￥{{filters.toFix(data.shop_price,2)}} --> | |
| 119 | + <block wx:if="{{card_field && sele_g[card_field]>0}}"><text class="rmb lh1">{{sele_g[card_field]}}</text></block> | |
| 120 | + <block wx:else><text class="rmb lh1">{{sele_g.shop_price}}</text></block> | |
| 118 | 121 | </view> |
| 119 | 122 | </view> |
| 120 | 123 | |
| ... | ... | @@ -270,8 +273,9 @@ |
| 270 | 273 | |
| 271 | 274 | |
| 272 | 275 | <view class="goods-num"> |
| 273 | - <view class="sales">销量：{{data.sales_sum}}件</view> | |
| 274 | - <view class="stock">折扣：{{data.disc}}折</view> | |
| 276 | + <view class="sales">已售：{{data.sales_sum}}件</view> | |
| 277 | + <!-- <view class="sales">销量：{{data.sales_sum}}件</view> --> | |
| 278 | + <!-- <view class="stock">折扣：{{data.disc}}折</view> --> | |
| 275 | 279 | <view class="stock">{{categories3[0].num}}人评价</view> |
| 276 | 280 | </view> |
| 277 | 281 | <view wx:if="{{prom_type==1}}"> |
| ... | ... | @@ -905,12 +909,20 @@ |
| 905 | 909 | <block wx:if="{{(sele_g.store_count>0 && sales_rules==1) || sales_rules==2 }}"> |
| 906 | 910 | <view class="btn-container f1"> |
| 907 | 911 | <view bindtap="openSpecModel_pt" data-ind="1" data-it="1" class="btn-yellow flex f1 fdc jc-center"> |
| 908 | - <view class="lh1"><text class="rmb lh1">{{filters.toFix(data.shop_price,2)}}</text></view> | |
| 912 | + <view class="lh1"> | |
| 913 | + <!-- <text class="rmb lh1">{{filters.toFix(data.shop_price,2)}}</text> --> | |
| 914 | + <block wx:if="{{card_field && sele_g[card_field]>0}}"><text class="rmb lh1">{{sele_g[card_field]}}</text></block> | |
| 915 | + <block wx:else><text class="rmb lh1">{{sele_g.shop_price}}</text></block> | |
| 916 | + </view> | |
| 917 | + <!-- 如果是等级会员，且有等级价 --> | |
| 918 | + | |
| 909 | 919 | <view class="lh1 fs pdt4">单独购买</view> |
| 910 | 920 | </view> |
| 911 | 921 | <!-- data-ind="2" --> |
| 912 | 922 | <!-- openSpecModel_pt --> |
| 913 | - <view class="btn-red f1 flex ai-center jc-center" bindtap="openSpecModel_pt"data-it="0">立即参团</view> | |
| 923 | + <view class="btn-red f1 flex ai-center jc-center" bindtap="go" data-it="0" data-url="/packageC/pages/luckyGo/luckyGo_details/luckyGo_details?group_id={{luckGoInfo.id}}&goods_id={{luckGoInfo.goods_id}}&goods_name={{data.goods_name}}&team_id={{buyInfo.team_id}}&&from=list" wx:if="{{showDetails}}">查看详情</view> | |
| 924 | + <view class="btn-red f1 flex ai-center jc-center" bindtap="openSpecModel_pt" data-it="0" wx:elif="{{!showDetails && (luckGoInfo.goods_num != 0)}}">立即参团</view> | |
| 925 | + <view class="btn-red f1 flex ai-center jc-center" wx:else>已经抢光</view> | |
| 914 | 926 | <!-- <view class="btn-red f1 flex ai-center jc-center" bindtap="addCart" data-openSpecModal_ind="{{openSpecModal_ind}}" data-action="buy">立即参团</view> --> |
| 915 | 927 | </view> |
| 916 | 928 | <!-- <view bindtap="openSpecModel" data-ind="1" class="btn-buy flex fdc jc-center"> |
| ... | ... | @@ -1578,7 +1590,7 @@ |
| 1578 | 1590 | <view class="img-container"><image class="img-block" src="{{iurl + 'miniapp/images/luckDraw/yhq.png'}}"></image></view> |
| 1579 | 1591 | <view class="f1 pdl20"> |
| 1580 | 1592 | <view class="ellipsis-2 popup-title">优惠券-{{i.name}}</view> |
| 1581 | - <view class="fs24 t-r pdt16 c-7b">数量：<text class="c-red">{{i.num}}</text></view> | |
| 1593 | + <view class="fs26 t-r pdt16 c-7b">数量：<text class="c-red">{{i.num}}</text></view> | |
| 1582 | 1594 | </view> |
| 1583 | 1595 | </view> |
| 1584 | 1596 | </block> |
| ... | ... | @@ -1588,7 +1600,7 @@ |
| 1588 | 1600 | <view class="img-container"><image class="img-block" src="{{iurl + 'miniapp/images/luckDraw/fw.png'}}"></image></view> |
| 1589 | 1601 | <view class="f1 pdl20"> |
| 1590 | 1602 | <view class="ellipsis-2 popup-title">服务项目-{{i.name}}</view> |
| 1591 | - <view class="fs24 t-r pdt16 c-7b">数量：<text class="c-red">{{i.num}}</text></view> | |
| 1603 | + <view class="fs26 t-r pdt16 c-7b">数量：<text class="c-red">{{i.num}}</text></view> | |
| 1592 | 1604 | </view> |
| 1593 | 1605 | </view> |
| 1594 | 1606 | </block> |
| ... | ... | @@ -1598,7 +1610,7 @@ |
| 1598 | 1610 | <view class="img-container"><image class="img-block" src="{{iurl + 'miniapp/images/luckDraw/jf.png'}}"></image></view> |
| 1599 | 1611 | <view class="f1 pdl20"> |
| 1600 | 1612 | <view class="ellipsis-2 popup-title">{{luckGoInfo[item.name]}}</view> |
| 1601 | - <view class="fs24 t-r pdt16 c-7b">金额：<text class="c-red">{{filters.div100(luckGoInfo[item.num])}}</text></view> | |
| 1613 | + <view class="fs26 t-r pdt16 c-7b">金额：<text class="c-red">{{filters.div100(luckGoInfo[item.num])}}</text></view> | |
| 1602 | 1614 | </view> |
| 1603 | 1615 | </view> |
| 1604 | 1616 | </block> |
| ... | ... | @@ -1611,7 +1623,7 @@ |
| 1611 | 1623 | </view> |
| 1612 | 1624 | <view class="f1 pdl20"> |
| 1613 | 1625 | <view class="ellipsis-2 popup-title">{{item.name}}</view> |
| 1614 | - <view class="fs24 t-r pdt16 c-7b">数量：<text class="c-red">{{luckGoInfo[item.num]}}</text></view> | |
| 1626 | + <view class="fs26 t-r pdt16 c-7b">数量：<text class="c-red">{{luckGoInfo[item.num]}}</text></view> | |
| 1615 | 1627 | </view> |
| 1616 | 1628 | </view> |
| 1617 | 1629 | </block> | ... | ... |
packageC/pages/luckyGo/luckyGo_list/luckyGo_list.js
| ... | ... | @@ -253,7 +253,7 @@ Page({ |
| 253 | 253 | case 3: { //优惠券 |
| 254 | 254 | app.request.promiseGet('/api/weshop/prom/luckyCoupon/page', { |
| 255 | 255 | data: { |
| 256 | - store_id: os.stoid, | |
| 256 | + store_id: app.globalData.setting.stoid, | |
| 257 | 257 | aid: self.data.currentItemAid, |
| 258 | 258 | } |
| 259 | 259 | }).then(res => { |
| ... | ... | @@ -268,7 +268,7 @@ Page({ |
| 268 | 268 | case 4: { //服务项目 |
| 269 | 269 | app.request.promiseGet('/api/weshop/prom/luckyService/page', { |
| 270 | 270 | data: { |
| 271 | - store_id: os.stoid, | |
| 271 | + store_id: app.globalData.setting.stoid, | |
| 272 | 272 | aid: self.data.currentItemAid, |
| 273 | 273 | } |
| 274 | 274 | }).then(res => { | ... | ... |
packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxml
| ... | ... | @@ -74,7 +74,7 @@ |
| 74 | 74 | <view class="img-container"><image class="img-block" src="{{imghost + 'miniapp/images/luckDraw/jf.png'}}"></image></view> |
| 75 | 75 | <view class="f1"> |
| 76 | 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> | |
| 77 | + <view class="fs24 t-r pdt16 c-7b">金额：<text class="c-red">{{filters.div100((list.pageData[currentItemIndex][item.num]))}}</text></view> | |
| 78 | 78 | </view> |
| 79 | 79 | </view> |
| 80 | 80 | </block> | ... | ... |
packageC/pages/luckyGo/luckyGo_members/luckyGo_members.wxss
packageC/pages/luckyGo/luckyGo_order/luckyGo_order.js
packageC/pages/luckyGo/luckyGo_order/luckyGo_order.wxml
pages/goods/search/search.js
| ... | ... | @@ -146,7 +146,6 @@ Page({ |
| 146 | 146 | for(let i in res.data.data.pageData){ |
| 147 | 147 | let item=res.data.data.pageData[i]; |
| 148 | 148 | item.original_img = th.data.url + item.original_img; |
| 149 | - | |
| 150 | 149 | var url="/api/weshop/activitylist/getGoodActInfo"; |
| 151 | 150 | var req_data={ |
| 152 | 151 | store_id:oo.stoid,goodsidlist:item.goods_id,is_detail:1 |
| ... | ... | @@ -184,7 +183,7 @@ Page({ |
| 184 | 183 | var rd= { |
| 185 | 184 | store_id: oo.stoid, |
| 186 | 185 | presell_id: presell_id, |
| 187 | - goods_id: val.goods_id | |
| 186 | + goods_id: item.goods_id | |
| 188 | 187 | } |
| 189 | 188 | //------获取预售从表---------- |
| 190 | 189 | await getApp().request.promiseGet(url1, { |
| ... | ... | @@ -220,14 +219,13 @@ Page({ |
| 220 | 219 | } |
| 221 | 220 | th.data.requestData.push(item); |
| 222 | 221 | e.setData({requestData: e.data.requestData}); |
| 223 | - e.closeSearchModal(); | |
| 224 | 222 | } |
| 225 | 223 | } |
| 226 | - | |
| 224 | + e.closeSearchModal(); | |
| 227 | 225 | }) |
| 228 | - | |
| 229 | 226 | }, |
| 230 | 227 | onReachBottom: function() { |
| 228 | + this.data.currentPage++ | |
| 231 | 229 | this.data.openSearchModal || e.canloadMore() && this.requestSearch(this.data.requestUrl); |
| 232 | 230 | }, |
| 233 | 231 | openFilterModal: function() { |
| ... | ... | @@ -289,7 +287,7 @@ Page({ |
| 289 | 287 | search: function(t) { |
| 290 | 288 | if ("string" != typeof t || "" == t) return a.showWarning("请输入搜索关键词"); |
| 291 | 289 | this.data.key_str=t; |
| 292 | - this.historyRecord(); | |
| 290 | + this.historyRecord(); | |
| 293 | 291 | this.resetData(), this.requestSearch(this.data.baseUrl + "&key_str=" + encodeURIComponent(t)); |
| 294 | 292 | }, |
| 295 | 293 | ... | ... |
pages/index/index/index.wxml
| ... | ... | @@ -229,7 +229,6 @@ |
| 229 | 229 | |
| 230 | 230 | |
| 231 | 231 | <!--幸运购--> |
| 232 | - <!--幸运购--> | |
| 233 | 232 | <view class="seckill" wx:if="{{luckGo_list && luckGo_list.length != 0}}"> |
| 234 | 233 | <navigator bindtap="go_url" data-url="/packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList" hover-class="none"> |
| 235 | 234 | <view class="seckill-time"> |
| ... | ... | @@ -243,7 +242,7 @@ |
| 243 | 242 | </view> |
| 244 | 243 | </view> |
| 245 | 244 | </navigator> |
| 246 | - <view class="seckill-list luck"> | |
| 245 | + <view class=" luck"> | |
| 247 | 246 | <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 | 247 | <view class="flex ai-center"> |
| 249 | 248 | <view class="img-container"><image class="img-block" src="{{url + item.original_img}}" data-val="{{item.original_img}}" |
| ... | ... | @@ -258,7 +257,8 @@ |
| 258 | 257 | </view> |
| 259 | 258 | <view class="flex jc_sb"> |
| 260 | 259 | <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> | |
| 260 | + <view class="btn fs26 {{item.goods_num == 0 ? 'gray':''}}" wx:if="{{item.goods_num == 0}}">已抢光</view> | |
| 261 | + <view class="btn fs26" wx:else>去参团</view> | |
| 262 | 262 | <!-- &title=狐狸3号测速003&prom_type=7&prom_id=468 --> |
| 263 | 263 | </view> |
| 264 | 264 | </view> | ... | ... |
pages/index/index/index.wxss
| ... | ... | @@ -1130,8 +1130,8 @@ page { |
| 1130 | 1130 | } |
| 1131 | 1131 | |
| 1132 | 1132 | .luck .img-container { |
| 1133 | - width: 200rpx; | |
| 1134 | - height: 200rpx; | |
| 1133 | + width: 220rpx; | |
| 1134 | + height: 220rpx; | |
| 1135 | 1135 | border-radius: 14rpx; |
| 1136 | 1136 | overflow: hidden; |
| 1137 | 1137 | flex-shrink: 0; |
| ... | ... | @@ -1195,3 +1195,7 @@ page { |
| 1195 | 1195 | text-align: center; |
| 1196 | 1196 | } |
| 1197 | 1197 | |
| 1198 | +.luck .btn.gray { | |
| 1199 | + background-color: #ccc; | |
| 1200 | +} | |
| 1201 | + | ... | ... |
pages/user/order_list/order_list.wxml
| ... | ... | @@ -91,7 +91,9 @@ |
| 91 | 91 | <!-- 单个商品 --> |
| 92 | 92 | <!-- wx:if="{{goods.return_btn!=4}}" --> |
| 93 | 93 | <view> |
| 94 | - <navigator class="detail_commodity flex-vertical padding" wx:for="{{item.order_goods}}" wx:for-item="goods" wx:for-index="pinx" url="{{item.ord_url}}?order_id={{item.order_id}}"> | |
| 94 | + <!-- url="/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id={{item.order_id}}" wx:if="{{item.order_goods[0].prom_type==9}}" | |
| 95 | + {{item.ord_url}}?order_id={{item.order_id}} --> | |
| 96 | + <navigator class="detail_commodity flex-vertical padding" wx:for="{{item.order_goods}}" wx:for-item="goods" wx:for-index="pinx" url="{{item.order_goods[0].prom_type==9 ? ('/packageC/pages/luckyGo/luckyGo_order/luckyGo_order?order_id=' + item.order_id):(item.ord_url + '?order_id=' + item.order_id)}}"> | |
| 95 | 97 | <!-- 商品图片 --> |
| 96 | 98 | <navigator class="rel"> |
| 97 | 99 | <image src="{{resourceUrl+goods.original_img}}" binderror="bind_bnerr" lazy-load="{{true}}" data-errorimg="orderList[{{index}}].order_goods[{{pinx}}].original_img"></image> |
| ... | ... | @@ -128,7 +130,10 @@ |
| 128 | 130 | <!-- 商品价格 --> |
| 129 | 131 | <view class="flex-vertical c-tb baseline"> |
| 130 | 132 | <view class="fs24">￥</view> |
| 131 | - <view class="fs26">{{filters.toFix(goods.member_goods_price,2)}}</view> | |
| 133 | + <!-- 幸运购prom_type等于9 --> | |
| 134 | + <!-- 如果是幸运购就显示幸运购参团价格 --> | |
| 135 | + <view class="fs26" wx:if="{{goods.prom_type == 9}}">{{filters.toFix(goods.goods_price,2)}}</view> | |
| 136 | + <view class="fs26" wx:else>{{filters.toFix(goods.member_goods_price,2)}}</view> | |
| 132 | 137 | </view> |
| 133 | 138 | <view class="fs26 c-a9">x{{goods.goods_num}}</view> |
| 134 | 139 | </view> |
| ... | ... | @@ -162,7 +167,8 @@ |
| 162 | 167 | <view class="commodity_money flex baseline" wx:else> |
| 163 | 168 | <view>合计<text wx:if="{{item.discount!=underdefine && item.discount!=null && item.discount!=0}}" style="color:#d60021;">(改)</text>:</view> |
| 164 | 169 | <view class="fs24 c-r">￥</view> |
| 165 | - <view class="c-r">{{filters.toFix(item.order_amount+item.user_money,2)}} | |
| 170 | + <view class="c-r"> | |
| 171 | + {{filters.toFix(item.order_amount+item.user_money,2)}} | |
| 166 | 172 | <text wx:if="{{item.coupon_price}}">+{{item.coupon_price}}元优惠券</text> |
| 167 | 173 | <text wx:if="{{item.integral}}">+{{item.integral}}积分</text> |
| 168 | 174 | </view> | ... | ... |
utils/filter.wxs
| ... | ... | @@ -143,6 +143,10 @@ var filters = { |
| 143 | 143 | return val / 100; |
| 144 | 144 | }, |
| 145 | 145 | |
| 146 | + div100: function(val) { | |
| 147 | + return val / 100; | |
| 148 | + }, | |
| 149 | + | |
| 146 | 150 | // 计算百分比, 不带百分号 |
| 147 | 151 | percent: function(num1, num2) { |
| 148 | 152 | // console.log('百分比',Math.round(num1/num2 * 10000) / 100); |
| ... | ... | @@ -188,5 +192,6 @@ module.exports = { |
| 188 | 192 | difference: filters.difference, |
| 189 | 193 | multiply: filters.multiply, |
| 190 | 194 | price: filters.price, |
| 195 | + div100: filters.div100, | |
| 191 | 196 | JSONStringify: filters.JSONStringify, |
| 192 | 197 | } |
| 193 | 198 | \ No newline at end of file | ... | ... |