Commit 902a928c6437f07d9f294262e9f28977bb674c70
Merge branch 'dev' into 'test'
Dev See merge request !1131
Showing
27 changed files
with
214 additions
and
65 deletions
components/diy_picMax/diy_picMax.js
| 1 | +var ut = require("../../utils/util.js"); | |
| 1 | 2 | Component({ |
| 2 | 3 | properties: { |
| 3 | 4 | object: { |
| ... | ... | @@ -10,7 +11,8 @@ Component({ |
| 10 | 11 | // 这里是一些组件内部数据 |
| 11 | 12 | someData: {}, |
| 12 | 13 | pic_height: 0,//图片组合的高度 |
| 13 | - is_yspan: 0, //是否要严格按照比例来实现 | |
| 14 | + is_yspan: 0, //是否要严格按照比例来实现 | |
| 15 | + is_time_show:0 | |
| 14 | 16 | }, |
| 15 | 17 | ready: function () { |
| 16 | 18 | //-- console.log(this.data.object.data) -- |
| ... | ... | @@ -25,6 +27,26 @@ Component({ |
| 25 | 27 | |
| 26 | 28 | }) |
| 27 | 29 | this.setData({ pic_height: height, is_yspan: is_yspan }) |
| 30 | + | |
| 31 | + | |
| 32 | + var start_time=this.properties.object.start_time; | |
| 33 | + var end_time=this.properties.object.end_time; | |
| 34 | + | |
| 35 | + if(start_time && end_time) { | |
| 36 | + | |
| 37 | + var start_time = Date.parse(new Date(start_time.replace(/-/g, '/'))) / 1000; | |
| 38 | + var end_time = Date.parse(new Date(end_time.replace(/-/g, '/'))) / 1000; | |
| 39 | + var now = ut.gettimestamp(); | |
| 40 | + | |
| 41 | + | |
| 42 | + if (start_time < now && end_time > now) { | |
| 43 | + this.setData({is_time_show: 1}); | |
| 44 | + } | |
| 45 | + }else{ | |
| 46 | + this.setData({is_time_show: 1}); | |
| 47 | + } | |
| 48 | + | |
| 49 | + | |
| 28 | 50 | }, |
| 29 | 51 | methods: { |
| 30 | 52 | //-- 智能跳转到页面 -- | ... | ... |
components/diy_picMax/diy_picMax.wxml
| 1 | 1 | <!-- 图片组合 --> |
| 2 | +<block wx:if="{{is_time_show}}"> | |
| 2 | 3 | <wxs module="g_filter" src="../diy_notice/g_filter.wxs"></wxs> |
| 3 | 4 | <!-- 如果有纵向合并的时候，要求要按照绝对布局来实现 --> |
| 4 | 5 | <block wx:if="{{is_yspan}}"> |
| ... | ... | @@ -49,4 +50,5 @@ |
| 49 | 50 | </view> |
| 50 | 51 | <view class="picMax-clear"></view> |
| 51 | 52 | </view> |
| 53 | +</block> | |
| 52 | 54 | </block> |
| 53 | 55 | \ No newline at end of file | ... | ... |
packageA/pages/checkin/checkin.wxml
| ... | ... | @@ -79,7 +79,7 @@ |
| 79 | 79 | <view class="date"> |
| 80 | 80 | <block wx:for="{{dateArr}}" wx:for-index="index" wx:for-item="item" wx:key="key"> |
| 81 | 81 | <!-- <view style="{{index ==0?'margin-left:calc(100%/7 * ' + firstDay + ');':''}}width:calc(100%/7);line-height:80rpx;" class="{{index+1==day?'today':''}} {{index+1==day&&isClock?'clockOn':''}}" ><view class="day">{{item}}</view></view> --> |
| 82 | - <view style="{{index ==0?'margin-left:calc(100%/7 * 0);':''}}width:calc(100%/7);line-height:80rpx;" class="{{item.isCheckIn ? 'active':''}} {{res.curbqdaynum&&item.isBq ? 'bq':''}}" bindtap="clickDay" data-day="{{item.num}}"> | |
| 82 | + <view style="width:calc(100% / 7) ; line-height: 80rpx;{{index ==0?'margin-left:calc(100%/7 * 0);':''}}" class="{{item.isCheckIn ? 'active':''}} {{res.curbqdaynum&&item.isBq ? 'bq':''}}" bindtap="clickDay" data-day="{{item.num}}"> | |
| 83 | 83 | <view class="day">{{item.num}}</view> |
| 84 | 84 | </view> |
| 85 | 85 | </block> |
| ... | ... | @@ -93,17 +93,17 @@ |
| 93 | 93 | <view class="jfbuy-container"> |
| 94 | 94 | |
| 95 | 95 | <block wx:if="{{ad_data}}"> |
| 96 | - <swiper class="swiper" circular="true" autoplay="true" indicator-dots="true" interval="2500"> | |
| 96 | + <swiper class="swiper" style="height: {{max_sw_height}}rpx;" circular="true" autoplay="true" indicator-dots="true" interval="2500"> | |
| 97 | 97 | <block wx:for="{{ad_data}}"> |
| 98 | 98 | <navigator url="{{item.ad_weapplink}}" wx:if="{{g_filter.has_char(item.ad_weapplink,'plugin')>=0}}"> |
| 99 | - <swiper-item> | |
| 100 | - <image src="{{item.ad_code}}" data-index="{{index}}" class="slide-image" mode="widthFix" lazy-load="true" /> | |
| 99 | + <swiper-item class="swiper-item"> | |
| 100 | + <image src="{{item.ad_code}}" data-index="{{index}}" mode="widthFix" bindload="imageLoad" class="slide-image" lazy-load="true" /> | |
| 101 | 101 | </swiper-item> |
| 102 | 102 | </navigator> |
| 103 | 103 | |
| 104 | 104 | <view data-url="{{item.ad_weapplink}}" wx:else bindtap="go_url"> |
| 105 | - <swiper-item> | |
| 106 | - <image src="{{item.ad_code}}" class="slide-image" mode="widthFix" lazy-load="true" /> | |
| 105 | + <swiper-item class="swiper-item"> | |
| 106 | + <image src="{{item.ad_code}}" class="slide-image" mode="widthFix" bindload="imageLoad" lazy-load="true" /> | |
| 107 | 107 | </swiper-item> |
| 108 | 108 | </view> |
| 109 | 109 | </block> | ... | ... |
packageA/pages/checkin/checkin.wxss
| ... | ... | @@ -192,7 +192,7 @@ page, |
| 192 | 192 | |
| 193 | 193 | |
| 194 | 194 | .jfbuy-container { |
| 195 | - padding: 60rpx 40rpx 40rpx; | |
| 195 | + padding: 60rpx 25rpx 40rpx; | |
| 196 | 196 | } |
| 197 | 197 | .jfbuy { |
| 198 | 198 | /* border: 2rpx solid black; */ |
| ... | ... | @@ -394,4 +394,17 @@ page, |
| 394 | 394 | } |
| 395 | 395 | .pop_up_no .close_img{ |
| 396 | 396 | width:60rpx; height:60rpx;position:absolute; right:-15px; top:-15rpx; |
| 397 | - } | |
| 398 | 397 | \ No newline at end of file |
| 398 | + } | |
| 399 | + .swiper { | |
| 400 | + width: 700rpx; | |
| 401 | + height: 300rpx; | |
| 402 | + /* background: #cccc; */ | |
| 403 | + } | |
| 404 | + .swiper-item { | |
| 405 | + display: flex; | |
| 406 | + align-items: center; | |
| 407 | + } | |
| 408 | + .slide-image { | |
| 409 | + width: 100%; | |
| 410 | + height: 100%; | |
| 411 | + } | ... | ... |
packageA/pages/myGiftDetails/myGiftDetails.js
| ... | ... | @@ -38,6 +38,14 @@ Page({ |
| 38 | 38 | showBtn: showBtn, |
| 39 | 39 | }) |
| 40 | 40 | |
| 41 | + getApp().getConfig2(function (e) { | |
| 42 | + var json_d = JSON.parse(e.switch_list); | |
| 43 | + self.setData({ | |
| 44 | + bconfig: e, | |
| 45 | + is_retail_price: json_d.is_retail_price || 0 | |
| 46 | + }); | |
| 47 | + }) | |
| 48 | + | |
| 41 | 49 | // console.log('options', options); |
| 42 | 50 | app.isLogin().then(function(data) {//进入页面前已经授权登录成功 |
| 43 | 51 | self.setData({ | ... | ... |
packageA/pages/myGiftDetails/myGiftDetails.wxml
| ... | ... | @@ -36,7 +36,7 @@ |
| 36 | 36 | </block> |
| 37 | 37 | |
| 38 | 38 | </view> |
| 39 | - <view class="fs22 c-a4 line-through mgl10">{{filter.toFix(details.oldprice,2)}}</view> | |
| 39 | + <view class="fs22 c-a4 line-through mgl10">{{is_retail_price?'零售价：':''}}{{filter.toFix(details.oldprice,2)}}</view> | |
| 40 | 40 | </view> |
| 41 | 41 | <view class="fs24 c-a4" wx:if="{{!is_not_start}}">已售{{details.salenum+details.virtualsales}}件</view> |
| 42 | 42 | </view> | ... | ... |
packageA/pages/profile/profile.js
| ... | ... | @@ -1144,7 +1144,13 @@ Page({ |
| 1144 | 1144 | |
| 1145 | 1145 | //-- 需要推荐人 -- |
| 1146 | 1146 | if(this.data.reg_info.introducer_state){ |
| 1147 | - let tjrname = this.data.referee || this.data.fir_user.mobile; | |
| 1147 | + | |
| 1148 | + var tj= this.data.fir_user?this.data.fir_user.mobile:''; | |
| 1149 | + if(!tj){ | |
| 1150 | + tj=this.data.user['fromuser_id']?this.data.user['fromuser_id']:''; | |
| 1151 | + } | |
| 1152 | + | |
| 1153 | + let tjrname = this.data.referee || tj; | |
| 1148 | 1154 | if (tjrname == "" || tjrname == null) { |
| 1149 | 1155 | //app.my_warnning("请输入推荐人", 0, this); |
| 1150 | 1156 | //return false; | ... | ... |
packageA/pages/profile/profile.wxml
| ... | ... | @@ -34,7 +34,7 @@ |
| 34 | 34 | class="user-txt-right f1 pdl20 t-r" /> |
| 35 | 35 | </block> |
| 36 | 36 | |
| 37 | - <block v-else> | |
| 37 | + <block wx:else> | |
| 38 | 38 | <input bindinput="getReferee" bindblur="" disabled="{{user['fromuser_id']}}" |
| 39 | 39 | value="{{user['fromuser_id']?user['fromuser_id']:''}}" data-name="推荐人" class="user-txt-right f1 pdl20 t-r" placeholder="请输入推荐人手机号码或卡号"/> |
| 40 | 40 | </block> | ... | ... |
packageB/pages/user/collect_list/collect_list.js
| ... | ... | @@ -26,12 +26,28 @@ Page({ |
| 26 | 26 | total_collects: 0, |
| 27 | 27 | is_goods: 0, |
| 28 | 28 | pageSize: 8, //分页数量 |
| 29 | - isdelete: 0 | |
| 29 | + isdelete: 0, | |
| 30 | + | |
| 31 | + is_retail_price:0 | |
| 30 | 32 | }, |
| 31 | 33 | onLoad: function() { |
| 32 | 34 | |
| 35 | + var th=this; | |
| 36 | + | |
| 33 | 37 | o.init(this, "", "collects"), |
| 34 | 38 | this.requestCollectList(); |
| 39 | + | |
| 40 | + | |
| 41 | + getApp().getConfig2(function(rs){ | |
| 42 | + //计算等级价相关 | |
| 43 | + var swithc_list=rs.switch_list; | |
| 44 | + var sw_arr=JSON.parse(swithc_list); | |
| 45 | + if(sw_arr.is_retail_price){ | |
| 46 | + th.setData({is_retail_price:1}); | |
| 47 | + } | |
| 48 | + | |
| 49 | + }); | |
| 50 | + | |
| 35 | 51 | }, |
| 36 | 52 | requestCollectList: function() { |
| 37 | 53 | var th = this; | ... | ... |
packageB/pages/user/collect_list/collect_list.wxml
| ... | ... | @@ -49,10 +49,10 @@ |
| 49 | 49 | <view class="fs40">{{item.prom_price?item.prom_price:item.final_price}}</view> |
| 50 | 50 | </view> |
| 51 | 51 | <!-- 原价 --> |
| 52 | -<!-- <view class="flex fs24 line through xc-ash">--> | |
| 53 | -<!-- <view>零售价:</view>--> | |
| 54 | -<!-- <view>￥{{item.market_price}}</view>--> | |
| 55 | -<!-- </view>--> | |
| 52 | + <view wx:if="{{is_retail_price}}" class="flex fs24 line through xc-ash"> | |
| 53 | + <view>零售价:</view> | |
| 54 | + <view>￥{{item.market_price}}</view> | |
| 55 | + </view> | |
| 56 | 56 | </view> |
| 57 | 57 | |
| 58 | 58 | <view class="money_right flex line" wx:if="{{!editEd}}"> | ... | ... |
packageC/pages/presell/goodsInfo/goodsInfo.js
| ... | ... | @@ -311,7 +311,7 @@ Page({ |
| 311 | 311 | } |
| 312 | 312 | //-- 如果有room_id的获取 -- |
| 313 | 313 | if (gid_str.length > 2 && gid_str[3]) { |
| 314 | - room_id = gid_str[2]; | |
| 314 | + room_id = gid_str[3]; | |
| 315 | 315 | room_user_share = 1; |
| 316 | 316 | } |
| 317 | 317 | } |
| ... | ... | @@ -379,7 +379,7 @@ Page({ |
| 379 | 379 | is_closecoupon: json_d.is_closecoupon, |
| 380 | 380 | is_newsales_rules: json_d.is_newsales_rules |
| 381 | 381 | }); |
| 382 | - ee.init(gid); | |
| 382 | + // ee.init(gid); | |
| 383 | 383 | //------几人评价------- |
| 384 | 384 | //n.init(th, "", "comments"); |
| 385 | 385 | |
| ... | ... | @@ -569,12 +569,16 @@ Page({ |
| 569 | 569 | is_share: 0, |
| 570 | 570 | }, |
| 571 | 571 | }).then(res1 => { |
| 572 | + console.log('优惠券+++++++++++++++++'); | |
| 573 | + console.log(res1); | |
| 572 | 574 | fir_quan = res1.data.data.pageData; |
| 573 | 575 | }) |
| 574 | 576 | } |
| 575 | 577 | //过滤不是本商品的单品优惠券------------------- |
| 576 | 578 | if (fir_quan.length > 0) { |
| 577 | - let goodInfo = ee.data.data || {} | |
| 579 | + let goodInfo = th.data.data || {} | |
| 580 | + console.log('商品++++++++++++++++++++++'); | |
| 581 | + console.log(goodInfo); | |
| 578 | 582 | for (let index = fir_quan.length - 1; index >= 0; index--) { |
| 579 | 583 | if (fir_quan[index].useobjecttype == 20) { //判断是单品优惠券 |
| 580 | 584 | if (fir_quan[index].useobjectno != goodInfo.goods_sn) { |
| ... | ... | @@ -583,6 +587,7 @@ Page({ |
| 583 | 587 | } |
| 584 | 588 | } |
| 585 | 589 | } |
| 590 | + | |
| 586 | 591 | let arr = [] |
| 587 | 592 | let length = fir_quan.length |
| 588 | 593 | if (length <= 3) { |
| ... | ... | @@ -787,7 +792,7 @@ Page({ |
| 787 | 792 | sele_g: t.data.data, |
| 788 | 793 | userInfo: getApp().globalData.userInfo, |
| 789 | 794 | }); |
| 790 | - | |
| 795 | + ee.init(gid); | |
| 791 | 796 | //获取门店 |
| 792 | 797 | ee.get_sto(); |
| 793 | 798 | ee.get_sku(o.stoid, t.data.data, gid); |
| ... | ... | @@ -846,7 +851,7 @@ Page({ |
| 846 | 851 | ee.data.enterAddressPage && (this.data.enterAddressPage = !1); |
| 847 | 852 | }) |
| 848 | 853 | |
| 849 | - | |
| 854 | + | |
| 850 | 855 | |
| 851 | 856 | }, |
| 852 | 857 | enterAddress: function () { |
| ... | ... | @@ -2769,6 +2774,7 @@ Page({ |
| 2769 | 2774 | this.saveImageToPhotosAlbumDef() |
| 2770 | 2775 | } |
| 2771 | 2776 | }, |
| 2777 | + | |
| 2772 | 2778 | //--定义的保存图片方法，分享团--- |
| 2773 | 2779 | saveImageToPhotosAlbum: function () { |
| 2774 | 2780 | //--先判断会员状态-- |
| ... | ... | @@ -3133,19 +3139,18 @@ Page({ |
| 3133 | 3139 | var app = getApp(); |
| 3134 | 3140 | var unit = that.data.screenWidth / 750 * 1.35; //基础单位， |
| 3135 | 3141 | var path2 = that.data.data.original_img; |
| 3136 | - var scene = th.data.gid + ""; | |
| 3137 | - scene += "." + th.data.sele_g.prom_type + "." + th.data.sele_g.prom_id; | |
| 3138 | 3142 | |
| 3139 | - var user_id = getApp().globalData.user_id ? getApp().globalData.user_id : 0; | |
| 3140 | - if (user_id > 0) { | |
| 3141 | - scene += "_" + user_id; | |
| 3142 | - } | |
| 3143 | - //-- 如果不是会员分享过来的要分享给别人 -- | |
| 3144 | - if (getApp().globalData.room_id && th.data.data.goods_id == getApp().globalData.room_goods_id && !getApp().globalData.room_user_share) { | |
| 3145 | - //固定房间是第3个字符 | |
| 3146 | - if (!user_id) scene += "_0"; | |
| 3147 | - scene += "_" + getApp().globalData.room_id; | |
| 3148 | - } | |
| 3143 | + var scene = th.data.gid + "_"+th.data.presellList.id; | |
| 3144 | + var user_id = getApp().globalData.user_id ? getApp().globalData.user_id : 0; | |
| 3145 | + if (user_id > 0) { | |
| 3146 | + scene += "_" + user_id; | |
| 3147 | + } | |
| 3148 | + //-- 如果不是会员分享过来的要分享给别人 -- | |
| 3149 | + if (getApp().globalData.room_id && th.data.data.goods_id == getApp().globalData.room_goods_id && !getApp().globalData.room_user_share) { | |
| 3150 | + //固定房间是第3个字符 | |
| 3151 | + if (!user_id) scene += "_0"; | |
| 3152 | + scene += "_" + getApp().globalData.room_id; | |
| 3153 | + } | |
| 3149 | 3154 | |
| 3150 | 3155 | ///二微码 |
| 3151 | 3156 | var path3 = os.url + "/api/wx/open/app/user/getWeAppEwm/" + |
| ... | ... | @@ -4837,20 +4842,24 @@ Page({ |
| 4837 | 4842 | } |
| 4838 | 4843 | }) |
| 4839 | 4844 | |
| 4845 | + // console.log('是否继续查询', gnext) | |
| 4840 | 4846 | if (!gnext) { |
| 4841 | 4847 | return false; |
| 4842 | 4848 | } |
| 4849 | + // console.log('继续查询') | |
| 4843 | 4850 | |
| 4844 | 4851 | var userInfo = getApp().globalData.userInfo; |
| 4845 | - var pre_data = { store_id: os.stoid, is_end: 0, timetype: 1, isuse: 1, prom_type: 8, prom_id: presell_id, pageSize: 1000 }; | |
| 4852 | + // timetype: 1, | |
| 4853 | + var pre_data = { store_id: os.stoid, is_end: 0, isuse: 1, prom_type: 8, prom_id: presell_id, pageSize: 1000 }; | |
| 4846 | 4854 | if (userInfo) { |
| 4847 | 4855 | pre_data.user_id = userInfo.user_id; |
| 4848 | 4856 | } |
| 4849 | 4857 | await getApp().request.promiseGet("/api/weshop/marketing/marketingPresellList/page", { |
| 4850 | 4858 | data: pre_data, |
| 4851 | 4859 | }).then(e => { |
| 4860 | + // console.log('查询marketingPresellList', e) | |
| 4852 | 4861 | if (e.data.code == 0 && e.data.data.pageData && e.data.data.pageData.length > 0) { |
| 4853 | - | |
| 4862 | + // console.log('匹配resellList') | |
| 4854 | 4863 | th.data.all_pre_goods = e.data.data.pageData; |
| 4855 | 4864 | var idx = e.data.data.pageData.findIndex(function (ele) { |
| 4856 | 4865 | return ele.id == th.data.presellList.id; | ... | ... |
packageC/pages/presell/goodsInfo/goodsInfo.wxml
| ... | ... | @@ -83,7 +83,7 @@ |
| 83 | 83 | <view class="fs28 val" style="margin-right:100rpx">￥{{presellList.presell_price}}</view> |
| 84 | 84 | <!-- <view class="word-line fs26 xc-qtunit-price">--> |
| 85 | 85 | <!-- 零售价￥{{filters.toFix(data.market_price,2)}}--> |
| 86 | -<!-- </view>--> | |
| 86 | +<!-- </view>--> | |
| 87 | 87 | </view> |
| 88 | 88 | |
| 89 | 89 | |
| ... | ... | @@ -148,6 +148,24 @@ |
| 148 | 148 | </view> |
| 149 | 149 | <view class="t_gz" wx:if="{{is_show_gz==1}}">{{prom_act.remark}}</view> |
| 150 | 150 | </view> |
| 151 | + <!-- 许程 7.24暂时注释 --> | |
| 152 | + <view class="bdt16" wx:if="{{ prom_type!=1 && prom_act.kttype!=3&&prom_act.kttype!=2&&prom_act.kttype!=1 && is_closecoupon!=1 && sele_g.is_xz_yh !=1}}"> | |
| 153 | + <view class="cx-frame flex" style="position: relative" wx:if="{{fir_quan.length>0}}"> | |
| 154 | + <view class="cx-sizs fs30">领券</view> | |
| 155 | + <view class="flex ai_c f1 pdh20"> | |
| 156 | + <view class="xc-coupon-fram" wx:for="{{fir_quan}}" wx:key="id"> | |
| 157 | + <view class="circle xc-circular xc-one"></view> | |
| 158 | + <view class="xc-coupon t-c four-level-word"> | |
| 159 | + 满{{item.condition}}减{{item.money}} | |
| 160 | + </view> | |
| 161 | + <view class="circle xc-circular xc-two"></view> | |
| 162 | + </view> | |
| 163 | + </view> | |
| 164 | + <view data-coupon="1" bindtap="switchCoupon" class="cx-obtain-coupon wsize"> | |
| 165 | + <text class="bg_jj"></text> | |
| 166 | + </view> | |
| 167 | + </view> | |
| 168 | + </view> | |
| 151 | 169 | <!-- 门店收货地址 --> |
| 152 | 170 | <view class="xc-address_frame bdt16 flex-vertical xc-ash {{def_pick_store!=null?'sn_height':'on_height'}}"> |
| 153 | 171 | <view class="address_frame" bindtap="choice_store" data-ind="0"> | ... | ... |
pages/activity/seckill_list/seckill_list.js
| ... | ... | @@ -84,9 +84,9 @@ Page({ |
| 84 | 84 | |
| 85 | 85 | |
| 86 | 86 | onShow: function (t) { |
| 87 | - getApp().check_can_share(); | |
| 87 | + getApp().check_can_share(); | |
| 88 | 88 | this.data.is_timer = 1; |
| 89 | - this.data.currentPage = 1; | |
| 89 | + //this.data.currentPage = 1;不能清空未1 | |
| 90 | 90 | var th = this; |
| 91 | 91 | //设置全局定时器 |
| 92 | 92 | th.data.timer = setInterval(function () { | ... | ... |
pages/activity/seckill_list/seckill_list.wxml
| ... | ... | @@ -68,7 +68,7 @@ |
| 68 | 68 | </view> |
| 69 | 69 | <view class="fs40 flex xc-buttom-money {{type==1?'xc-wc':'blue_c'}}" > |
| 70 | 70 | <view class="fs28" style="line-height: 16px;">￥</view> |
| 71 | - <text>{{item.price}}--{{is_retail_price}}--</text> | |
| 71 | + <text>{{item.price}}</text> | |
| 72 | 72 | <span wx:if="{{is_retail_price}}" class="underline fs20">零售价￥{{item.market_price}}</span> |
| 73 | 73 | </view> |
| 74 | 74 | ... | ... |
pages/cart/cart/cart.js
pages/cart/cart2/cart2.js
| ... | ... | @@ -440,7 +440,7 @@ Page({ |
| 440 | 440 | |
| 441 | 441 | }).then(res1 => { |
| 442 | 442 | if(res1.data.code==0){ |
| 443 | - get_gd=res.data.data; | |
| 443 | + get_gd=res1.data.data; | |
| 444 | 444 | } |
| 445 | 445 | }) |
| 446 | 446 | distr_t=pick.distr_type || get_gd.distr_type; |
| ... | ... | @@ -669,7 +669,8 @@ Page({ |
| 669 | 669 | } |
| 670 | 670 | } |
| 671 | 671 | //-- 判断一下，获取搭配购的消息 -- |
| 672 | - if(item1.prom_type==0 || item1.prom_type==5){ | |
| 672 | + if((item1.prom_type==0 || item1.prom_type==5) && (!carr[i].collocationList || !carr[i].collocationList.length)) { | |
| 673 | + | |
| 673 | 674 | await th.set_collection(item1,carr,i); |
| 674 | 675 | } |
| 675 | 676 | } |
| ... | ... | @@ -1088,7 +1089,7 @@ Page({ |
| 1088 | 1089 | } |
| 1089 | 1090 | |
| 1090 | 1091 | //-- 判断是不是可以收藏 -- |
| 1091 | - if(gd.prom_type ==5){ | |
| 1092 | + if(gd.prom_type ==5 && !th.data.all_collocation_list.length){ | |
| 1092 | 1093 | await th.set_collection(gd); |
| 1093 | 1094 | } |
| 1094 | 1095 | |
| ... | ... | @@ -5632,6 +5633,8 @@ Page({ |
| 5632 | 5633 | item.goods_num=1; |
| 5633 | 5634 | item.goods_price=item.price; |
| 5634 | 5635 | item.is_collocation=1; |
| 5636 | + item.prom_type=5; | |
| 5637 | + | |
| 5635 | 5638 | |
| 5636 | 5639 | var coll_arr=[]; |
| 5637 | 5640 | if(this.data.collocation_goods && this.data.collocation_goods.length){ | ... | ... |
pages/giftpack/giftpacklist/giftpacklist.js
pages/giftpack/giftpacklist/giftpacklist.wxml
| ... | ... | @@ -64,7 +64,7 @@ |
| 64 | 64 | </view> |
| 65 | 65 | <view class="top_foot data-v-3a5b7e36"> |
| 66 | 66 | <view class="top_foot_price data-v-3a5b7e36"> |
| 67 | - <text class="data-v-3a5b7e36">{{giftPosPrice+"元"}}</text> | |
| 67 | + <text class="data-v-3a5b7e36"> {{is_retail_price?'零售价：':''}}{{giftPosPrice+"元"}}</text> | |
| 68 | 68 | </view> |
| 69 | 69 | <view class="top_foot_qty data-v-3a5b7e36"> |
| 70 | 70 | <text class="data-v-3a5b7e36" wx:if="{{!flag}}">{{"已售:"+giftQty+"件"}}</text> | ... | ... |
pages/goods/com_screen.js
| ... | ... | @@ -9,9 +9,22 @@ module.exports = { |
| 9 | 9 | |
| 10 | 10 | var url = th.data.requestUrl; |
| 11 | 11 | if (th.data.tabname!=ob.value){ |
| 12 | - th.setData({ tabname: ob.value, adname: "desc" }); | |
| 12 | + | |
| 13 | + var txt='desc'; | |
| 14 | + if(ob.value=='sort') txt='asc' | |
| 15 | + th.setData({ tabname: ob.value, adname:txt }); | |
| 16 | + } | |
| 17 | + th.resetData(); | |
| 18 | + | |
| 19 | + //开始点击分类 | |
| 20 | + if(th.requestGoodsList) { | |
| 21 | + //-- 开始点击分类 -- | |
| 22 | + th.requestGoodsList(url); | |
| 23 | + }else if(th.requestSearch){ | |
| 24 | + //-- 重新开始搜索 -- | |
| 25 | + th.requestSearch(url); | |
| 13 | 26 | } |
| 14 | - th.resetData(), th.requestGoodsList(url); | |
| 27 | + | |
| 15 | 28 | }, |
| 16 | 29 | |
| 17 | 30 | //-- 获取列表 -- |
| ... | ... | @@ -168,6 +181,11 @@ module.exports = { |
| 168 | 181 | //进行筛选 |
| 169 | 182 | this.set_screen(url,th); |
| 170 | 183 | |
| 184 | + th.setData({ | |
| 185 | + tabname:"sort", //排序的字段 | |
| 186 | + adname:"asc", //升降的字段 | |
| 187 | + }) | |
| 188 | + | |
| 171 | 189 | //开始点击分类 |
| 172 | 190 | if(th.requestGoodsList) { |
| 173 | 191 | //-- 开始点击分类 -- | ... | ... |
pages/goods/goodsList/goodsList.js
| ... | ... | @@ -291,7 +291,7 @@ Page({ |
| 291 | 291 | if(!user_id) user_id=0; |
| 292 | 292 | |
| 293 | 293 | //不是商品分组的，不是默认排序的 |
| 294 | - if(t.indexOf("group_id")==-1 || e.data.tabname!="sort" ){ | |
| 294 | + if(t.indexOf("group_id")==-1 ){ | |
| 295 | 295 | t += "&orderField=" + e.data.tabname; |
| 296 | 296 | t += "&orderType=" + e.data.adname; |
| 297 | 297 | } | ... | ... |
pages/goods/goodsList/goodsList.wxml
| ... | ... | @@ -31,7 +31,7 @@ |
| 31 | 31 | |
| 32 | 32 | <navigator class="nav-item"> |
| 33 | 33 | <picker bindchange="bind_pk_sort" value="{{index}}" range="{{more_sort_arr}}" range-key="name"> |
| 34 | - <text bindtap="changeTab" wx:if="{{tabname=='on_time'}}">新品</text> | |
| 34 | + <text wx:if="{{tabname=='on_time'}}">新品</text> | |
| 35 | 35 | <text wx:elif="{{tabname=='comment_count'}}">评论</text> |
| 36 | 36 | <text wx:else>综合</text> |
| 37 | 37 | </picker> | ... | ... |
pages/goods/search/search.wxml
| ... | ... | @@ -46,9 +46,9 @@ |
| 46 | 46 | <block wx:if="{{!openSearchModal}}"> |
| 47 | 47 | |
| 48 | 48 | <view class="nav flex"> |
| 49 | - <navigator bindtap="changeTab" class="nav-item f1" > | |
| 49 | + <navigator class="nav-item f1" > | |
| 50 | 50 | <picker bindchange="bind_pk_sort" value="{{index}}" range="{{more_sort_arr}}" range-key="name"> |
| 51 | - <text bindtap="changeTab" wx:if="{{tabname=='on_time'}}">新品</text> | |
| 51 | + <text wx:if="{{tabname=='on_time'}}">新品</text> | |
| 52 | 52 | <text wx:elif="{{tabname=='comment_count'}}">评论</text> |
| 53 | 53 | <text wx:else>综合</text> |
| 54 | 54 | </picker> | ... | ... |
pages/user/assistance/assistance.wxml
| ... | ... | @@ -71,6 +71,9 @@ |
| 71 | 71 | <view class="flex-center width state" wx:if="{{item.status==0}}" data-taskId="{{item.helpTaskId}}" bindtap="go_to_task"> |
| 72 | 72 | <view class="ellipsis-1">{{item.zlHelpNum}}/{{item.helpNum}}</view> |
| 73 | 73 | </view> |
| 74 | + <view class="flex-center width " wx:if="{{item.status==3}}"> | |
| 75 | + <view class="ellipsis-1">已失效</view> | |
| 76 | + </view> | |
| 74 | 77 | <view class="flex-center width state" wx:if="{{item.status==2}}"> |
| 75 | 78 | <view class="ellipsis-1" bindtap="select_libao" data-orderSn="{{item.orderSn}}">查看礼包</view> |
| 76 | 79 | </view> | ... | ... |
pages/user/assistance/task_assistance.wxml
| 1 | 1 | <wxs module="filter" src="../../../utils/filter.wxs"></wxs> |
| 2 | 2 | <view class="container" style="background-color:#{{bg_color ? bg_color:'d01119'}}"> |
| 3 | - <view class="top-back" style="background-color:#{{bg_color ? bg_color:'d01119'}};padding-bottom:80rpx;background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)" bindtap="close"> | |
| 3 | + <view class="top-back" style="background-color:#{{bg_color ? bg_color:'d01119'}};padding-bottom:40rpx;background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)" bindtap="close"> | |
| 4 | 4 | <!-- <view class="top-back" style="padding-bottom:{{is_user_task!=null&&is_user_task.status==0?50:0}}rpx;background-image: url({{iurl}}/miniapp/images/friendhelp/lumi.png)" bindtap="close"> --> |
| 5 | 5 | <!-- 助力活动头部 --> |
| 6 | 6 | <view class="top-frame"> |
| ... | ... | @@ -55,18 +55,18 @@ |
| 55 | 55 | style="background-color:#{{btn_color ? btn_color:'fbda0e'}};color:{{font_color?('#'+font_color):'white'}};"> |
| 56 | 56 | 就选它了 |
| 57 | 57 | </view> |
| 58 | - <view wx:if="{{is_user_task!=null&&is_user_task.status==0}}" class="task_clike fs40 t-c flex-center" bindtap="save_share" | |
| 58 | + <view wx:if="{{ is_user_task!=null&&is_user_task.status==0}}" class="task_clike fs40 t-c flex-center" bindtap="save_share" | |
| 59 | 59 | style="background-color:#{{btn_color ? btn_color:'fbda0e'}};color:{{font_color?('#'+font_color):'white'}};"> |
| 60 | 60 | 好友拆一拆 |
| 61 | 61 | </view> |
| 62 | 62 | <!-- 任务超时失效 --> |
| 63 | - <view class="invalid" wx:if="{{ is_user_task!=null && is_user_task.status==0 && invalidTime !=0}}"> | |
| 63 | + <view class="invalid fs28" wx:if="{{ is_user_task!=null && is_user_task.status==0 && invalidTime !=0}}"> | |
| 64 | 64 | <text>距离失效:</text> |
| 65 | 65 | <view class="invalid_info" wx:if="{{invalidState}}"><text>{{invalidObj.h}}</text>:<text>{{invalidObj.m}}</text>:<text>{{invalidObj.s}}</text></view> |
| 66 | 66 | <view class="invalid_info" wx:else>该任务已失效</view> |
| 67 | 67 | </view> |
| 68 | 68 | |
| 69 | - <view wx:if="{{is_user_task!=null&&is_user_task.status==1}}" class="task_clike fs40 t-c flex-center" data-libaoid="{{is_user_task.helpListGiftBagId}}"data-taskingid="{{is_user_task.id}}" bindtap="redeem_now" | |
| 69 | + <view wx:if="{{ is_user_task!=null&&is_user_task.status==1}}" class="task_clike fs40 t-c flex-center" data-libaoid="{{is_user_task.helpListGiftBagId}}"data-taskingid="{{is_user_task.id}}" bindtap="redeem_now" | |
| 70 | 70 | style="background-color:#{{btn_color ? btn_color:'fbda0e'}};color:{{font_color?('#'+font_color):'white'}};"> |
| 71 | 71 | 立即兑换 |
| 72 | 72 | </view> |
| ... | ... | @@ -104,9 +104,10 @@ |
| 104 | 104 | <view class="ellipsis-1">{{item.helpTaskName}} |
| 105 | 105 | </view> |
| 106 | 106 | </view> |
| 107 | - <view class="flex-center width state"> | |
| 107 | + <view class="flex-center width " style="{{item.status !=3 ? ' text-decoration: underline;' :''}}"> | |
| 108 | 108 | <view class="ellipsis-1"> |
| 109 | 109 | <text wx:if="{{item.status==0}}" bindtap="go_task" data-taskid="{{item.helpTaskId}}">{{item.zlHelpNum}}/{{item.helpNum}}</text> |
| 110 | + <text wx:if="{{item.status==3}}" >已失效</text> | |
| 110 | 111 | <text wx:if="{{item.status==2}}" bindtap="select_libao" data-orderSn="{{item.orderSn}}">查看礼包</text> |
| 111 | 112 | <text wx:if="{{item.status==1}}" bindtap="get_libao" data-libaoid="{{item.helpListGiftBagId}}"data-taskingid="{{item.id}}" data-taskid="{{item.helpTaskId}}">领取礼包 </text> |
| 112 | 113 | </view> | ... | ... |
pages/user/index/index.js
pages/user/order_list/order_list.js
| ... | ... | @@ -481,6 +481,35 @@ Page({ |
| 481 | 481 | } |
| 482 | 482 | }); |
| 483 | 483 | }, |
| 484 | + | |
| 485 | + //-----删除订单(完成和带评价的)----- | |
| 486 | + deleteOrderData_: function(t) { | |
| 487 | + var th = this; | |
| 488 | + var order_id = t.currentTarget.dataset.order_id; | |
| 489 | + var index = t.currentTarget.dataset.index; | |
| 490 | + var up_data={order_id: order_id,isdel:1}; | |
| 491 | + | |
| 492 | + | |
| 493 | + wx.showModal({ | |
| 494 | + title: "是否删除订单？", | |
| 495 | + success: function(tt) { | |
| 496 | + tt.confirm && rq.put("/api/weshop/order/updatebyId", { | |
| 497 | + data: up_data, | |
| 498 | + success: function(t) { | |
| 499 | + for (var e = 0; e < th.data.orderList.length; e++) | |
| 500 | + if (th.data.orderList[e].order_id == order_id) { | |
| 501 | + th.data.orderList.splice(e, 1), th.setData({ | |
| 502 | + orderList: th.data.orderList | |
| 503 | + }); | |
| 504 | + break; | |
| 505 | + } | |
| 506 | + } | |
| 507 | + }) | |
| 508 | + } | |
| 509 | + }); | |
| 510 | + }, | |
| 511 | + | |
| 512 | + | |
| 484 | 513 | //-----删除订单----- |
| 485 | 514 | deleteSerOrderData: function(t) { |
| 486 | 515 | var th = this; | ... | ... |
pages/user/order_list/order_list.wxml
| ... | ... | @@ -74,10 +74,10 @@ |
| 74 | 74 | <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0)}}">待发货</view> |
| 75 | 75 | <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">待收货</view> |
| 76 | 76 | <view wx:if="{{(item.order_status==2)}}" class="flex-center">待评价<view class="lin"></view> |
| 77 | - <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData" data-index="{{index}}" data-order_id="{{item.order_id}}"></image> | |
| 77 | + <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData_" data-index="{{index}}" data-order_id="{{item.order_id}}"></image> | |
| 78 | 78 | </view> |
| 79 | 79 | <view wx:if="{{item.order_status==4}}" class="flex-center">已评价<view class="lin"></view> |
| 80 | - <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData" data-index="{{index}}" data-order_id="{{item.order_id}}"></image> | |
| 80 | + <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData_" data-index="{{index}}" data-order_id="{{item.order_id}}"></image> | |
| 81 | 81 | </view> |
| 82 | 82 | <view wx:if="{{item.order_status==3 && item.pt_status!=6}}" class="flex-center" >已取消<view class="lin"></view> |
| 83 | 83 | <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData" data-index="{{index}}" data-order_id="{{item.order_id}}"></image> |
| ... | ... | @@ -95,10 +95,10 @@ |
| 95 | 95 | <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0 && item.team_status == 2)}}">待发货</view> |
| 96 | 96 | <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1 && item.team_status == 2)}}">待收货</view> |
| 97 | 97 | <view wx:if="{{(item.order_status==2)}}" class="flex-center">待评价<view class="lin"></view> |
| 98 | - <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData" data-index="{{index}}" data-order_id="{{item.order_id}}"></image> | |
| 98 | + <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData_" data-index="{{index}}" data-order_id="{{item.order_id}}"></image> | |
| 99 | 99 | </view> |
| 100 | 100 | <view wx:if="{{item.order_status==4}}" class="flex-center">已评价<view class="lin"></view> |
| 101 | - <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData" data-index="{{index}}" data-order_id="{{item.order_id}}"></image> | |
| 101 | + <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData_" data-index="{{index}}" data-order_id="{{item.order_id}}"></image> | |
| 102 | 102 | </view> |
| 103 | 103 | <view wx:if="{{item.pay_status == 0 && item.order_status==3 && item.pt_status!=6}}" class="flex-center" >已取消<view class="lin"></view> |
| 104 | 104 | <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData" data-index="{{index}}" data-order_id="{{item.order_id}}"></image> |
| ... | ... | @@ -112,10 +112,10 @@ |
| 112 | 112 | <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==0)}}">待发货</view> |
| 113 | 113 | <view wx:if="{{(item.order_status==1&&item.pay_status==1&&item.shipping_status==1)}}">待收货</view> |
| 114 | 114 | <view wx:if="{{(item.order_status==2)}}" class="flex-center">待评价<view class="lin"></view> |
| 115 | - <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData" data-index="{{index}}" data-order_id="{{item.order_id}}"></image> | |
| 115 | + <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData_" data-index="{{index}}" data-order_id="{{item.order_id}}"></image> | |
| 116 | 116 | </view> |
| 117 | 117 | <view wx:if="{{item.order_status==4}}" class="flex-center">已评价<view class="lin"></view> |
| 118 | - <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData" data-index="{{index}}" data-order_id="{{item.order_id}}"></image> | |
| 118 | + <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData_" data-index="{{index}}" data-order_id="{{item.order_id}}"></image> | |
| 119 | 119 | </view> |
| 120 | 120 | <view wx:if="{{item.order_status==3 && item.pt_status!=6}}" class="flex-center" >已取消<view class="lin"></view> |
| 121 | 121 | <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData" data-index="{{index}}" data-order_id="{{item.order_id}}"></image> |
| ... | ... | @@ -310,7 +310,7 @@ |
| 310 | 310 | <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteSerOrderData" data-index="{{index}}" data-orderid="{{item.order_id}}" data-ordersn="{{item.order_sn}}" ></image> |
| 311 | 311 | </view> |
| 312 | 312 | <view wx:if="{{item.order_status == 2}}" class="flex-center">已评价<view class="lin"></view> |
| 313 | - <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteSerOrderData" data-index="{{index}}" data-orderid="{{item.order_id}}" data-ordersn="{{item.order_sn}}" ></image> | |
| 313 | + <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteSerOrderData" data-index="{{index}}" data-orderid="{{item.order_id}}" data-ordersn="{{item.order_sn}}" ></image> | |
| 314 | 314 | </view> |
| 315 | 315 | <view wx:if="{{item.order_status == 3}}" class="c-a9" class="flex-center">已取消<view class="lin"></view> |
| 316 | 316 | <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteSerOrderData" data-index="{{index}}" data-orderid="{{item.order_id}}" data-ordersn="{{item.order_sn}}" ></image> | ... | ... |