Commit c98a3cea72ce91ed93aecebf0fe66ddda8be495e
1 parent
303eff71
优化
Showing
5 changed files
with
30 additions
and
30 deletions
packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.js
| ... | ... | @@ -375,13 +375,13 @@ Page({ |
| 375 | 375 | "storeId": a.stoid, //商家ID |
| 376 | 376 | "userId": d.user_id, //用户ID |
| 377 | 377 | } |
| 378 | - // if (th.orderSn) { | |
| 379 | - // url='/api/weshop/marketing/my/giftbag/detail/get' | |
| 380 | - // data.orderSn=th.orderSn | |
| 381 | - // }else{ | |
| 382 | - // data.giftBagId=th.getGiftID | |
| 383 | - // } | |
| 384 | - data.giftBagId=th.getGiftID | |
| 378 | + if (th.orderSn) { | |
| 379 | + url='/api/weshop/marketing/my/giftbag/detail/get' | |
| 380 | + data.orderSn=th.orderSn | |
| 381 | + }else{ | |
| 382 | + data.giftBagId=th.getGiftID | |
| 383 | + } | |
| 384 | + // data.giftBagId=th.getGiftID | |
| 385 | 385 | getApp().request.get(url, { |
| 386 | 386 | isShowLoading: true, |
| 387 | 387 | data:data, | ... | ... |
packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist.wxml
| ... | ... | @@ -19,7 +19,7 @@ |
| 19 | 19 | |
| 20 | 20 | |
| 21 | 21 | </view> |
| 22 | - <view class="top_time data-v-3a5b7e36" wx:if="{{!flag}}"> | |
| 22 | + <view class="top_time data-v-3a5b7e36" wx:if="{{false && !flag}}"> | |
| 23 | 23 | <block wx:if="{{isBuy==1 && giftTitle && isStart!=1}}" > |
| 24 | 24 | <text class="data-v-3a5b7e36"> |
| 25 | 25 | {{"活动开始时间："+giftStart}} |
| ... | ... | @@ -33,7 +33,7 @@ |
| 33 | 33 | </text> |
| 34 | 34 | </block> |
| 35 | 35 | </view> |
| 36 | - <view class="top_time data-v-3a5b7e36" wx:if="{{flag == 1 && iswarelbtype}}"> | |
| 36 | + <view class="top_time data-v-3a5b7e36" wx:if="{{false && flag == 1 && iswarelbtype}}"> | |
| 37 | 37 | <text class="data-v-3a5b7e36" wx:if="{{exchangeType == 1}}"> |
| 38 | 38 | {{"兑换时间：领取后"+exchangeDay+"天内兑换"}} |
| 39 | 39 | </text> |
| ... | ... | @@ -190,7 +190,7 @@ |
| 190 | 190 | </block> |
| 191 | 191 | |
| 192 | 192 | </block> |
| 193 | - <block wx:if="{{isBuy==0}}"> | |
| 193 | + <block wx:if="{{false && isBuy==0}}"> | |
| 194 | 194 | <view class="foot_button data-v-3a5b7e36"> |
| 195 | 195 | <block wx:if="{{is_lb!=1}}"> |
| 196 | 196 | <view class="foot_button_buy data-v-3a5b7e36 overdue"> | ... | ... |
packageE/pages/user/monthgiftbag/monthgiftbag.wxml
| ... | ... | @@ -23,7 +23,7 @@ |
| 23 | 23 | </view> |
| 24 | 24 | <block wx:for="{{wareCard}}" wx:for-item="item" wx:for-index="index" wx:key="index"> |
| 25 | 25 | <view class="content_box"> |
| 26 | - <view class="content_box_ware" bindtap="navigateTo" data-url="/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist?isBuy=1&lbId={{item.lbId}}&cover_img={{item.cover_img}}&orderSn={{item.order_sn}}&record_list_id={{item.record_list_id}}&is_receive={{item.is_receive}}"> | |
| 26 | + <view class="content_box_ware" bindtap="navigateTo" data-url="/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist?isBuy=0&lbId={{item.lbId}}&cover_img={{item.cover_img}}&orderSn={{item.receive_ordersn}}&record_list_id={{item.record_list_id}}&is_receive={{item.is_receive}}"> | |
| 27 | 27 | <view class="content_box_img"> |
| 28 | 28 | <!-- <image src="{{$GetInfo.imgHttp+item.$orig.lbUrl}}"></image> --> |
| 29 | 29 | <image wx:if="{{item.cover_img}}" src="{{iurl+item.cover_img}}" lazy-load="true" binderror="bind_bnerr2" data-errorimg="wareCard[{{index}}].cover_img"></image> |
| ... | ... | @@ -93,7 +93,7 @@ |
| 93 | 93 | |
| 94 | 94 | </view> |
| 95 | 95 | </view> |
| 96 | - <view class="content_box_button" bindtap="navigateTo" data-url="/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist?isBuy=1&lbId={{item.lbId}}&cover_img={{item.cover_img}}&orderSn={{item.order_sn}}&record_list_id={{item.record_list_id}}&is_receive={{item.is_receive}}"> | |
| 96 | + <view class="content_box_button" bindtap="navigateTo" data-url="/packageE/pages/user/monthgiftbag/giftpacklist/giftpacklist?isBuy=0&lbId={{item.lbId}}&cover_img={{item.cover_img}}&orderSn={{item.receive_ordersn}}&record_list_id={{item.record_list_id}}&is_receive={{item.is_receive}}"> | |
| 97 | 97 | <button>立即使用</button> |
| 98 | 98 | </view> |
| 99 | 99 | </view> | ... | ... |
pages/goods/categoryList/categoryList.wxml
| ... | ... | @@ -608,7 +608,7 @@ |
| 608 | 608 | <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> |
| 609 | 609 | <text wx:if="{{item.prom_price}}" class="rmb">{{item.prom_price}}</text> |
| 610 | 610 | </view> |
| 611 | - <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb mgl10 fs24">{{item.market_price}}</view> | |
| 611 | + <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb mgl10 fs24 no_line_c">{{item.market_price}}</view> | |
| 612 | 612 | </view> |
| 613 | 613 | |
| 614 | 614 | <view class="comment"> |
| ... | ... | @@ -639,7 +639,7 @@ |
| 639 | 639 | </view> |
| 640 | 640 | </view> |
| 641 | 641 | <view class="comment flex jc_sb"> |
| 642 | - <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb fs24">{{item.market_price}}</view> | |
| 642 | + <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb fs24 no_line_c">{{item.market_price}}</view> | |
| 643 | 643 | <view class="fs22 pdt10 t-r"> |
| 644 | 644 | <span>评论{{item.comment_count}}</span> |
| 645 | 645 | <span class="pdl30">已售{{item.sales_sum}}</span> |
| ... | ... | @@ -649,7 +649,7 @@ |
| 649 | 649 | <block wx:else> |
| 650 | 650 | <view class="flex ai-center"> |
| 651 | 651 | <view class="price rmb">{{item.shop_price}}</view> |
| 652 | - <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view> | |
| 652 | + <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb fs24 mgl10 no_line_c">{{item.market_price}}</view> | |
| 653 | 653 | </view> |
| 654 | 654 | |
| 655 | 655 | <view class="comment"> |
| ... | ... | @@ -665,7 +665,7 @@ |
| 665 | 665 | <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}"> |
| 666 | 666 | <view class="flex ai-center"> |
| 667 | 667 | <view class="price rmb">{{item.shop_price}}</view> |
| 668 | - <view wx:if="{{is_retail_price}}" class="word-line xc-ash mk_price rmb fs24 mgl10">{{item.market_price}}</view> | |
| 668 | + <view wx:if="{{is_retail_price}}" class="word-line xc-ash mk_price rmb fs24 mgl10 no_line_c">{{item.market_price}}</view> | |
| 669 | 669 | </view> |
| 670 | 670 | <view class="comment"> |
| 671 | 671 | <view class="flex ai-center"> |
| ... | ... | @@ -687,7 +687,7 @@ |
| 687 | 687 | <block wx:else> |
| 688 | 688 | <view class="flex ai-center"> |
| 689 | 689 | <view class="price rmb">{{item.shop_price}}</view> |
| 690 | - <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view> | |
| 690 | + <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb fs24 mgl10 no_line_c">{{item.market_price}}</view> | |
| 691 | 691 | </view> |
| 692 | 692 | <!-- <view class="price">￥{{item.shop_price}}</view> --> |
| 693 | 693 | <view class="comment"> |
| ... | ... | @@ -704,7 +704,7 @@ |
| 704 | 704 | |
| 705 | 705 | <view class="flex ai-center"> |
| 706 | 706 | <view class="price rmb">{{item.shop_price}}</view> |
| 707 | - <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view> | |
| 707 | + <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb fs24 mgl10 no_line_c">{{item.market_price}}</view> | |
| 708 | 708 | </view> |
| 709 | 709 | <!-- <view class="price">￥{{item.shop_price}}</view> --> |
| 710 | 710 | <view class="comment"> | ... | ... |
pages/goods/goodsList/goodsList.wxml
| ... | ... | @@ -92,7 +92,7 @@ |
| 92 | 92 | <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> |
| 93 | 93 | <text wx:if="{{item.prom_price}}" class="rmb">{{item.prom_price}}</text> |
| 94 | 94 | </view> |
| 95 | - <view wx:if="{{is_retail_price}}" class="word-line xc-ash mgl10 rmb fs24">{{item.market_price}}</view> | |
| 95 | + <view wx:if="{{is_retail_price}}" class="word-line xc-ash mgl10 rmb fs24 no_line_c">{{item.market_price}}</view> | |
| 96 | 96 | </view> |
| 97 | 97 | |
| 98 | 98 | |
| ... | ... | @@ -119,7 +119,7 @@ |
| 119 | 119 | </view> |
| 120 | 120 | </view> |
| 121 | 121 | <view class="comment"> |
| 122 | - <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb">{{item.market_price}}</view> | |
| 122 | + <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb no_line_c">{{item.market_price}}</view> | |
| 123 | 123 | <view class="fs24 t-r"> |
| 124 | 124 | <span>评论{{item.comment_count}}</span> |
| 125 | 125 | <span class="pdl30">已售{{item.sales_sum}}</span> |
| ... | ... | @@ -141,7 +141,7 @@ |
| 141 | 141 | <view wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}"> |
| 142 | 142 | <view class="flex ai-center"> |
| 143 | 143 | <view class="price rmb">{{item.shop_price}}</view> |
| 144 | - <view wx:if="{{is_retail_price}}" class="word-line xc-ash mk_price rmb">{{item.market_price}}</view> | |
| 144 | + <view wx:if="{{is_retail_price}}" class="word-line xc-ash mk_price rmb no_line_c">{{item.market_price}}</view> | |
| 145 | 145 | </view> |
| 146 | 146 | <view class="comment"> |
| 147 | 147 | <view class="flex ai-center"> |
| ... | ... | @@ -160,7 +160,7 @@ |
| 160 | 160 | <block wx:else> |
| 161 | 161 | <view> |
| 162 | 162 | <view class="price rmb">{{item.shop_price}}</view> |
| 163 | - <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb">{{item.market_price}}</view> | |
| 163 | + <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb no_line_c">{{item.market_price}}</view> | |
| 164 | 164 | </view> |
| 165 | 165 | <!-- <view class="price">￥{{item.shop_price}}</view> --> |
| 166 | 166 | <view class="comment pdt10"> |
| ... | ... | @@ -175,7 +175,7 @@ |
| 175 | 175 | <view wx:else> |
| 176 | 176 | <view class="flex ai-center"> |
| 177 | 177 | <view class="price rmb">{{item.shop_price}}</view> |
| 178 | - <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view> | |
| 178 | + <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb fs24 mgl10 no_line_c">{{item.market_price}}</view> | |
| 179 | 179 | </view> |
| 180 | 180 | |
| 181 | 181 | <view class="comment pdt10"> |
| ... | ... | @@ -207,11 +207,11 @@ |
| 207 | 207 | <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> |
| 208 | 208 | <text wx:if="{{item.prom_price}}" class="rmb">{{item.prom_price}}</text> |
| 209 | 209 | </view> |
| 210 | - <view wx:if="{{is_retail_price}}" class="word-line xc-ash mgl10 rmb fs24">{{item.market_price}}</view> | |
| 210 | + <view wx:if="{{is_retail_price}}" class="word-line xc-ash mgl10 rmb fs24 no_line_c">{{item.market_price}}</view> | |
| 211 | 211 | </view> |
| 212 | 212 | |
| 213 | 213 | |
| 214 | - <view class="comment pdt10"> | |
| 214 | + <view class="comment pdt10"> | |
| 215 | 215 | <!-- <view class="word-line xc-ash">￥{{item.market_price}}</view>--> |
| 216 | 216 | <view class="fs24 t-r"> |
| 217 | 217 | <span>评论{{item.comment_count}}</span> |
| ... | ... | @@ -234,7 +234,7 @@ |
| 234 | 234 | </view> |
| 235 | 235 | </view> |
| 236 | 236 | <view class="comment"> |
| 237 | - <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb">{{item.market_price}}</view> | |
| 237 | + <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb no_line_c">{{item.market_price}}</view> | |
| 238 | 238 | <view class="fs24 t-r"> |
| 239 | 239 | <span>评论{{item.comment_count}}</span> |
| 240 | 240 | <span class="pdl30">已售{{item.sales_sum}}</span> |
| ... | ... | @@ -244,7 +244,7 @@ |
| 244 | 244 | <block wx:else> |
| 245 | 245 | <view class="price rmb">{{item.shop_price}}</view> |
| 246 | 246 | <view class="comment"> |
| 247 | - <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb">{{item.market_price}}</view> | |
| 247 | + <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb no_line_c">{{item.market_price}}</view> | |
| 248 | 248 | <view class="fs24 t-r"> |
| 249 | 249 | <span>评论{{item.comment_count}}</span> |
| 250 | 250 | <span class="pdl30">已售{{item.sales_sum}}</span> |
| ... | ... | @@ -256,7 +256,7 @@ |
| 256 | 256 | <view wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}"> |
| 257 | 257 | <view class="flex ai-center"> |
| 258 | 258 | <view class="price rmb">{{item.shop_price}}</view> |
| 259 | - <view wx:if="{{is_retail_price}}" class="word-line xc-ash mk_price rmb">{{item.market_price}}</view> | |
| 259 | + <view wx:if="{{is_retail_price}}" class="word-line xc-ash mk_price rmb no_line_c">{{item.market_price}}</view> | |
| 260 | 260 | </view> |
| 261 | 261 | <view class="comment"> |
| 262 | 262 | <view class="flex ai-center"> |
| ... | ... | @@ -275,7 +275,7 @@ |
| 275 | 275 | <block wx:else> |
| 276 | 276 | <view> |
| 277 | 277 | <view class="price rmb">{{item.shop_price}}</view> |
| 278 | - <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb">{{item.market_price}}</view> | |
| 278 | + <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb no_line_c">{{item.market_price}}</view> | |
| 279 | 279 | </view> |
| 280 | 280 | <!-- <view class="price">￥{{item.shop_price}}</view> --> |
| 281 | 281 | <view class="comment pdt10"> |
| ... | ... | @@ -290,7 +290,7 @@ |
| 290 | 290 | <view wx:else> |
| 291 | 291 | <view class=""> |
| 292 | 292 | <view class="price rmb">{{item.shop_price}}</view> |
| 293 | - <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view> | |
| 293 | + <view wx:if="{{is_retail_price}}" class="word-line xc-ash rmb fs24 mgl10 no_line_c">{{item.market_price}}</view> | |
| 294 | 294 | </view> |
| 295 | 295 | |
| 296 | 296 | <view class="comment pdt10"> | ... | ... |