Commit 7a87b9bd0610328cc89e1e5bd48b99e4660e0288
Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev
Showing
13 changed files
with
1012 additions
and
1076 deletions
components/diy_goodsGroup/diy_goodsGroup.js
| ... | ... | @@ -46,7 +46,6 @@ Component({ |
| 46 | 46 | title_index: 0, |
| 47 | 47 | swiper_hei: 0, |
| 48 | 48 | title_class: "", |
| 49 | - is_no_plus:1, | |
| 50 | 49 | }, |
| 51 | 50 | |
| 52 | 51 | ready: function () { }, |
| ... | ... | @@ -63,7 +62,8 @@ Component({ |
| 63 | 62 | if (!getApp().globalData.func_list) getApp().globalData.func_list = []; |
| 64 | 63 | getApp().globalData.func_list.push(this); |
| 65 | 64 | } |
| 66 | - | |
| 65 | + | |
| 66 | + | |
| 67 | 67 | //最新的版本才有nav_list |
| 68 | 68 | if (nav_list) { |
| 69 | 69 | nav_item = nav_list[0]; |
| ... | ... | @@ -142,10 +142,8 @@ Component({ |
| 142 | 142 | pageLifetimes: { |
| 143 | 143 | //游客登录后,只要更新卡的情况 |
| 144 | 144 | show: function () { |
| 145 | - let th = this; | |
| 146 | 145 | //--初始化卡类-- |
| 147 | 146 | this.card_init(); |
| 148 | - | |
| 149 | 147 | }, |
| 150 | 148 | }, |
| 151 | 149 | |
| ... | ... | @@ -265,24 +263,6 @@ Component({ |
| 265 | 263 | }) |
| 266 | 264 | break; |
| 267 | 265 | } |
| 268 | - //调用接口判断商家plus有没有过期 | |
| 269 | - getApp().request.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=3", {}).then(res => { | |
| 270 | - console.log(res); | |
| 271 | - if (res.data.code == 0) { | |
| 272 | - | |
| 273 | - var arr = res.data.data.pageData; | |
| 274 | - if (arr.length > 0) { | |
| 275 | - var item = arr[0]; | |
| 276 | - if (item.is_sy == 0) { | |
| 277 | - var now = Date.parse(new Date()); now = now / 1000; | |
| 278 | - if (item.end_time < now) { | |
| 279 | - th.setData({ is_no_plus: 0 }) | |
| 280 | - } | |
| 281 | - } | |
| 282 | - } | |
| 283 | - } | |
| 284 | - }) | |
| 285 | - | |
| 286 | 266 | }, |
| 287 | 267 | |
| 288 | 268 | setLoading: function () { | ... | ... |
components/diy_goodsGroup/diy_goodsGroup.wxml
| ... | ... | @@ -59,7 +59,7 @@ |
| 59 | 59 | </block> |
| 60 | 60 | <block wx:else> |
| 61 | 61 | |
| 62 | - <block wx:if="{{g_filter.is_has_rank(rank_switch,item) && is_no_plus}}"> | |
| 62 | + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}"> | |
| 63 | 63 | <!-- 当会员是等级卡的时候 --> |
| 64 | 64 | <block wx:if="{{card_field}}"> |
| 65 | 65 | <!-- 等级价>0 --> |
| ... | ... | @@ -210,7 +210,7 @@ |
| 210 | 210 | <view class='del'>¥{{item.market_price}}</view> |
| 211 | 211 | </block> |
| 212 | 212 | <block wx:else> |
| 213 | - <block wx:if="{{g_filter.is_has_rank(rank_switch,item) && is_no_plus}}"> | |
| 213 | + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}"> | |
| 214 | 214 | <!-- 当会员是等级卡的时候 --> |
| 215 | 215 | <block wx:if="{{card_field}}"> |
| 216 | 216 | <!-- 等级价>0 --> |
| ... | ... | @@ -360,7 +360,7 @@ |
| 360 | 360 | <view class='del'>¥{{item.market_price}}</view> |
| 361 | 361 | </block> |
| 362 | 362 | <block wx:else> |
| 363 | - <block wx:if="{{g_filter.is_has_rank(rank_switch,item) && is_no_plus}}"> | |
| 363 | + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}"> | |
| 364 | 364 | <!-- 当会员是等级卡的时候 --> |
| 365 | 365 | <block wx:if="{{card_field}}"> |
| 366 | 366 | <!-- 等级价>0 --> |
| ... | ... | @@ -516,7 +516,7 @@ |
| 516 | 516 | <!-- 不是活动的情况 --> |
| 517 | 517 | <block wx:else> |
| 518 | 518 | |
| 519 | - <block wx:if="{{g_filter.is_has_rank(rank_switch,item) && is_no_plus}}"> | |
| 519 | + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}"> | |
| 520 | 520 | <!-- 当会员是等级卡的时候 --> |
| 521 | 521 | <block wx:if="{{card_field}}"> |
| 522 | 522 | <!-- 等级价>0 --> |
| ... | ... | @@ -691,7 +691,7 @@ |
| 691 | 691 | <view class='del'>¥{{aitem.market_price}}</view> |
| 692 | 692 | </block> |
| 693 | 693 | <block wx:else> |
| 694 | - <block wx:if="{{g_filter.is_has_rank(rank_switch,aitem) && is_no_plus}}"> | |
| 694 | + <block wx:if="{{g_filter.is_has_rank(rank_switch,aitem)}}"> | |
| 695 | 695 | <!-- 当会员是等级卡的时候 --> |
| 696 | 696 | <block wx:if="{{card_field}}"> |
| 697 | 697 | <!-- 等级价>0 --> | ... | ... |
components/goods_list/goods_list.js
| ... | ... | @@ -16,8 +16,7 @@ Component({ |
| 16 | 16 | card_field: "", |
| 17 | 17 | card_name: "", |
| 18 | 18 | max_card_field: "", |
| 19 | - card_list: null, | |
| 20 | - is_no_plus:1, | |
| 19 | + card_list: null | |
| 21 | 20 | }, |
| 22 | 21 | properties: { |
| 23 | 22 | // 这⾥定义了innerText属性,属性值可以在组件使⽤时指定 |
| ... | ... | @@ -88,23 +87,7 @@ Component({ |
| 88 | 87 | |
| 89 | 88 | |
| 90 | 89 | } |
| 91 | - }), | |
| 92 | - | |
| 93 | - //调用接口判断商家plus有没有过期 | |
| 94 | - getApp().request.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=3", {}).then(res => { | |
| 95 | - if (res.data.code == 0) { | |
| 96 | - var arr = res.data.data.pageData; | |
| 97 | - if (arr.length > 0) { | |
| 98 | - var item = arr[0]; | |
| 99 | - if (item.is_sy == 0) { | |
| 100 | - var now = Date.parse(new Date()); now = now / 1000; | |
| 101 | - if (item.end_time < now) { | |
| 102 | - th.setData({ is_no_plus: 0 }) | |
| 103 | - } | |
| 104 | - } | |
| 105 | - } | |
| 106 | - } | |
| 107 | - }) | |
| 90 | + }) | |
| 108 | 91 | }, |
| 109 | 92 | |
| 110 | 93 | get_list: function () { | ... | ... |
components/goods_list/goods_list.wxml
| ... | ... | @@ -2,153 +2,153 @@ |
| 2 | 2 | <wxs module="filter" src="../../utils/filter.wxs"></wxs> |
| 3 | 3 | <wxs module="g_filter" src="g_filter.wxs"></wxs> |
| 4 | 4 | <view class="collects"> |
| 5 | - <view class="hang "> | |
| 6 | - <!-- 商品详情 --> | |
| 5 | + <view class="hang "> | |
| 6 | + <!-- 商品详情 --> | |
| 7 | 7 | |
| 8 | - <view class="collect ib" wx:for="{{recommend}}" bindtap="go_url" data-url="{{g_filter.get_url_by_type(item)}}"> | |
| 9 | - <!--<view class="collect ib" wx:for="{{recommend}}" bindtap="go_url" data-url="{{item.prom_type == 9 ? ('/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + item.goods_id + '&group_id=' + item.prom_id):('/pages/goods/goodsInfo/goodsInfo?goods_id='+item.goods_id+'&title='+item.goods_name+'&prom_type='+item.prom_type+'&prom_id='+item.prom_id)}}">--> | |
| 10 | - <!-- <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&title={{item.goods_name}}&prom_type={{item.prom_type}}&prom_id={{item.prom_id}}" hover-class="none"> --> | |
| 11 | - <navigator hover-class="none"> | |
| 12 | - <!-- 商品图⽚ --> | |
| 13 | - <image class="sp" src="{{url+item.original_img}}" mode="aspectFill" binderror="bind_bnerr_xc" data-url="{{url+item.original_img}}" data-errorimg="recommend[{{index}}].original_img"></image> | |
| 14 | - <view class="bottom"> | |
| 15 | - <!-- 商品名称 --> | |
| 16 | - <view class="goods_name ellipsis-2 fs28">{{item.goods_name}}</view> | |
| 17 | - <!-- 判断是否有活动价 --> | |
| 18 | - <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_id>0 && item.prom_type!=7 && item.prom_type!=10}}"> | |
| 8 | + <view class="collect ib" wx:for="{{recommend}}" bindtap="go_url" data-url="{{g_filter.get_url_by_type(item)}}"> | |
| 9 | + <!--<view class="collect ib" wx:for="{{recommend}}" bindtap="go_url" data-url="{{item.prom_type == 9 ? ('/packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo?goods_id=' + item.goods_id + '&group_id=' + item.prom_id):('/pages/goods/goodsInfo/goodsInfo?goods_id='+item.goods_id+'&title='+item.goods_name+'&prom_type='+item.prom_type+'&prom_id='+item.prom_id)}}">--> | |
| 10 | + <!-- <navigator url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&title={{item.goods_name}}&prom_type={{item.prom_type}}&prom_id={{item.prom_id}}" hover-class="none"> --> | |
| 11 | + <navigator hover-class="none"> | |
| 12 | + <!-- 商品图⽚ --> | |
| 13 | + <image class="sp" src="{{url+item.original_img}}" mode="aspectFill" binderror="bind_bnerr_xc" data-url="{{url+item.original_img}}" data-errorimg="recommend[{{index}}].original_img"></image> | |
| 14 | + <view class="bottom"> | |
| 15 | + <!-- 商品名称 --> | |
| 16 | + <view class="goods_name ellipsis-2 fs28">{{item.goods_name}}</view> | |
| 17 | + <!-- 判断是否有活动价 --> | |
| 18 | + <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_id>0 && item.prom_type!=7 && item.prom_type!=10}}"> | |
| 19 | 19 | <view class="pdt10"> |
| 20 | - <view class="money flex xc-wc"> | |
| 21 | - <text wx:if="{{item.prom_integral}}"><text class="fs35" style="font-weight: bold;">{{item.prom_integral}}</text>积分</text> | |
| 22 | - <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> | |
| 23 | - <!-- 活动价 --> | |
| 24 | - <view class="flex xc-wc" wx:if="{{item.prom_price}}"> | |
| 25 | - <view class="fs24">¥</view> | |
| 26 | - <view class="fs35">{{item.prom_price}}</view> | |
| 27 | - </view> | |
| 28 | - </view> | |
| 29 | - <view class="flex"> | |
| 30 | - <!-- 原价 --> | |
| 31 | - <view class="price flex xc-ash line_th"> | |
| 32 | - <view class="fs22">¥</view> | |
| 33 | - <view class="fs22">{{item.market_price}}</view> | |
| 34 | - </view> | |
| 35 | - </view> | |
| 20 | + <view class="money flex xc-wc" > | |
| 21 | + <text wx:if="{{item.prom_integral}}"><text class="fs35" style="font-weight: bold;">{{item.prom_integral}}</text>积分</text> | |
| 22 | + <text wx:if="{{item.prom_integral && item.prom_price}}">+</text> | |
| 23 | + <!-- 活动价 --> | |
| 24 | + <view class="flex xc-wc" wx:if="{{item.prom_price}}"> | |
| 25 | + <view class="fs24">¥</view> | |
| 26 | + <view class="fs35">{{item.prom_price}}</view> | |
| 27 | + </view> | |
| 28 | + </view> | |
| 29 | + <view class="flex"> | |
| 30 | + <!-- 原价 --> | |
| 31 | + <view class="price flex xc-ash line_th"> | |
| 32 | + <view class="fs22">¥</view> | |
| 33 | + <view class="fs22">{{item.market_price}}</view> | |
| 34 | + </view> | |
| 35 | + </view> | |
| 36 | 36 | </view> |
| 37 | - </block> | |
| 38 | - <block wx:else> | |
| 39 | - <!-- 商品价格,先判断下是后⼜等级价--> | |
| 40 | - <block wx:if="{{g_filter.is_has_rank(rank_switch,item) && is_no_plus}}"> | |
| 41 | - <!-- 当会员是等级卡的时候 --> | |
| 42 | - <block wx:if="{{card_field}}"> | |
| 43 | - <!-- 等级价>0 --> | |
| 44 | - <block wx:if="{{item[card_field]>0}}"> | |
| 45 | - <view class="money flex"> | |
| 46 | - <!-- 办卡价 --> | |
| 47 | - <view class="flex xc-wc ai_and"> | |
| 48 | - <view class="fs24">¥</view> | |
| 49 | - <view class="fs35">{{filter.toFix(item[card_field],2)}}</view> | |
| 50 | - <view class="card_bg ellipsis-1"> | |
| 51 | - <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | |
| 52 | - <text class="card_name">{{card_name}}</text> | |
| 53 | - </view> | |
| 54 | - </view> | |
| 55 | - </view> | |
| 56 | - <view class="flex"> | |
| 57 | - <!-- 原价 --> | |
| 58 | - <view class="price flex xc-ash line_th"> | |
| 59 | - <view class="fs22">¥</view> | |
| 60 | - <view class="fs22">{{item.market_price}}</view> | |
| 61 | - </view> | |
| 62 | - </view> | |
| 63 | - </block> | |
| 64 | - <blocK wx:else> | |
| 65 | - <view class="money flex"> | |
| 66 | - <!-- 办卡价 --> | |
| 67 | - <view class="flex xc-wc"> | |
| 68 | - <view class="fs24">¥</view> | |
| 69 | - <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | |
| 70 | - </view> | |
| 71 | - </view> | |
| 72 | - <view class="flex"> | |
| 73 | - <!-- 原价 --> | |
| 74 | - <view class="price flex xc-ash line_th"> | |
| 75 | - <view class="fs22">¥</view> | |
| 76 | - <view class="fs22">{{item.market_price}}</view> | |
| 77 | - </view> | |
| 78 | - </view> | |
| 79 | - </blocK> | |
| 80 | - </block> | |
| 81 | - <block wx:else> | |
| 82 | - <!-- 如果商品有设置等级价⼤于0的 --> | |
| 83 | - <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}"> | |
| 84 | - <view class="money flex"> | |
| 85 | - <!-- 办卡价 --> | |
| 86 | - <view class="flex xc-wc"> | |
| 87 | - <view class="fs24">¥</view> | |
| 88 | - <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | |
| 89 | - </view> | |
| 90 | - <!-- 原价 --> | |
| 91 | - <view class="price flex xc-ash line_th"> | |
| 92 | - <view class="fs22">¥</view> | |
| 93 | - <view class="fs22">{{item.market_price}}</view> | |
| 94 | - </view> | |
| 95 | - </view> | |
| 96 | - <view class="flexr"> | |
| 97 | - <!-- 等级价 --> | |
| 37 | + | |
| 38 | + </block> | |
| 39 | + <block wx:else> | |
| 40 | + <!-- 商品价格,先判断下是后⼜等级价--> | |
| 41 | + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}"> | |
| 42 | + <!-- 当会员是等级卡的时候 --> | |
| 43 | + <block wx:if="{{card_field}}"> | |
| 44 | + <!-- 等级价>0 --> | |
| 45 | + <block wx:if="{{item[card_field]>0}}"> | |
| 46 | + <view class="money flex"> | |
| 47 | + <!-- 办卡价 --> | |
| 48 | + <view class="flex xc-wc ai_and"> | |
| 49 | + <view class="fs24">¥</view> | |
| 50 | + <view class="fs35">{{filter.toFix(item[card_field],2)}}</view> | |
| 51 | + <view class="card_bg ellipsis-1"> | |
| 52 | + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image> | |
| 53 | + <text class="card_name">{{card_name}}</text> | |
| 54 | + </view> | |
| 55 | + </view> | |
| 56 | + </view> | |
| 57 | + <view class="flex"> | |
| 58 | + <!-- 原价 --> | |
| 59 | + <view class="price flex xc-ash line_th"> | |
| 60 | + <view class="fs22">¥</view> | |
| 61 | + <view class="fs22">{{item.market_price}}</view> | |
| 62 | + </view> | |
| 63 | + </view> | |
| 64 | + </block> | |
| 65 | + <blocK wx:else> | |
| 66 | + <view class="money flex"> | |
| 67 | + <!-- 办卡价 --> | |
| 68 | + <view class="flex xc-wc"> | |
| 69 | + <view class="fs24">¥</view> | |
| 70 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | |
| 71 | + </view> | |
| 72 | + </view> | |
| 73 | + <view class="flex"> | |
| 74 | + <!-- 原价 --> | |
| 75 | + <view class="price flex xc-ash line_th"> | |
| 76 | + <view class="fs22">¥</view> | |
| 77 | + <view class="fs22">{{item.market_price}}</view> | |
| 78 | + </view> | |
| 79 | + </view> | |
| 80 | + </blocK> | |
| 81 | + </block> | |
| 82 | + <block wx:else> | |
| 83 | + <!-- 如果商品有设置等级价⼤于0的 --> | |
| 84 | + <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}"> | |
| 85 | + <view class="money flex"> | |
| 86 | + <!-- 办卡价 --> | |
| 87 | + <view class="flex xc-wc"> | |
| 88 | + <view class="fs24">¥</view> | |
| 89 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | |
| 90 | + </view> | |
| 91 | + <!-- 原价 --> | |
| 92 | + <view class="price flex xc-ash line_th"> | |
| 93 | + <view class="fs22">¥</view> | |
| 94 | + <view class="fs22">{{item.market_price}}</view> | |
| 95 | + </view> | |
| 96 | + </view> | |
| 97 | + <view class="flexr" style=""> | |
| 98 | + <!-- 等级价 --> | |
| 98 | 99 | <view class="price flex ai-center"> |
| 99 | - <view class="fs22">¥</view> | |
| 100 | - <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view> | |
| 101 | - <view class="card_bg ellipsis-1"> | |
| 102 | - <image src="{{url}}/miniapp/images/plus/dj_icon.png"> | |
| 103 | - </ image> | |
| 104 | - <text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text> | |
| 100 | + <view class="fs22">¥</view> | |
| 101 | + <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view> | |
| 102 | + <view class="card_bg ellipsis-1"> | |
| 103 | + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></ image> | |
| 104 | + <text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text> | |
| 105 | 105 | </view> |
| 106 | 106 | </view> |
| 107 | - </view> | |
| 108 | - </block> | |
| 109 | - <block wx:else> | |
| 110 | - <view class="money flex"> | |
| 111 | - <!-- 办卡价 --> | |
| 112 | - <view class="flex xc-wc"> | |
| 113 | - <view class="fs24">¥</view> | |
| 114 | - <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | |
| 115 | - </view> | |
| 116 | - </view> | |
| 117 | - <view class="flex"> | |
| 118 | - <!-- 原价 --> | |
| 119 | - <view class="price flex xc-ash line_th"> | |
| 120 | - <view class="fs22">¥</view> | |
| 121 | - <view class="fs22">{{item.market_price}}</view> | |
| 122 | - </view> | |
| 123 | - </view> | |
| 124 | - </block> | |
| 125 | - </block> | |
| 126 | - </block> | |
| 127 | - <!-- 商品压根就没有等级价 --> | |
| 128 | - <view class="pdt10" wx:else> | |
| 129 | - <view class="money flex"> | |
| 130 | - <!-- 办卡价 --> | |
| 131 | - <view class="flex xc-wc"> | |
| 132 | - <view class="fs24">¥</view> | |
| 133 | - <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | |
| 134 | - </view> | |
| 135 | - </view> | |
| 136 | - <view class="flex"> | |
| 137 | - <!-- 原价 --> | |
| 138 | - <view class="price flex xc-ash line_th"> | |
| 139 | - <view class="fs22">¥</view> | |
| 140 | - <view class="fs22">{{item.market_price}}</view> | |
| 141 | - </view> | |
| 142 | - </view> | |
| 143 | - </view> | |
| 144 | - </block> | |
| 145 | - </view> | |
| 146 | - </navigator> | |
| 147 | - </view> | |
| 148 | - </view> | |
| 149 | - <view class="nothing flex-center" wx:if="{{is_no_more==0}}"> | |
| 150 | - <view class="Foil"></view> | |
| 151 | - <view class="no_content fs24">没有更多内容了</view> | |
| 152 | - <view class="Foil"></view> | |
| 153 | - </view> | |
| 107 | + </view> | |
| 108 | + </block> | |
| 109 | + <block wx:else> | |
| 110 | + <view class="money flex"> | |
| 111 | + <!-- 办卡价 --> | |
| 112 | + <view class="flex xc-wc"> | |
| 113 | + <view class="fs24">¥</view> | |
| 114 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | |
| 115 | + </view> | |
| 116 | + </view> | |
| 117 | + <view class="flex"> | |
| 118 | + <!-- 原价 --> | |
| 119 | + <view class="price flex xc-ash line_th"> | |
| 120 | + <view class="fs22">¥</view> | |
| 121 | + <view class="fs22">{{item.market_price}}</view> | |
| 122 | + </view> | |
| 123 | + </view> | |
| 124 | + </block> | |
| 125 | + </block> | |
| 126 | + </block> | |
| 127 | + <!-- 商品压根就没有等级价 --> | |
| 128 | + <view class="pdt10" wx:else> | |
| 129 | + <view class="money flex"> | |
| 130 | + <!-- 办卡价 --> | |
| 131 | + <view class="flex xc-wc"> | |
| 132 | + <view class="fs24">¥</view> | |
| 133 | + <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view> | |
| 134 | + </view> | |
| 135 | + </view> | |
| 136 | + <view class="flex" style=""> | |
| 137 | + <!-- 原价 --> | |
| 138 | + <view class="price flex xc-ash line_th"> | |
| 139 | + <view class="fs22">¥</view> | |
| 140 | + <view class="fs22">{{item.market_price}}</view> | |
| 141 | + </view> | |
| 142 | + </view> | |
| 143 | + </view> | |
| 144 | + </block> | |
| 145 | + </view> | |
| 146 | + </navigator> | |
| 147 | + </view> | |
| 148 | + </view> | |
| 149 | + <view class="nothing flex-center" wx:if="{{is_no_more==0}}"> | |
| 150 | + <view class="Foil"></view> | |
| 151 | + <view class="no_content fs24">没有更多内容了</view> | |
| 152 | + <view class="Foil"></view> | |
| 153 | + </view> | |
| 154 | 154 | </view> |
| 155 | 155 | \ No newline at end of file | ... | ... |
packageA/pages/distribution/shop/shop.js
| ... | ... | @@ -36,7 +36,6 @@ Page({ |
| 36 | 36 | card_list: null, |
| 37 | 37 | |
| 38 | 38 | isAll: true, |
| 39 | - is_no_plus:1, | |
| 40 | 39 | |
| 41 | 40 | default_img: '/miniapp/images/default_g_img.gif', |
| 42 | 41 | }, |
| ... | ... | @@ -215,23 +214,6 @@ Page({ |
| 215 | 214 | } |
| 216 | 215 | }) |
| 217 | 216 | } |
| 218 | - //调用接口判断商家plus有没有过期 | |
| 219 | - getApp().request.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=3", {}).then(res => { | |
| 220 | - console.log(res); | |
| 221 | - if (res.data.code == 0) { | |
| 222 | - var arr = res.data.data.pageData; | |
| 223 | - if (arr.length > 0) { | |
| 224 | - var item = arr[0]; | |
| 225 | - if (item.is_sy == 0) { | |
| 226 | - var now = Date.parse(new Date()); now = now / 1000; | |
| 227 | - if (item.end_time < now) { | |
| 228 | - th.setData({ is_no_plus: 0 }) | |
| 229 | - } | |
| 230 | - } | |
| 231 | - } | |
| 232 | - } | |
| 233 | - }) | |
| 234 | - | |
| 235 | 217 | |
| 236 | 218 | if (app.globalData.key_word) { |
| 237 | 219 | this.setData({ | ... | ... |
packageA/pages/distribution/shop/shop.wxml
| ... | ... | @@ -99,7 +99,7 @@ |
| 99 | 99 | </block> |
| 100 | 100 | <block wx:else> |
| 101 | 101 | <!-- 商品价格,先判断下是后⼜等级价 --> |
| 102 | - <block wx:if="{{g_filter.is_has_rank(rank_switch,item) && is_no_plus}}"> | |
| 102 | + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}"> | |
| 103 | 103 | <!-- 当会员是等级卡的时候 --> |
| 104 | 104 | <block wx:if="{{card_field}}"> |
| 105 | 105 | <!-- 等级价>0 --> |
| ... | ... | @@ -155,7 +155,7 @@ |
| 155 | 155 | <view class="fs22 money">{{item.market_price}}</view> |
| 156 | 156 | </view> |
| 157 | 157 | </view> |
| 158 | - <view class="flexr"> | |
| 158 | + <view class="flexr" style=""> | |
| 159 | 159 | <!-- 等级价 --> |
| 160 | 160 | <view class="price flex ai-center"> |
| 161 | 161 | <!-- <view class="fs22">¥</view> --> |
| ... | ... | @@ -243,7 +243,7 @@ |
| 243 | 243 | </block> |
| 244 | 244 | <block wx:else> |
| 245 | 245 | <!-- 商品价格,先判断下是后⼜等级价 --> |
| 246 | - <block wx:if="{{g_filter.is_has_rank(rank_switch,item) && is_no_plus}}"> | |
| 246 | + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}"> | |
| 247 | 247 | <!-- 当会员是等级卡的时候 --> |
| 248 | 248 | <block wx:if="{{card_field}}"> |
| 249 | 249 | <!-- 等级价>0 --> | ... | ... |
packageD/pages/AI-test-skin/fail_result/fail_result.wxml
| ... | ... | @@ -6,7 +6,7 @@ |
| 6 | 6 | <text class="iconfont .icon-infofill" style="color:red;font-size: 40rpx;position:absolute;left: -8rpx;top: 0;"></text> |
| 7 | 7 | </view> |
| 8 | 8 | </view> |
| 9 | - <view style="font-size:32rpx;color: #333">上传图片符合要求</view> | |
| 9 | + <view style="font-size:32rpx;color: #333">上传图片不符合要求</view> | |
| 10 | 10 | <view style="font-size: 26rpx;color: #555">请重新更换图片获取相关检测</view> |
| 11 | 11 | <view style="border-bottom: 1rpx solid #eee; margin:0 40rpx;margin-top:40rpx;"></view> |
| 12 | 12 | </view> | ... | ... |
packageD/pages/AI-test-skin/history_record/history_record.js
| ... | ... | @@ -250,6 +250,9 @@ Page({ |
| 250 | 250 | arr.sort(_sort_by_history_time('history_time')); |
| 251 | 251 | return arr; |
| 252 | 252 | }, |
| 253 | + bindscrolltolower(){ | |
| 254 | + console.log(111); | |
| 255 | + }, | |
| 253 | 256 | |
| 254 | 257 | async getHistoryData() { |
| 255 | 258 | if (this.data.no_more) return false; |
| ... | ... | @@ -263,14 +266,19 @@ Page({ |
| 263 | 266 | store_id: setting.stoid, |
| 264 | 267 | user_id: os.user_id, |
| 265 | 268 | page: this.data.page, |
| 269 | + pageSize:20 | |
| 266 | 270 | } |
| 267 | 271 | }); |
| 268 | 272 | // initChart.setOption(option); |
| 269 | 273 | if (res.code == 0 && res.data.pageData.length > 0) { |
| 270 | 274 | history = this.time_sort(res.data.pageData); |
| 275 | + if(res.data.pageData.length >= res.data.total){ | |
| 276 | + this.setData({ | |
| 277 | + no_more: 1, | |
| 278 | + }) | |
| 279 | + } | |
| 271 | 280 | this.setData({ |
| 272 | 281 | history, |
| 273 | - no_more: 0, | |
| 274 | 282 | isLoading: 0, |
| 275 | 283 | is_get: 1, |
| 276 | 284 | }) | ... | ... |
pages/goods/goodsList/goodsList.js
| ... | ... | @@ -24,7 +24,6 @@ Page({ |
| 24 | 24 | rq_data:null, |
| 25 | 25 | isToggle: false, //切换商品视图控制符 |
| 26 | 26 | show_all:1, //判断显示 |
| 27 | - is_no_plus:1 | |
| 28 | 27 | }, |
| 29 | 28 | |
| 30 | 29 | onLoad: function(t) { |
| ... | ... | @@ -187,22 +186,7 @@ Page({ |
| 187 | 186 | }) |
| 188 | 187 | },500) |
| 189 | 188 | } |
| 190 | - }); | |
| 191 | - //调用接口判断商家plus有没有过期 | |
| 192 | - getApp().request.promiseGet("/store/storemoduleendtime/page?store_id=" + oo.stoid + "&type=3", {}).then(res => { | |
| 193 | - if (res.data.code == 0) { | |
| 194 | - var arr = res.data.data.pageData; | |
| 195 | - if (arr.length > 0) { | |
| 196 | - var item = arr[0]; | |
| 197 | - if (item.is_sy == 0) { | |
| 198 | - var now = Date.parse(new Date()); now = now / 1000; | |
| 199 | - if (item.end_time < now) { | |
| 200 | - th.setData({ is_no_plus: 0 }) | |
| 201 | - } | |
| 202 | - } | |
| 203 | - } | |
| 204 | - } | |
| 205 | - }) | |
| 189 | + }); | |
| 206 | 190 | }, |
| 207 | 191 | |
| 208 | 192 | //设置优惠券的 | ... | ... |
pages/goods/goodsList/goodsList.wxml
| ... | ... | @@ -88,7 +88,7 @@ |
| 88 | 88 | </block> |
| 89 | 89 | <block wx:else> |
| 90 | 90 | <!-- 商品价格,先判断下是后又等级价--> |
| 91 | - <block wx:if="{{g_filter.is_has_rank(rank_switch,item) && is_no_plus}}"> | |
| 91 | + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}"> | |
| 92 | 92 | <!-- 当会员是等级卡的时候 --> |
| 93 | 93 | <block wx:if="{{card_field}}"> |
| 94 | 94 | <!-- 等级价>0 --> | ... | ... |
pages/index/index/index.wxml
pages/user/index/index.js
| ... | ... | @@ -25,7 +25,7 @@ Page({ |
| 25 | 25 | txmon: 0, |
| 26 | 26 | byquan: 0, |
| 27 | 27 | yuer: 0, |
| 28 | - is_no_plus: 1, | |
| 28 | + is_no_plus:1, | |
| 29 | 29 | currentPage: 1, |
| 30 | 30 | recommend_list: [], |
| 31 | 31 | tc_hide: true, |
| ... | ... | @@ -41,12 +41,12 @@ Page({ |
| 41 | 41 | actId: "", //生日活动的id |
| 42 | 42 | actImg: "", |
| 43 | 43 | is_assistance: 0, //助力活动 |
| 44 | - ad_img: "", | |
| 45 | - add_card_data: '', //等级卡的内容 | |
| 46 | - | |
| 44 | + ad_img:"", | |
| 45 | + add_card_data:'', //等级卡的内容 | |
| 47 | 46 | |
| 47 | + | |
| 48 | 48 | }, |
| 49 | - goto_nav: function (e) { | |
| 49 | + goto_nav: function(e) { | |
| 50 | 50 | var th = this; |
| 51 | 51 | var url = e.currentTarget.dataset.url; |
| 52 | 52 | if (th.data.userInfo != null) { |
| ... | ... | @@ -60,124 +60,124 @@ Page({ |
| 60 | 60 | /** |
| 61 | 61 | * 生命周期函数--监听页面加载 |
| 62 | 62 | */ |
| 63 | - onLoad: function (options) { | |
| 64 | - var th = this; | |
| 65 | - getApp().request.get("/api/weshop/ad/page?pid=401&store_id=" + os.stoid, { | |
| 66 | - data: { | |
| 67 | - enabled: 1 | |
| 68 | - }, | |
| 69 | - success: function (res) { | |
| 70 | - if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length) { | |
| 71 | - var item = res.data.data.pageData[0]; | |
| 72 | - if (item && item.ad_code) th.setData({ ad_img: item.ad_code }) | |
| 73 | - } | |
| 74 | - } | |
| 75 | - }) | |
| 76 | - app.getUserFir(); | |
| 77 | - | |
| 63 | + onLoad: function(options) { | |
| 64 | + var th=this; | |
| 65 | + getApp().request.get("/api/weshop/ad/page?pid=401&store_id=" + os.stoid, { | |
| 66 | + data: { | |
| 67 | + enabled: 1 | |
| 68 | + }, | |
| 69 | + success:function(res){ | |
| 70 | + if(res.data.code==0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length){ | |
| 71 | + var item=res.data.data.pageData[0]; | |
| 72 | + if (item && item.ad_code) th.setData({ad_img:item.ad_code}) | |
| 73 | + } | |
| 74 | + } | |
| 75 | + }) | |
| 76 | + app.getUserFir(); | |
| 78 | 77 | |
| 79 | 78 | |
| 79 | + | |
| 80 | 80 | |
| 81 | - //-- 读取会员中心按钮列表 -- | |
| 82 | - /*-- | |
| 83 | - getApp().request.get("/api/weshop/userTool/page?pageSize=100&store_id="+os.stoid, { | |
| 84 | - success:function(res){ | |
| 85 | - if(ut.ajax_ok(res)) { | |
| 86 | - var d_list=res.data.data.pageData; | |
| 87 | - getApp().promiseGet("/api/weshop/storeDistribut/get/"+os.stoid,{}).then(rs=>{ | |
| 88 | - var dis=rs.data.data; | |
| 89 | - for(var i in d_list){ | |
| 90 | - if(d_list[i].name=='我的分销' && (!dis || dis.switch==0)){ | |
| 91 | - d_list.splice(i,1); | |
| 92 | - } | |
| 93 | - } | |
| 94 | - th.setData({user_tool:d_list}); | |
| 81 | + //-- 读取会员中心按钮列表 -- | |
| 82 | + /*-- | |
| 83 | + getApp().request.get("/api/weshop/userTool/page?pageSize=100&store_id="+os.stoid, { | |
| 84 | + success:function(res){ | |
| 85 | + if(ut.ajax_ok(res)) { | |
| 86 | + var d_list=res.data.data.pageData; | |
| 87 | + getApp().promiseGet("/api/weshop/storeDistribut/get/"+os.stoid,{}).then(rs=>{ | |
| 88 | + var dis=rs.data.data; | |
| 89 | + for(var i in d_list){ | |
| 90 | + if(d_list[i].name=='我的分销' && (!dis || dis.switch==0)){ | |
| 91 | + d_list.splice(i,1); | |
| 92 | + } | |
| 93 | + } | |
| 94 | + th.setData({user_tool:d_list}); | |
| 95 | 95 | |
| 96 | 96 | |
| 97 | 97 | |
| 98 | - }) | |
| 99 | - } | |
| 100 | - } | |
| 101 | -}) | |
| 102 | - --*/ | |
| 103 | - this.init_user_tool() | |
| 98 | + }) | |
| 99 | + } | |
| 100 | + } | |
| 101 | + }) | |
| 102 | + --*/ | |
| 103 | + this.init_user_tool() | |
| 104 | 104 | |
| 105 | 105 | }, |
| 106 | 106 | |
| 107 | 107 | /** |
| 108 | 108 | * 生命周期函数--监听页面显示 |
| 109 | 109 | */ |
| 110 | - onShow: function () { | |
| 111 | - //看一下小程序是不是过期了 | |
| 112 | - getApp().getConfig2(function (config2) { | |
| 113 | - if (config2 && config2.is_overdue == 1) { | |
| 114 | - getApp().promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=5", {}).then(res => { | |
| 115 | - var o = res; | |
| 116 | - if (o.data.code == 0) { | |
| 117 | - var ob = { isout: 0, isbuy: 1 }; | |
| 118 | - var arr = o.data.data.pageData; | |
| 119 | - var isbuy = 0; | |
| 120 | - //----如果数组不为空---- | |
| 121 | - if (arr.length > 0) { | |
| 122 | - arr.forEach(function (val, ind) { | |
| 123 | - if (val.is_sy == 0 && val.type == 5) { | |
| 124 | - isbuy = 1; | |
| 125 | - var now = ut.gettimestamp(); | |
| 126 | - if (now > val.end_time) ob.isout = 1; | |
| 127 | - return false; | |
| 128 | - } | |
| 110 | + onShow: function() { | |
| 111 | + //看一下小程序是不是过期了 | |
| 112 | + getApp().getConfig2(function(config2){ | |
| 113 | + if(config2 && config2.is_overdue==1){ | |
| 114 | + getApp().promiseGet("/store/storemoduleendtime/page?store_id=" +os.stoid + "&type=5",{}).then(res=>{ | |
| 115 | + var o=res; | |
| 116 | + if (o.data.code == 0) { | |
| 117 | + var ob = { isout: 0, isbuy: 1 }; | |
| 118 | + var arr = o.data.data.pageData; | |
| 119 | + var isbuy = 0; | |
| 120 | + //----如果数组不为空---- | |
| 121 | + if (arr.length > 0) { | |
| 122 | + arr.forEach(function (val, ind) { | |
| 123 | + if (val.is_sy == 0 && val.type == 5) { | |
| 124 | + isbuy = 1; | |
| 125 | + var now = ut.gettimestamp(); | |
| 126 | + if (now > val.end_time) ob.isout = 1; | |
| 127 | + return false; | |
| 128 | + } | |
| 129 | + }) | |
| 130 | + } | |
| 131 | + ob.isbuy = isbuy; | |
| 132 | + th.setappdata(ob); | |
| 133 | + } | |
| 129 | 134 | }) |
| 130 | - } | |
| 131 | - ob.isbuy = isbuy; | |
| 132 | - th.setappdata(ob); | |
| 133 | 135 | } |
| 134 | - }) | |
| 135 | - } | |
| 136 | - }) | |
| 136 | + }) | |
| 137 | 137 | |
| 138 | - //调用接口判断商家plus有没有过期 | |
| 139 | - rq.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=3", {}).then(res => { | |
| 140 | - if (res.data.code == 0) { | |
| 141 | - var arr = res.data.data.pageData; | |
| 142 | - if (arr.length > 0) { | |
| 143 | - var item = arr[0]; | |
| 144 | - if (item.is_sy == 0) { | |
| 145 | - var now = Date.parse(new Date()); now = now / 1000; | |
| 146 | - if (item.end_time < now) { | |
| 147 | - th.setData({ is_no_plus: 0 }) | |
| 138 | + //调用接口判断商家plus有没有过期 | |
| 139 | + rq.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=3", {}).then(res => { | |
| 140 | + if (res.data.code == 0) { | |
| 141 | + var arr = res.data.data.pageData; | |
| 142 | + if (arr.length > 0) { | |
| 143 | + var item = arr[0]; | |
| 144 | + if (item.is_sy == 0) { | |
| 145 | + var now = Date.parse(new Date()); now = now / 1000; | |
| 146 | + if (item.end_time < now) { | |
| 147 | + th.setData({ is_no_plus: 0 }) | |
| 148 | + } | |
| 149 | + } | |
| 148 | 150 | } |
| 149 | - } | |
| 150 | 151 | } |
| 151 | - } | |
| 152 | 152 | }) |
| 153 | - var th = this; | |
| 154 | - | |
| 155 | - // 判断是否开启美业 | |
| 156 | - getApp().promiseGet('/api/weshop/store/getTabSys/' + os.stoid, {}).then(res => { | |
| 157 | - if (res.data.code == 0) { | |
| 158 | - th.setData({ | |
| 159 | - enableMeiye: res.data.data.EnableMeiye, | |
| 160 | - }); | |
| 161 | - }; | |
| 162 | - }); | |
| 163 | - | |
| 164 | - | |
| 153 | + var th=this; | |
| 154 | + | |
| 155 | + // 判断是否开启美业 | |
| 156 | + getApp().promiseGet('/api/weshop/store/getTabSys/' + os.stoid, {}).then(res => { | |
| 157 | + if(res.data.code == 0) { | |
| 158 | + th.setData({ | |
| 159 | + enableMeiye: res.data.data.EnableMeiye, | |
| 160 | + }); | |
| 161 | + }; | |
| 162 | + }); | |
| 163 | + | |
| 164 | + | |
| 165 | 165 | getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + os.stoid, {}).then(res => { |
| 166 | - if (res.data.code == 0) { | |
| 166 | + if(res.data.code==0){ | |
| 167 | 167 | var plusCard = res.data.data; |
| 168 | 168 | for (var i = 0; i < plusCard.length; i++) { |
| 169 | - if (!plusCard[i].IsStopBuy) { th.setData({ show_buy_plus: 1 }); break; } | |
| 169 | + if(!plusCard[i].IsStopBuy) { th.setData({show_buy_plus:1}); break; } | |
| 170 | 170 | } |
| 171 | 171 | } |
| 172 | 172 | }) |
| 173 | - | |
| 174 | - if (typeof this.getTabBar === 'function' && this.getTabBar()) { | |
| 175 | - var index = getApp().getPageIndex(this); | |
| 176 | - this.getTabBar().setData({ | |
| 177 | - active: index //数字是当前页面在tabbar的索引 | |
| 178 | - }); | |
| 179 | - //getApp().requestCardNum(this); | |
| 180 | - } | |
| 173 | + | |
| 174 | + if (typeof this.getTabBar === 'function' && this.getTabBar()) { | |
| 175 | + var index=getApp().getPageIndex(this); | |
| 176 | + this.getTabBar().setData({ | |
| 177 | + active: index //数字是当前页面在tabbar的索引 | |
| 178 | + }); | |
| 179 | + //getApp().requestCardNum(this); | |
| 180 | + } | |
| 181 | 181 | |
| 182 | 182 | |
| 183 | 183 | var stoid = app_d.setting.stoid; |
| ... | ... | @@ -186,293 +186,295 @@ Page({ |
| 186 | 186 | cur_g_num = 0; |
| 187 | 187 | |
| 188 | 188 | /*------会员登录------*/ |
| 189 | - var e = getApp().globalData.userInfo; | |
| 189 | + var e=getApp().globalData.userInfo; | |
| 190 | 190 | if (e != undefined && e != null && e.mobile) { |
| 191 | 191 | |
| 192 | - this.birthday(); | |
| 193 | - this.is_assistance(); | |
| 194 | - | |
| 195 | - s.setData({ | |
| 196 | - userInfo: e | |
| 197 | - }); | |
| 192 | + this.birthday(); | |
| 193 | + this.is_assistance(); | |
| 198 | 194 | |
| 199 | - //-- 要调用接口,获取卡的钱 -- | |
| 200 | - var url = "/api/weshop/wxuser/getWxCardInfo?storeId=" + os.stoid + "&userId=" + e.user_id; | |
| 201 | - rq.get(url, { | |
| 202 | - isShowLoading: 0, | |
| 203 | - success: function (su) { | |
| 204 | - if (su.data.code == 0) { | |
| 195 | + s.setData({ | |
| 196 | + userInfo: e | |
| 197 | + }); | |
| 198 | + | |
| 199 | + //-- 要调用接口,获取卡的钱 -- | |
| 200 | + var url="/api/weshop/wxuser/getWxCardInfo?storeId="+os.stoid+"&userId="+e.user_id; | |
| 201 | + rq.get(url,{ | |
| 202 | + isShowLoading:0, | |
| 203 | + success: function(su) { | |
| 204 | + if(su.data.code==0){ | |
| 205 | + s.setData({ | |
| 206 | + add_card_data: su.data.data, | |
| 207 | + }); | |
| 208 | + } | |
| 209 | + } | |
| 210 | + }); | |
| 211 | + | |
| 212 | + /*-----统计-----*/ | |
| 213 | + rq.get("/api/weshop/order/waitlist", { | |
| 214 | + isShowLoading:0, | |
| 215 | + data: { | |
| 216 | + user_id: app_d.user_id | |
| 217 | + }, | |
| 218 | + success: function(su) { | |
| 205 | 219 | s.setData({ |
| 206 | - add_card_data: su.data.data, | |
| 220 | + toji: su.data.data, | |
| 207 | 221 | }); |
| 208 | 222 | } |
| 209 | - } | |
| 210 | - }); | |
| 211 | - | |
| 212 | - /*-----统计-----*/ | |
| 213 | - rq.get("/api/weshop/order/waitlist", { | |
| 214 | - isShowLoading: 0, | |
| 215 | - data: { | |
| 216 | - user_id: app_d.user_id | |
| 217 | - }, | |
| 218 | - success: function (su) { | |
| 219 | - s.setData({ | |
| 220 | - toji: su.data.data, | |
| 221 | - }); | |
| 222 | - } | |
| 223 | - }) | |
| 224 | - /*-----获取线下会员的预存款和优惠券的数量-----*/ | |
| 225 | - rq.get("/api/weshop/users/getinfo/" + os.stoid + "/" + e.user_id, { | |
| 226 | - isShowLoading: 0, | |
| 227 | - success: function (su) { | |
| 228 | - if (su.data.code == 0 && su.data.data) { | |
| 229 | - var data = su.data.data; | |
| 230 | - if (!data) data = {}; | |
| 231 | - data.cashcount = parseInt(data.cashcount); | |
| 232 | - s.setData({ | |
| 233 | - udata: data, | |
| 234 | - }); | |
| 223 | + }) | |
| 224 | + /*-----获取线下会员的预存款和优惠券的数量-----*/ | |
| 225 | + rq.get("/api/weshop/users/getinfo/" + os.stoid + "/" + e.user_id, { | |
| 226 | + isShowLoading:0, | |
| 227 | + success: function(su) { | |
| 228 | + if(su.data.code==0 && su.data.data ) { | |
| 229 | + var data = su.data.data; | |
| 230 | + if(!data) data={}; | |
| 231 | + data.cashcount = parseInt(data.cashcount); | |
| 232 | + s.setData({ | |
| 233 | + udata: data, | |
| 234 | + }); | |
| 235 | + } | |
| 236 | + | |
| 235 | 237 | } |
| 236 | - | |
| 237 | - } | |
| 238 | - }) | |
| 239 | - /*-----获取会员提现金额-----*/ | |
| 240 | - rq.get("/api/weshop/withdrawals/summoney", { | |
| 241 | - isShowLoading: 0, | |
| 242 | - data: { | |
| 243 | - user_id: e.user_id, | |
| 244 | - store_id: os.stoid, | |
| 245 | - status: 0 | |
| 246 | - }, | |
| 247 | - success: function (su) { | |
| 248 | - if (su.data.code == 0) { | |
| 249 | - var yuer = parseFloat(th.data.userInfo.user_money - | |
| 250 | - th.data.userInfo.frozen_money - su.data.data.summoney).toFixed(2); | |
| 251 | - th.setData({ | |
| 252 | - txmon: su.data.data.summoney, | |
| 253 | - yuer: yuer | |
| 254 | - }); | |
| 238 | + }) | |
| 239 | + /*-----获取会员提现金额-----*/ | |
| 240 | + rq.get("/api/weshop/withdrawals/summoney", { | |
| 241 | + isShowLoading:0, | |
| 242 | + data: { | |
| 243 | + user_id: e.user_id, | |
| 244 | + store_id: os.stoid, | |
| 245 | + status: 0 | |
| 246 | + }, | |
| 247 | + success: function(su) { | |
| 248 | + if (su.data.code == 0) { | |
| 249 | + var yuer = parseFloat(th.data.userInfo.user_money - | |
| 250 | + th.data.userInfo.frozen_money - su.data.data.summoney).toFixed(2); | |
| 251 | + th.setData({ | |
| 252 | + txmon: su.data.data.summoney, | |
| 253 | + yuer: yuer | |
| 254 | + }); | |
| 255 | + } | |
| 255 | 256 | } |
| 256 | - } | |
| 257 | - }) | |
| 257 | + }) | |
| 258 | 258 | |
| 259 | - /*-----获取会员包邮券的数量-----*/ | |
| 260 | - rq.get("/api/weshop/userfeemail/page", { | |
| 261 | - isShowLoading: 0, | |
| 262 | - data: { | |
| 263 | - user_id: e.user_id, | |
| 264 | - store_id: os.stoid, | |
| 265 | - pageSize: 1, | |
| 266 | - isuse: 0 | |
| 267 | - }, | |
| 268 | - success: function (su) { | |
| 269 | - if (su.data.code == 0) { | |
| 270 | - th.setData({ | |
| 271 | - byquan: parseInt(su.data.data.total) | |
| 272 | - }); | |
| 259 | + /*-----获取会员包邮券的数量-----*/ | |
| 260 | + rq.get("/api/weshop/userfeemail/page", { | |
| 261 | + isShowLoading:0, | |
| 262 | + data: { | |
| 263 | + user_id: e.user_id, | |
| 264 | + store_id: os.stoid, | |
| 265 | + pageSize: 1, | |
| 266 | + isuse: 0 | |
| 267 | + }, | |
| 268 | + success: function(su) { | |
| 269 | + if (su.data.code == 0) { | |
| 270 | + th.setData({ | |
| 271 | + byquan: parseInt(su.data.data.total) | |
| 272 | + }); | |
| 273 | + } | |
| 273 | 274 | } |
| 274 | - } | |
| 275 | - }); | |
| 276 | - | |
| 277 | - /*-----物流信息提醒-----*/ | |
| 278 | - rq.get('/api/weshop/order/countDadaOrder', { | |
| 279 | - isShowLoading: 0, | |
| 280 | - data: { | |
| 281 | - user_id: e.user_id, | |
| 282 | - store_id: os.stoid, | |
| 283 | - }, | |
| 284 | - success: function (su) { | |
| 285 | - if (su.data.code == 0) { | |
| 286 | - th.setData({ | |
| 287 | - countDadaOrder: su.data.data | |
| 288 | - }); | |
| 275 | + }); | |
| 276 | + | |
| 277 | + /*-----物流信息提醒-----*/ | |
| 278 | + rq.get('/api/weshop/order/countDadaOrder', { | |
| 279 | + isShowLoading:0, | |
| 280 | + data: { | |
| 281 | + user_id: e.user_id, | |
| 282 | + store_id: os.stoid, | |
| 283 | + }, | |
| 284 | + success: function(su) { | |
| 285 | + if (su.data.code == 0) { | |
| 286 | + th.setData({ | |
| 287 | + countDadaOrder: su.data.data | |
| 288 | + }); | |
| 289 | + } | |
| 290 | + } | |
| 291 | + }); | |
| 292 | + | |
| 293 | + | |
| 294 | + | |
| 295 | + | |
| 296 | + //--初始化是否有打勾-- | |
| 297 | + getApp().request.get("/api/weshop/users/grade/vip/init/get", { | |
| 298 | + data: { | |
| 299 | + storeId: os.stoid | |
| 300 | + }, | |
| 301 | + success:function (rs) { | |
| 302 | + if(rs.data.code==0 && rs.data.data.isBool){ | |
| 303 | + th.setData({is_init:1}); | |
| 304 | + /*-----获取会员权益列表-----*/ | |
| 305 | + rq.get("/api/weshop/users/grade/vipprivilegeinfo/page", { | |
| 306 | + isShowLoading:0, | |
| 307 | + data: { | |
| 308 | + storeId: os.stoid, | |
| 309 | + pageSize: 100 | |
| 310 | + }, | |
| 311 | + success: async function(res) { | |
| 312 | + | |
| 313 | + //判断有没有值,没有值返回 | |
| 314 | + if(!ut.ajax_ok(res)) return false; | |
| 315 | + | |
| 316 | + var arr_data = res.data.data.pageData; | |
| 317 | + var gid = null, | |
| 318 | + g_qy_list = null, | |
| 319 | + cz_vals = 0, | |
| 320 | + need_money = 0, | |
| 321 | + backClass = null, | |
| 322 | + | |
| 323 | + GradeName = ''; | |
| 324 | + | |
| 325 | + //获取成长值 | |
| 326 | + await getApp().request.promiseGet("/api/weshop/users/grade/aftervipinfo/get", { | |
| 327 | + data: { | |
| 328 | + storeId: os.stoid, | |
| 329 | + userId: app_d.user_id | |
| 330 | + } | |
| 331 | + }).then(res => { | |
| 332 | + if (res.data.code == 0 && res.data.data) { | |
| 333 | + gid = res.data.data.GradeId; | |
| 334 | + var cz_val = res.data.data.GradeSum; | |
| 335 | + cz_vals = parseInt(cz_val); | |
| 336 | + GradeName = res.data.data.GradeName; | |
| 337 | + } | |
| 338 | + //th.setData({ cz_val: cz_vals, GradeName: res.data.data.GradeName, is_init: is_init, gradeId: gid}); | |
| 339 | + }) | |
| 340 | + var obj = { | |
| 341 | + cz_val: cz_vals, | |
| 342 | + GradeName: GradeName, | |
| 343 | + gradeId: gid, | |
| 344 | + is_grad_get:1 | |
| 345 | + }; | |
| 346 | + | |
| 347 | + // 获取最大值 | |
| 348 | + await getApp().request.promiseGet("/api/weshop/users/grade/vipgradeinfo/page", { | |
| 349 | + data: { | |
| 350 | + storeId: os.stoid | |
| 351 | + } | |
| 352 | + }).then(res => { | |
| 353 | + if (res.data.data) | |
| 354 | + backClass = res.data.data.pageData; | |
| 355 | + if (backClass) { | |
| 356 | + var full_cz_val = backClass[backClass.length - 1].BuyGradeSum; | |
| 357 | + //th.setData({ full_cz_val: full_cz_val}); | |
| 358 | + obj.full_cz_val = full_cz_val | |
| 359 | + } | |
| 360 | + }) | |
| 361 | + | |
| 362 | + //--会员权益中心页的修改-- | |
| 363 | + for (var i in backClass) { | |
| 364 | + var im = backClass[i]; | |
| 365 | + if (cz_vals < im.BuyGradeSum && need_money == 0) { | |
| 366 | + need_money = im.BuyGradeSum; | |
| 367 | + obj.need_money = need_money; | |
| 368 | + } | |
| 369 | + } | |
| 370 | + | |
| 371 | + //获取当前等级的特权 | |
| 372 | + await getApp().request.promiseGet("/api/weshop/users/grade/privilegeform/list/page", { | |
| 373 | + data: { | |
| 374 | + storeId: os.stoid, | |
| 375 | + GradeId: gid, | |
| 376 | + userId: app_d.user_id, | |
| 377 | + pageSize: 100 | |
| 378 | + } | |
| 379 | + }).then(res => { | |
| 380 | + if (res.data.data) | |
| 381 | + g_qy_list = res.data.data.pageData; | |
| 382 | + }); | |
| 383 | + | |
| 384 | + for (var i in arr_data) { | |
| 385 | + var item = arr_data[i]; | |
| 386 | + var FromId = th.check_is_has_qy(item, g_qy_list); | |
| 387 | + arr_data[i].ishas = 0; | |
| 388 | + if (FromId) { | |
| 389 | + arr_data[i].ishas = 1; | |
| 390 | + arr_data[i].FromId = FromId; | |
| 391 | + } | |
| 392 | + } | |
| 393 | + arr_data.sort(function(a, b) { | |
| 394 | + return b.ishas - a.ishas | |
| 395 | + }) | |
| 396 | + | |
| 397 | + //4个4个一组 | |
| 398 | + var arr = new Array(); | |
| 399 | + for (var i = 0; i < arr_data.length; i += 4) { | |
| 400 | + arr.push(arr_data.slice(i, i + 4)); | |
| 401 | + } | |
| 402 | + //th.setData({ qy_list: arr, need_money: need_money}); | |
| 403 | + obj.qy_list = arr; | |
| 404 | + th.setData(obj); | |
| 405 | + } | |
| 406 | + }) | |
| 407 | + } | |
| 408 | + } | |
| 409 | + }) | |
| 410 | + | |
| 411 | + | |
| 412 | + | |
| 413 | + /*-- 获取 --*/ | |
| 414 | + th.requestRecommend(); | |
| 415 | + | |
| 416 | + /*-------系统是否开通等级卡,会员是等级卡-----*/ | |
| 417 | + getApp().getConfig2(function(e) { | |
| 418 | + var t_swi = e.switch_list; | |
| 419 | + if (t_swi) t_swi = JSON.parse(t_swi) | |
| 420 | + if(t_swi){ | |
| 421 | + th.setData({sys_switch:t_swi}); | |
| 422 | + | |
| 423 | + var user_tool=[]; | |
| 424 | + if(t_swi.usertool) user_tool=JSON.parse(t_swi.usertool); | |
| 425 | + th.setData({c_list:user_tool}) | |
| 426 | + | |
| 289 | 427 | } |
| 290 | - } | |
| 291 | - }); | |
| 292 | - | |
| 293 | - | |
| 294 | - | |
| 295 | - | |
| 296 | - //--初始化是否有打勾-- | |
| 297 | - getApp().request.get("/api/weshop/users/grade/vip/init/get", { | |
| 298 | - data: { | |
| 299 | - storeId: os.stoid | |
| 300 | - }, | |
| 301 | - success: function (rs) { | |
| 302 | - if (rs.data.code == 0 && rs.data.data.isBool) { | |
| 303 | - th.setData({ is_init: 1 }); | |
| 304 | - /*-----获取会员权益列表-----*/ | |
| 305 | - rq.get("/api/weshop/users/grade/vipprivilegeinfo/page", { | |
| 306 | - isShowLoading: 0, | |
| 307 | - data: { | |
| 308 | - storeId: os.stoid, | |
| 309 | - pageSize: 100 | |
| 310 | - }, | |
| 311 | - success: async function (res) { | |
| 312 | - | |
| 313 | - //判断有没有值,没有值返回 | |
| 314 | - if (!ut.ajax_ok(res)) return false; | |
| 315 | 428 | |
| 316 | - var arr_data = res.data.data.pageData; | |
| 317 | - var gid = null, | |
| 318 | - g_qy_list = null, | |
| 319 | - cz_vals = 0, | |
| 320 | - need_money = 0, | |
| 321 | - backClass = null, | |
| 322 | 429 | |
| 323 | - GradeName = ''; | |
| 324 | - | |
| 325 | - //获取成长值 | |
| 326 | - await getApp().request.promiseGet("/api/weshop/users/grade/aftervipinfo/get", { | |
| 327 | - data: { | |
| 328 | - storeId: os.stoid, | |
| 329 | - userId: app_d.user_id | |
| 330 | - } | |
| 331 | - }).then(res => { | |
| 332 | - if (res.data.code == 0 && res.data.data) { | |
| 333 | - gid = res.data.data.GradeId; | |
| 334 | - var cz_val = res.data.data.GradeSum; | |
| 335 | - cz_vals = parseInt(cz_val); | |
| 336 | - GradeName = res.data.data.GradeName; | |
| 337 | - } | |
| 338 | - //th.setData({ cz_val: cz_vals, GradeName: res.data.data.GradeName, is_init: is_init, gradeId: gid}); | |
| 430 | + if (parseInt(t_swi.rank_switch) == 2) { | |
| 431 | + var userInfo = th.data.userInfo; | |
| 432 | + if (userInfo.card_field != null && userInfo.card_field != undefined && userInfo.card_field != "") { | |
| 433 | + var now = ut.gettimestamp(); | |
| 434 | + var str = userInfo.card_expiredate; | |
| 435 | + var end = new Date(str); | |
| 436 | + end = Date.parse(end) / 1000; | |
| 437 | + //---判断是不是有过期--- | |
| 438 | + if (now < end) { | |
| 439 | + th.setData({ | |
| 440 | + is_dengji: 1 | |
| 339 | 441 | }) |
| 340 | - var obj = { | |
| 341 | - cz_val: cz_vals, | |
| 342 | - GradeName: GradeName, | |
| 343 | - gradeId: gid, | |
| 344 | - is_grad_get: 1 | |
| 345 | - }; | |
| 346 | - | |
| 347 | - // 获取最大值 | |
| 348 | - await getApp().request.promiseGet("/api/weshop/users/grade/vipgradeinfo/page", { | |
| 349 | - data: { | |
| 350 | - storeId: os.stoid | |
| 351 | - } | |
| 352 | - }).then(res => { | |
| 353 | - if (res.data.data) | |
| 354 | - backClass = res.data.data.pageData; | |
| 355 | - if (backClass) { | |
| 356 | - var full_cz_val = backClass[backClass.length - 1].BuyGradeSum; | |
| 357 | - //th.setData({ full_cz_val: full_cz_val}); | |
| 358 | - obj.full_cz_val = full_cz_val | |
| 359 | - } | |
| 442 | + } else { | |
| 443 | + th.setData({ | |
| 444 | + is_dengji: 3 | |
| 360 | 445 | }) |
| 361 | - | |
| 362 | - //--会员权益中心页的修改-- | |
| 363 | - for (var i in backClass) { | |
| 364 | - var im = backClass[i]; | |
| 365 | - if (cz_vals < im.BuyGradeSum && need_money == 0) { | |
| 366 | - need_money = im.BuyGradeSum; | |
| 367 | - obj.need_money = need_money; | |
| 368 | - } | |
| 369 | - } | |
| 370 | - | |
| 371 | - //获取当前等级的特权 | |
| 372 | - await getApp().request.promiseGet("/api/weshop/users/grade/privilegeform/list/page", { | |
| 373 | - data: { | |
| 374 | - storeId: os.stoid, | |
| 375 | - GradeId: gid, | |
| 376 | - userId: app_d.user_id, | |
| 377 | - pageSize: 100 | |
| 378 | - } | |
| 379 | - }).then(res => { | |
| 380 | - if (res.data.data) | |
| 381 | - g_qy_list = res.data.data.pageData; | |
| 382 | - }); | |
| 383 | - | |
| 384 | - for (var i in arr_data) { | |
| 385 | - var item = arr_data[i]; | |
| 386 | - var FromId = th.check_is_has_qy(item, g_qy_list); | |
| 387 | - arr_data[i].ishas = 0; | |
| 388 | - if (FromId) { | |
| 389 | - arr_data[i].ishas = 1; | |
| 390 | - arr_data[i].FromId = FromId; | |
| 391 | - } | |
| 392 | - } | |
| 393 | - arr_data.sort(function (a, b) { | |
| 394 | - return b.ishas - a.ishas | |
| 395 | - }) | |
| 396 | - | |
| 397 | - //4个4个一组 | |
| 398 | - var arr = new Array(); | |
| 399 | - for (var i = 0; i < arr_data.length; i += 4) { | |
| 400 | - arr.push(arr_data.slice(i, i + 4)); | |
| 401 | - } | |
| 402 | - //th.setData({ qy_list: arr, need_money: need_money}); | |
| 403 | - obj.qy_list = arr; | |
| 404 | - th.setData(obj); | |
| 405 | 446 | } |
| 406 | - }) | |
| 407 | - } | |
| 408 | - } | |
| 409 | - }) | |
| 410 | - | |
| 411 | - /*-- 获取 --*/ | |
| 412 | - th.requestRecommend(); | |
| 413 | - | |
| 414 | - /*-------系统是否开通等级卡,会员是等级卡-----*/ | |
| 415 | - getApp().getConfig2(function (e) { | |
| 416 | - var t_swi = e.switch_list; | |
| 417 | - if (t_swi) t_swi = JSON.parse(t_swi) | |
| 418 | - if (t_swi) { | |
| 419 | - th.setData({ sys_switch: t_swi }); | |
| 420 | - | |
| 421 | - var user_tool = []; | |
| 422 | - if (t_swi.usertool) user_tool = JSON.parse(t_swi.usertool); | |
| 423 | - th.setData({ c_list: user_tool }) | |
| 424 | - | |
| 425 | - } | |
| 426 | - | |
| 427 | - | |
| 428 | - if (parseInt(t_swi.rank_switch) == 2) { | |
| 429 | - var userInfo = th.data.userInfo; | |
| 430 | - if (userInfo.card_field != null && userInfo.card_field != undefined && userInfo.card_field != "") { | |
| 431 | - var now = ut.gettimestamp(); | |
| 432 | - var str = userInfo.card_expiredate; | |
| 433 | - var end = new Date(str); | |
| 434 | - end = Date.parse(end) / 1000; | |
| 435 | - //---判断是不是有过期--- | |
| 436 | - if (now < end) { | |
| 437 | - th.setData({ | |
| 438 | - is_dengji: 1 | |
| 439 | - }) | |
| 440 | 447 | } else { |
| 441 | 448 | th.setData({ |
| 442 | - is_dengji: 3 | |
| 449 | + is_dengji: 2 | |
| 443 | 450 | }) |
| 444 | 451 | } |
| 445 | - } else { | |
| 446 | - th.setData({ | |
| 447 | - is_dengji: 2 | |
| 448 | - }) | |
| 449 | 452 | } |
| 450 | - } | |
| 451 | - }) | |
| 452 | - //th.requestRecommend(); | |
| 453 | - | |
| 454 | - | |
| 455 | - | |
| 456 | - | |
| 457 | - | |
| 458 | - } | |
| 453 | + }) | |
| 454 | + //th.requestRecommend(); | |
| 455 | + | |
| 456 | + | |
| 457 | + | |
| 458 | + | |
| 459 | + | |
| 460 | + } | |
| 461 | + | |
| 462 | + /*-- | |
| 463 | + var t_swi= getApp().globalData.config2.switch_list | |
| 464 | + if (t_swi){ | |
| 465 | + t_swi = JSON.parse(t_swi); | |
| 466 | + var user_tool=[]; | |
| 467 | + if(t_swi.usertool) user_tool=JSON.parse(t_swi.usertool); | |
| 468 | + th.setData({c_list:user_tool}) | |
| 469 | + } --*/ | |
| 459 | 470 | |
| 460 | - /*-- | |
| 461 | - var t_swi= getApp().globalData.config2.switch_list | |
| 462 | - if (t_swi){ | |
| 463 | - t_swi = JSON.parse(t_swi); | |
| 464 | - var user_tool=[]; | |
| 465 | - if(t_swi.usertool) user_tool=JSON.parse(t_swi.usertool); | |
| 466 | - th.setData({c_list:user_tool}) | |
| 467 | - } --*/ | |
| 468 | - | |
| 469 | - //自定义组件一定要等到页面加载完了,才来调用selectComponnent | |
| 470 | - setTimeout(function () { | |
| 471 | - if (getApp().globalData.user_id) getApp().requestCardNum(th); | |
| 472 | - var goods_list = th.selectComponent("#goods_recommend"); //组件的id | |
| 473 | - goods_list.init(); | |
| 474 | - goods_list.get_list(); | |
| 475 | - }, 800) | |
| 471 | + //自定义组件一定要等到页面加载完了,才来调用selectComponnent | |
| 472 | + setTimeout(function () { | |
| 473 | + if (getApp().globalData.user_id) getApp().requestCardNum(th); | |
| 474 | + var goods_list = th.selectComponent("#goods_recommend"); //组件的id | |
| 475 | + goods_list.init(); | |
| 476 | + goods_list.get_list(); | |
| 477 | + },800) | |
| 476 | 478 | |
| 477 | 479 | |
| 478 | 480 | |
| ... | ... | @@ -481,7 +483,7 @@ Page({ |
| 481 | 483 | |
| 482 | 484 | |
| 483 | 485 | //判断会员是后有改服务项目 |
| 484 | - check_is_has_qy: function (item, g_qy_list) { | |
| 486 | + check_is_has_qy: function(item, g_qy_list) { | |
| 485 | 487 | if (!g_qy_list) return false; |
| 486 | 488 | |
| 487 | 489 | for (var i in g_qy_list) { |
| ... | ... | @@ -494,13 +496,13 @@ Page({ |
| 494 | 496 | /** |
| 495 | 497 | * 生命周期函数--监听页面隐藏 |
| 496 | 498 | */ |
| 497 | - onHide: function () { | |
| 498 | - for (var i = 1; i < 100; i++) { | |
| 499 | + onHide: function() { | |
| 500 | + for(var i = 1; i < 100; i++) { | |
| 499 | 501 | clearInterval(i); |
| 500 | 502 | } |
| 501 | 503 | }, |
| 502 | - setappdata: function (t) { | |
| 503 | - var t = getApp().globalData.wxapp_buy_obj; | |
| 504 | + setappdata: function(t) { | |
| 505 | + var t=getApp().globalData.wxapp_buy_obj; | |
| 504 | 506 | if (t && t.isout == 1) |
| 505 | 507 | wx.navigateTo({ |
| 506 | 508 | url: "/pages/error/error?msg=小程序已经过期", |
| ... | ... | @@ -514,11 +516,11 @@ Page({ |
| 514 | 516 | /** |
| 515 | 517 | * 页面上拉触底事件的处理函数 |
| 516 | 518 | */ |
| 517 | - onReachBottom: function () { | |
| 519 | + onReachBottom: function() { | |
| 518 | 520 | //!this.nomore && this.requestRecommend(); |
| 519 | 521 | var goods_list = this.selectComponent("#goods_recommend"); //组件的id |
| 520 | 522 | goods_list.init(); |
| 521 | - setTimeout(function () { | |
| 523 | + setTimeout(function() { | |
| 522 | 524 | goods_list.get_list(); |
| 523 | 525 | }, 300) |
| 524 | 526 | }, |
| ... | ... | @@ -526,42 +528,42 @@ Page({ |
| 526 | 528 | /** |
| 527 | 529 | * 用户点击右上角分享 |
| 528 | 530 | */ |
| 529 | - onShareAppMessage: function () { }, | |
| 531 | + onShareAppMessage: function() {}, | |
| 530 | 532 | |
| 531 | 533 | //------卡片的显示和关闭-------- |
| 532 | - show_tc: function () { | |
| 534 | + show_tc: function() { | |
| 533 | 535 | if (!this.data.userInfo) return false; |
| 534 | 536 | //base64_encode($user.mobile.'|'.date('Y-m-d H:i:s') |
| 535 | - var val = this.data.userInfo.mobile + "|" + ut.formatTime(); | |
| 536 | - val = "^" + ut.base64_encode(val); | |
| 537 | + var val=this.data.userInfo.mobile+"|"+ut.formatTime(); | |
| 538 | + val="^"+ut.base64_encode(val); | |
| 537 | 539 | |
| 538 | 540 | qrcode('qrcode', val, 480, 480, this); |
| 539 | 541 | this.setData({ |
| 540 | 542 | tc_hide: false, |
| 541 | 543 | }); |
| 542 | 544 | }, |
| 543 | - hide_tc: function () { | |
| 545 | + hide_tc: function() { | |
| 544 | 546 | this.setData({ |
| 545 | 547 | tc_hide: true, |
| 546 | 548 | }); |
| 547 | 549 | }, |
| 548 | 550 | |
| 549 | 551 | //--跳转到预存款页面-- |
| 550 | - deposit: function () { | |
| 552 | + deposit: function() { | |
| 551 | 553 | if (!this.data.userInfo) return false; |
| 552 | 554 | wx.navigateTo({ |
| 553 | 555 | url: '../deposit/deposit', |
| 554 | 556 | }) |
| 555 | 557 | }, |
| 556 | 558 | //--跳转到余额页面-- |
| 557 | - balance: function () { | |
| 559 | + balance: function() { | |
| 558 | 560 | if (!this.data.userInfo) return false; |
| 559 | 561 | wx.navigateTo({ |
| 560 | 562 | url: '../member/menber', |
| 561 | 563 | }) |
| 562 | 564 | }, |
| 563 | 565 | //--跳转到优惠券-- |
| 564 | - coupon: function () { | |
| 566 | + coupon: function() { | |
| 565 | 567 | var th = this; |
| 566 | 568 | if (!this.data.userInfo) return false; |
| 567 | 569 | // th.sendsm(); |
| ... | ... | @@ -570,20 +572,20 @@ Page({ |
| 570 | 572 | }) |
| 571 | 573 | }, |
| 572 | 574 | //--跳转到积分-- |
| 573 | - integral: function () { | |
| 575 | + integral: function() { | |
| 574 | 576 | if (!this.data.userInfo) return false; |
| 575 | 577 | wx.navigateTo({ |
| 576 | 578 | url: '../integral/integral', |
| 577 | 579 | }) |
| 578 | 580 | }, |
| 579 | 581 | //--跳到绑定页面-- |
| 580 | - gobindtel: function () { | |
| 582 | + gobindtel: function() { | |
| 581 | 583 | wx.navigateTo({ |
| 582 | 584 | url: '/pages/togoin/togoin', |
| 583 | 585 | }) |
| 584 | 586 | }, |
| 585 | 587 | |
| 586 | - go_order: function (e) { | |
| 588 | + go_order: function(e) { | |
| 587 | 589 | if (!this.data.userInfo) return false; |
| 588 | 590 | var url = e.currentTarget.dataset.url; |
| 589 | 591 | wx.navigateTo({ |
| ... | ... | @@ -593,7 +595,7 @@ Page({ |
| 593 | 595 | }, |
| 594 | 596 | |
| 595 | 597 | //--加载更多商品-- |
| 596 | - requestRecommend: function () { | |
| 598 | + requestRecommend: function() { | |
| 597 | 599 | var e = this, |
| 598 | 600 | t = '/api/weshop/goods/page?page=' + e.data.currentPage; |
| 599 | 601 | var th_recommend_list = e.data.recommend_list; |
| ... | ... | @@ -606,7 +608,7 @@ Page({ |
| 606 | 608 | store_id: os.stoid, |
| 607 | 609 | pageSize: 10 |
| 608 | 610 | }, |
| 609 | - success: function (ee) { | |
| 611 | + success: function(ee) { | |
| 610 | 612 | var recommend_list = ee.data.data.pageData; |
| 611 | 613 | if (recommend_list && recommend_list.length > 0) { |
| 612 | 614 | var dd = [...th_recommend_list, ...recommend_list]; |
| ... | ... | @@ -625,20 +627,20 @@ Page({ |
| 625 | 627 | }, |
| 626 | 628 | |
| 627 | 629 | //--跳转到权益页面-- |
| 628 | - go_qy: function () { | |
| 630 | + go_qy: function() { | |
| 629 | 631 | if (!this.data.userInfo) return false; |
| 630 | 632 | var url = "/pages/user/userqy/userqy"; |
| 631 | 633 | getApp().goto(url); |
| 632 | 634 | }, |
| 633 | 635 | |
| 634 | 636 | //--跳转到商品详情页面-- |
| 635 | - go_goods: function (e) { | |
| 637 | + go_goods: function(e) { | |
| 636 | 638 | var gid = e.currentTarget.dataset.gid; |
| 637 | 639 | var url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" + gid; |
| 638 | 640 | getApp().goto(url); |
| 639 | 641 | }, |
| 640 | 642 | |
| 641 | - click_next: function () { | |
| 643 | + click_next: function() { | |
| 642 | 644 | var index = this.data.sw_index; |
| 643 | 645 | index++; |
| 644 | 646 | if (index >= this.data.qy_list.length) return; |
| ... | ... | @@ -647,7 +649,7 @@ Page({ |
| 647 | 649 | }) |
| 648 | 650 | }, |
| 649 | 651 | |
| 650 | - click_pre: function () { | |
| 652 | + click_pre: function() { | |
| 651 | 653 | var index = this.data.sw_index; |
| 652 | 654 | index--; |
| 653 | 655 | if (index < 0) return; |
| ... | ... | @@ -656,7 +658,7 @@ Page({ |
| 656 | 658 | }) |
| 657 | 659 | }, |
| 658 | 660 | |
| 659 | - onSli: function (e) { | |
| 661 | + onSli: function(e) { | |
| 660 | 662 | var that = this; |
| 661 | 663 | that.setData({ |
| 662 | 664 | sw_index: e.detail.current |
| ... | ... | @@ -664,7 +666,7 @@ Page({ |
| 664 | 666 | }, |
| 665 | 667 | |
| 666 | 668 | //--权益使用-- |
| 667 | - go_qy_url: function (e) { | |
| 669 | + go_qy_url: function(e) { | |
| 668 | 670 | var th = this; |
| 669 | 671 | var no = e.currentTarget.dataset.no; |
| 670 | 672 | var ind = e.currentTarget.dataset.ind; |
| ... | ... | @@ -681,8 +683,8 @@ Page({ |
| 681 | 683 | } |
| 682 | 684 | |
| 683 | 685 | var url = e.currentTarget.dataset.img; |
| 684 | - if (!url || url == "") { | |
| 685 | - url = `/public/upload/userqy/quanbg.jpg` | |
| 686 | + if(!url || url==""){ | |
| 687 | + url=`/public/upload/userqy/quanbg.jpg` | |
| 686 | 688 | } |
| 687 | 689 | switch (no) { |
| 688 | 690 | case "01": |
| ... | ... | @@ -694,7 +696,7 @@ Page({ |
| 694 | 696 | break; |
| 695 | 697 | case "03": |
| 696 | 698 | getApp().goto("/pages/user/user_spsy/user_spsy?img=" + |
| 697 | - url + "&gradeId=" + th.data.gradeId + "&FormId=" + item.Id); | |
| 699 | + url + "&gradeId=" + th.data.gradeId + "&FormId=" + item.Id); | |
| 698 | 700 | break; |
| 699 | 701 | case "10": |
| 700 | 702 | getApp().request.get("/api/weshop/users/grade/vipprivilegelist/other/get", { |
| ... | ... | @@ -704,7 +706,7 @@ Page({ |
| 704 | 706 | userId: getApp().globalData.user_id, |
| 705 | 707 | gradeId: th.data.gradeId |
| 706 | 708 | }, |
| 707 | - success: function (res) { | |
| 709 | + success: function(res) { | |
| 708 | 710 | var val = res.data.data.Remark; |
| 709 | 711 | var title = res.data.data.PrivilegeName; |
| 710 | 712 | var qt_txt = th.selectComponent("#pop_txt"); //组件的id |
| ... | ... | @@ -720,20 +722,20 @@ Page({ |
| 720 | 722 | }, |
| 721 | 723 | |
| 722 | 724 | //跳转到链接 |
| 723 | - goto: function (e) { | |
| 725 | + goto: function(e) { | |
| 724 | 726 | var url = e.currentTarget.dataset.url; |
| 725 | 727 | getApp().goto(url); |
| 726 | 728 | }, |
| 727 | 729 | |
| 728 | 730 | //---------联系客服------------ |
| 729 | - contactService: function () { | |
| 731 | + contactService: function() { | |
| 730 | 732 | var s = getApp(); |
| 731 | - s.getConfig(function (t) { | |
| 733 | + s.getConfig(function(t) { | |
| 732 | 734 | if (t.store_tel == undefined) { |
| 733 | 735 | getApp().request.get("/api/weshop/store/get/" + os.stoid, { |
| 734 | 736 | isShowLoading: 1, |
| 735 | 737 | data: {}, |
| 736 | - success: function (rs) { | |
| 738 | + success: function(rs) { | |
| 737 | 739 | getApp().globalData.config = rs.data.data; |
| 738 | 740 | if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) { |
| 739 | 741 | getApp().showWarning("商家未设置电话"); |
| ... | ... | @@ -748,15 +750,15 @@ Page({ |
| 748 | 750 | }); |
| 749 | 751 | }, |
| 750 | 752 | |
| 751 | - go_info: function () { | |
| 753 | + go_info: function() { | |
| 752 | 754 | getApp().goto("/pages/user/userinfo/userinfo"); |
| 753 | 755 | }, |
| 754 | 756 | |
| 755 | - jump: function () { | |
| 757 | + jump: function() { | |
| 756 | 758 | getApp().goto("/pages/user/grow_value/grow_value") |
| 757 | 759 | }, |
| 758 | 760 | // 判断生日营销的页面是不是存在 |
| 759 | - birthday: function () { | |
| 761 | + birthday: function() { | |
| 760 | 762 | |
| 761 | 763 | var th = this; |
| 762 | 764 | rq.get("/api/weshop/marketing/birthday/act/judge", { |
| ... | ... | @@ -769,13 +771,13 @@ Page({ |
| 769 | 771 | var actId = res.data.data.id; |
| 770 | 772 | var actImg = res.data.data.actImg; |
| 771 | 773 | th.setData({ giftbagid: giftbagid, actId: actId, actImg: actImg }); |
| 772 | - th.setData({ is_banner: 1 }); | |
| 774 | + th.setData({is_banner:1}); | |
| 773 | 775 | } |
| 774 | 776 | |
| 775 | 777 | } |
| 776 | 778 | }) |
| 777 | 779 | }, |
| 778 | - clike_banne: function () { | |
| 780 | + clike_banne: function() { | |
| 779 | 781 | var th = this; |
| 780 | 782 | var actId = th.data.actId; |
| 781 | 783 | var giftbagid = th.data.giftbagid; |
| ... | ... | @@ -790,141 +792,143 @@ Page({ |
| 790 | 792 | }, |
| 791 | 793 | |
| 792 | 794 | // 判断助力活动是不是存在 |
| 793 | - is_assistance: function () { | |
| 794 | - var th = this, r = Math.random() * 100; | |
| 795 | + is_assistance: function() { | |
| 796 | + var th = this,r=Math.random()*100; | |
| 795 | 797 | rq.get("/api/weshop/marketing/help/act/judge", { |
| 796 | 798 | data: { |
| 797 | 799 | storeId: os.stoid, |
| 798 | 800 | userId: app_d.user_id, |
| 799 | - r: r, | |
| 801 | + r:r, | |
| 800 | 802 | }, |
| 801 | - success: function (res) { | |
| 803 | + success: function(res) { | |
| 802 | 804 | var code = res.data.code; |
| 803 | 805 | if (code == 0) { |
| 804 | 806 | th.setData({ |
| 805 | 807 | is_assistance: 1 |
| 806 | 808 | }); |
| 807 | - } else { | |
| 808 | - th.setData({ | |
| 809 | - is_assistance: 0 | |
| 810 | - }); | |
| 811 | - } | |
| 809 | + }else{ | |
| 810 | + th.setData({ | |
| 811 | + is_assistance: 0 | |
| 812 | + }); | |
| 813 | + } | |
| 812 | 814 | |
| 813 | 815 | } |
| 814 | 816 | }) |
| 815 | 817 | }, |
| 816 | 818 | |
| 817 | 819 | //导航跳转 |
| 818 | - nav_goto: function (e) { | |
| 819 | - var url = e.currentTarget.dataset.url; | |
| 820 | - if (!url || url == '') return; | |
| 821 | - if (url[0] != '/') url = '/' + url; | |
| 822 | - getApp().goto(url); | |
| 823 | - }, | |
| 824 | - | |
| 825 | - //添加卡包 | |
| 826 | - addcard: function () { | |
| 827 | - var res = this.data.add_card_data; | |
| 828 | - if (!res) return false; | |
| 829 | - | |
| 830 | - var arr = new Array(6) | |
| 831 | - arr[0] = res.code; | |
| 832 | - arr[1] = res.timestamp; | |
| 833 | - arr[2] = res.jsapiTicket; | |
| 834 | - arr[3] = res.openid; | |
| 835 | - arr[4] = res.cardid; | |
| 836 | - arr[5] = res.nonceStr; | |
| 837 | - var c = arr.sort(); | |
| 838 | - var newstr = ""; | |
| 839 | - for (var i = 0; i < c.length; i++) { | |
| 840 | - newstr += c[i]; | |
| 841 | - } | |
| 842 | - | |
| 843 | - var sh1 = ut.sha1(newstr); | |
| 844 | - wx.addCard({ | |
| 845 | - cardList: [ | |
| 846 | - { | |
| 847 | - cardId: res.cardid, | |
| 848 | - cardExt: '{"code": "' + res.code + '", "openid": "' + res.openid + '","timestamp": "' + res.timestamp + '","nonce_str":"' + res.nonceStr + '","outer_str":"web", "signature":"' + sh1 + '"}' | |
| 849 | - } | |
| 850 | - | |
| 851 | - ], | |
| 852 | - success: function (res) { }, | |
| 853 | - cancel: function (res) { } | |
| 854 | - }); | |
| 855 | - }, | |
| 856 | - | |
| 857 | - //订阅消息提醒 | |
| 858 | - sendsm: function () { | |
| 859 | - var template_id = ""; | |
| 860 | - rq.get("/api/wx/weappSendlist/page", { | |
| 861 | - data: { | |
| 862 | - store_id: os.stoid, | |
| 863 | - typeid: "1020" | |
| 864 | - }, | |
| 865 | - success: function (res) { | |
| 866 | - if (res.data.code == 0 && res.data.data.pageData.length > 0) { | |
| 867 | - template_id = res.data.data.pageData[0].template_id; | |
| 868 | - // //授权订阅 | |
| 869 | - wx.requestSubscribeMessage({ | |
| 870 | - tmplIds: [template_id], | |
| 871 | - success(res) { | |
| 872 | - | |
| 873 | - }, | |
| 874 | - fail(res) { | |
| 875 | - | |
| 876 | - } | |
| 877 | - }) | |
| 878 | - } | |
| 879 | - } | |
| 880 | - }) | |
| 881 | - }, | |
| 882 | - | |
| 883 | - con_weixin: function () { | |
| 884 | - var url = this.data.sys_switch.weapp_customertype_url; | |
| 885 | - var id = this.data.sys_switch.weapp_customertype_appid; | |
| 886 | - wx.openCustomerServiceChat({ | |
| 887 | - extInfo: { url: url }, | |
| 888 | - corpId: id, | |
| 889 | - success(res) { } | |
| 890 | - }) | |
| 891 | - }, | |
| 892 | - | |
| 893 | - //初始话按钮图标 | |
| 894 | - init_user_tool: async function () { | |
| 895 | - var d_list = null; | |
| 896 | - //读取user_tool按钮图标 | |
| 897 | - await getApp().promiseGet("/api/weshop/userTool/page?pageSize=100&store_id=" + os.stoid, { | |
| 898 | - }).then(res => { | |
| 899 | - if (ut.ajax_ok(res)) { | |
| 900 | - d_list = res.data.data.pageData; | |
| 901 | - } | |
| 902 | - }) | |
| 903 | - if (!d_list) return false; | |
| 904 | - //过滤掉分销关闭的 | |
| 905 | - await getApp().promiseGet("/api/weshop/storeDistribut/get/" + os.stoid, {}).then(rs => { | |
| 906 | - if (rs.data.code == 0) { | |
| 907 | - var dis = rs.data.data; | |
| 908 | - for (var i in d_list) { | |
| 909 | - if (d_list[i].name == '我的分销' && (!dis || dis.switch == 0)) { | |
| 910 | - d_list.splice(i, 1); | |
| 820 | + nav_goto:function(e){ | |
| 821 | + var url=e.currentTarget.dataset.url; | |
| 822 | + if(!url || url=='') return; | |
| 823 | + if(url[0]!='/') url='/'+url; | |
| 824 | + getApp().goto(url); | |
| 825 | + }, | |
| 826 | + | |
| 827 | + //添加卡包 | |
| 828 | + addcard:function(){ | |
| 829 | + var res=this.data.add_card_data; | |
| 830 | + if(!res) return false; | |
| 831 | + | |
| 832 | + var arr = new Array(6) | |
| 833 | + arr[0] = res.code; | |
| 834 | + arr[1] = res.timestamp; | |
| 835 | + arr[2] = res.jsapiTicket; | |
| 836 | + arr[3] = res.openid; | |
| 837 | + arr[4] = res.cardid; | |
| 838 | + arr[5] = res.nonceStr; | |
| 839 | + var c=arr.sort(); | |
| 840 | + var newstr=""; | |
| 841 | + for (var i=0;i<c.length;i++) | |
| 842 | + { | |
| 843 | + newstr+=c[i]; | |
| 844 | + } | |
| 845 | + | |
| 846 | + var sh1= ut.sha1(newstr); | |
| 847 | + wx.addCard({ | |
| 848 | + cardList: [ | |
| 849 | + { | |
| 850 | + cardId: res.cardid, | |
| 851 | + cardExt: '{"code": "'+res.code+'", "openid": "'+res.openid+'","timestamp": "' + res.timestamp + '","nonce_str":"' + res.nonceStr + '","outer_str":"web", "signature":"' + sh1 + '"}' | |
| 852 | + } | |
| 853 | + | |
| 854 | + ], | |
| 855 | + success: function (res) {}, | |
| 856 | + cancel: function (res) {} | |
| 857 | + }); | |
| 858 | + }, | |
| 859 | + | |
| 860 | + //订阅消息提醒 | |
| 861 | + sendsm:function() | |
| 862 | + { | |
| 863 | + var template_id = ""; | |
| 864 | + rq.get("/api/wx/weappSendlist/page", { | |
| 865 | + data: { | |
| 866 | + store_id: os.stoid, | |
| 867 | + typeid: "1020" | |
| 868 | + }, | |
| 869 | + success: function(res) { | |
| 870 | + if (res.data.code == 0 && res.data.data.pageData.length > 0) { | |
| 871 | + template_id = res.data.data.pageData[0].template_id; | |
| 872 | + // //授权订阅 | |
| 873 | + wx.requestSubscribeMessage({ | |
| 874 | + tmplIds: [template_id], | |
| 875 | + success(res) { | |
| 876 | + | |
| 877 | + }, | |
| 878 | + fail(res) { | |
| 879 | + | |
| 880 | + } | |
| 881 | + }) | |
| 911 | 882 | } |
| 912 | 883 | } |
| 913 | - } | |
| 914 | - }) | |
| 884 | + }) | |
| 885 | + }, | |
| 886 | + | |
| 887 | + con_weixin:function () { | |
| 888 | + var url=this.data.sys_switch.weapp_customertype_url; | |
| 889 | + var id=this.data.sys_switch.weapp_customertype_appid; | |
| 890 | + wx.openCustomerServiceChat({ | |
| 891 | + extInfo: {url: url}, | |
| 892 | + corpId: id, | |
| 893 | + success(res) {} | |
| 894 | + }) | |
| 895 | + }, | |
| 896 | + | |
| 897 | + //初始话按钮图标 | |
| 898 | + init_user_tool:async function () { | |
| 899 | + var d_list=null; | |
| 900 | + //读取user_tool按钮图标 | |
| 901 | + await getApp().promiseGet("/api/weshop/userTool/page?pageSize=100&store_id="+os.stoid, { | |
| 902 | + }).then(res=>{ | |
| 903 | + if(ut.ajax_ok(res)) { | |
| 904 | + d_list=res.data.data.pageData; | |
| 905 | + } | |
| 906 | + }) | |
| 907 | + if(!d_list) return false; | |
| 908 | + //过滤掉分销关闭的 | |
| 909 | + await getApp().promiseGet("/api/weshop/storeDistribut/get/"+os.stoid,{}).then(rs=>{ | |
| 910 | + if(rs.data.code==0){ | |
| 911 | + var dis=rs.data.data; | |
| 912 | + for(var i in d_list){ | |
| 913 | + if(d_list[i].name=='我的分销' && (!dis || dis.switch==0)){ | |
| 914 | + d_list.splice(i,1); | |
| 915 | + } | |
| 916 | + } | |
| 917 | + } | |
| 918 | + }) | |
| 915 | 919 | |
| 916 | - //判断右没有开AI测肤 | |
| 917 | - await getApp().promiseGet("/api/weshop/wx/weappSkin/get/" + os.stoid, {}).then(rs => { | |
| 918 | - if (rs.data.code != 0 || !rs.data.data) { | |
| 919 | - for (var i in d_list) { | |
| 920 | - if (d_list[i].name == 'AI测肤') { | |
| 921 | - d_list.splice(i, 1); | |
| 922 | - } | |
| 923 | - } | |
| 924 | - } | |
| 925 | - }) | |
| 926 | - this.setData({ user_tool: d_list }); | |
| 927 | - } | |
| 920 | + //判断右没有开AI测肤 | |
| 921 | + await getApp().promiseGet("/api/weshop/wx/weappSkin/get/"+os.stoid,{}).then(rs=>{ | |
| 922 | + if(rs.data.code!=0 || !rs.data.data){ | |
| 923 | + for(var i in d_list){ | |
| 924 | + if(d_list[i].name=='AI测肤'){ | |
| 925 | + d_list.splice(i,1); | |
| 926 | + } | |
| 927 | + } | |
| 928 | + } | |
| 929 | + }) | |
| 930 | + this.setData({user_tool:d_list}); | |
| 931 | + } | |
| 928 | 932 | |
| 929 | 933 | |
| 930 | 934 | ... | ... |
pages/user/index/index.wxml
| ... | ... | @@ -2,349 +2,343 @@ |
| 2 | 2 | <template is="tabBar" data="{{tabBar}}" /> --> |
| 3 | 3 | <wxs src="filter.wxs" module="util"></wxs> |
| 4 | 4 | <view class="xc-page" style="margin-bottom:{{isIpx ? '168rpx' : '100rpx'}}"> |
| 5 | - <view class="xc-user"> | |
| 6 | - <view class="xc-head rel"> | |
| 7 | - <image class="xc-background" src="{{iurl}}{{ad_img?ad_img:'/miniapp/images/user_index_powder.jpg'}}"> | |
| 8 | - <view class="flex-space-between abs xc-user-frame"> | |
| 9 | - <view class="xc-user-left flex" wx:if="{{userInfo}}"> | |
| 10 | - <image class="xc-user-img circle" bindtap="go_info" src="{{userInfo.head_pic?userInfo.head_pic:defaultAvatar}}"></image> | |
| 11 | - <view class="xc-uesr-name"> | |
| 12 | - <view class="flex ai-center"> | |
| 13 | - <text class="ellipsis-1" style="max-width: 290rpx;display: inline-block">{{userInfo.nickname}}</text> | |
| 14 | - <view class="hvip" wx:if='{{GradeName && is_init}}'> | |
| 15 | - <image class="vip-mem" src="{{iurl}}/miniapp/images/vip_hg0.png"></image>{{GradeName}} | |
| 16 | - </view> | |
| 17 | - </view> | |
| 18 | - | |
| 19 | - <view class="flex fs24 xc-grow-ups" style="margin-left:8rpx;margin-top:6rpx" wx:if="{{is_init && gradeId}}" bindtap='jump'> | |
| 20 | - <block wx:if="{{cz_val<full_cz_val}}"> | |
| 21 | - {{" "}} | |
| 22 | - <text class="grow-up-val">成长值</text> | |
| 23 | - <view style='margin-left:5rpx; '>{{cz_val}} / {{need_money}}</view> | |
| 24 | - </block> | |
| 25 | - <block wx:else> | |
| 26 | - {{" "}} | |
| 27 | - <text class="grow-up-val">成长值</text> {{cz_val}} | |
| 28 | - </block> | |
| 29 | - </view> | |
| 30 | - </view> | |
| 31 | - | |
| 32 | - </view> | |
| 33 | - | |
| 34 | - <view class="xc-user-left flex" wx:else bindtap="gobindtel"> | |
| 35 | - <image class="xc-user-img circle" src="{{userInfo.head_pic?userInfo.head_pic:defaultAvatar}}"></image> | |
| 36 | - <view class="xc-uesr-name">请点击注册</view> | |
| 37 | - </view> | |
| 38 | - | |
| 39 | - | |
| 40 | - </view> | |
| 41 | - <view wx:if="{{userInfo}}" class="xc-qrcode-frame abs flex-center "> | |
| 42 | - <!-- {{iurl}}/miniapp --> | |
| 43 | - <image bindtap='show_tc' class=" xc-qrcode " src="{{iurl}}/miniapp/images/qrcode1.png"></image> | |
| 44 | - </view> | |
| 45 | - <view class="flex-vertical abs xc-grow-frame rel" style="display: none"> | |
| 46 | - <view class="xc-grow-up">成长值</view> | |
| 47 | - | |
| 48 | - <view class="xc-line-not rel"> | |
| 49 | - <image class="xc-bj-img abs" src="{{iurl}}/miniapp/images/baijing.png"></image> | |
| 50 | - <image class="xc-zs-img abs" src="{{iurl}}/miniapp/images/zhuangshi.png"></image> | |
| 51 | - <view class="xc-line-Yes abs" style="width:{{length}}rpx;"></view> | |
| 52 | - </view> | |
| 53 | - | |
| 54 | - <view class="xc-grow-val">5000/10000</view> | |
| 55 | - </view> | |
| 56 | - <view class="flex-equality abs xc-assets"> | |
| 57 | - <view class="t-c typefont" bindtap='balance'>{{yuer?yuer:0}} | |
| 58 | - <view class='numfont'>余额</view> | |
| 59 | - </view> | |
| 60 | - <view class="t-c typefont" bindtap='deposit'>{{udata.Balance?udata.Balance:0}} | |
| 61 | - <view class='numfont'>预存款</view> | |
| 62 | - </view> | |
| 63 | - <view class="t-c typefont" bindtap='integral'>{{udata.Integral?udata.Integral:0}} | |
| 64 | - <view class='numfont'>积分</view> | |
| 65 | - </view> | |
| 66 | - <view class="t-c typefont" bindtap='coupon'>{{udata.CashCount+byquan?udata.CashCount+byquan:0}} | |
| 67 | - <view class='numfont'>优惠券</view> | |
| 68 | - </view> | |
| 69 | - </view> | |
| 70 | - </image> | |
| 71 | - | |
| 72 | - </view> | |
| 73 | - <block wx:if="{{is_no_plus}}"> | |
| 74 | - <view class="xc-add-member-frame flex-level rel addplus" wx:if="{{is_dengji==2 && show_buy_plus && is_no_plus}}"> | |
| 75 | - <view class="xc-add-member flex-center-around "> | |
| 76 | - <view class="flex jc-center ai-center"> | |
| 77 | - <image class="xc-icon" src="{{iurl}}/miniapp/images/user/user_vip.png"></image> | |
| 78 | - <view class="member fs28 "> 加入plus会员预计可省3031元</view> | |
| 79 | - </view> | |
| 80 | - <view class="xc-opening-button t-c" data-url="/pages/user/plus/plus" bindtap="goto"> | |
| 81 | - <view class="xc-opening fs28">立即开通</view> | |
| 82 | - </view> | |
| 83 | - </view> | |
| 84 | - </view> | |
| 85 | - | |
| 86 | - <view class="xc-add-member-frame flex-level rel addplus" wx:if="{{is_dengji==3 && show_buy_plus}}"> | |
| 87 | - <view class="xc-add-member flex-center-around "> | |
| 88 | - <view class="flex jc-center ai-center"> | |
| 89 | - <image class="xc-icon" src="{{iurl}}/miniapp/images/user/user_vip.png"></image> | |
| 90 | - <view class="member fs28 "> 加入plus会员预计可省3031元</view> | |
| 91 | - </view> | |
| 92 | - <view class="xc-opening-button t-c" data-url="/pages/user/cardinfo/cardinfo" bindtap="goto"> | |
| 93 | - <view class="xc-opening fs28">立即续费</view> | |
| 94 | - </view> | |
| 95 | - </view> | |
| 96 | - </view> | |
| 97 | - | |
| 98 | - </block> | |
| 99 | - | |
| 5 | + <view class="xc-user"> | |
| 6 | + <view class="xc-head rel"> | |
| 7 | + <image class="xc-background" src="{{iurl}}{{ad_img?ad_img:'/miniapp/images/user_index_powder.jpg'}}"> | |
| 8 | + <view class="flex-space-between abs xc-user-frame"> | |
| 9 | + <view class="xc-user-left flex" wx:if="{{userInfo}}"> | |
| 10 | + <image class="xc-user-img circle" bindtap="go_info" src="{{userInfo.head_pic?userInfo.head_pic:defaultAvatar}}"></image> | |
| 11 | + <view class="xc-uesr-name"> | |
| 12 | + <view class="flex ai-center"> | |
| 13 | + <text class="ellipsis-1" style="max-width: 290rpx;display: inline-block">{{userInfo.nickname}}</text> | |
| 14 | + <view class="hvip" wx:if='{{GradeName && is_init}}'> | |
| 15 | + <image class="vip-mem" src="{{iurl}}/miniapp/images/vip_hg0.png"></image>{{GradeName}}</view> | |
| 16 | + </view> | |
| 17 | + | |
| 18 | + <view class="flex fs24 xc-grow-ups" style="margin-left:8rpx;margin-top:6rpx" wx:if="{{is_init && gradeId}}" bindtap='jump'> | |
| 19 | + <block wx:if="{{cz_val<full_cz_val}}"> | |
| 20 | + {{" "}} | |
| 21 | + <text class="grow-up-val">成长值</text> | |
| 22 | + <view style='margin-left:5rpx; '>{{cz_val}} / {{need_money}}</view> | |
| 23 | + </block> | |
| 24 | + <block wx:else> | |
| 25 | + {{" "}} | |
| 26 | + <text class="grow-up-val">成长值</text> {{cz_val}} | |
| 27 | + </block> | |
| 28 | + </view> | |
| 29 | + </view> | |
| 30 | + | |
| 31 | + </view> | |
| 32 | + | |
| 33 | + <view class="xc-user-left flex" wx:else bindtap="gobindtel"> | |
| 34 | + <image class="xc-user-img circle" src="{{userInfo.head_pic?userInfo.head_pic:defaultAvatar}}"></image> | |
| 35 | + <view class="xc-uesr-name">请点击注册</view> | |
| 36 | + </view> | |
| 37 | + | |
| 38 | + | |
| 39 | + </view> | |
| 40 | + <view wx:if="{{userInfo}}" class="xc-qrcode-frame abs flex-center "> | |
| 41 | + <!-- {{iurl}}/miniapp --> | |
| 42 | + <image bindtap='show_tc' class=" xc-qrcode " src="{{iurl}}/miniapp/images/qrcode1.png"></image> | |
| 43 | + </view> | |
| 44 | + <view class="flex-vertical abs xc-grow-frame rel" style="display: none"> | |
| 45 | + <view class="xc-grow-up">成长值</view> | |
| 46 | + | |
| 47 | + <view class="xc-line-not rel"> | |
| 48 | + <image class="xc-bj-img abs" src="{{iurl}}/miniapp/images/baijing.png"></image> | |
| 49 | + <image class="xc-zs-img abs" src="{{iurl}}/miniapp/images/zhuangshi.png"></image> | |
| 50 | + <view class="xc-line-Yes abs" style="width:{{length}}rpx;"></view> | |
| 51 | + </view> | |
| 52 | + | |
| 53 | + <view class="xc-grow-val">5000/10000</view> | |
| 54 | + </view> | |
| 55 | + <view class="flex-equality abs xc-assets"> | |
| 56 | + <view class="t-c typefont" bindtap='balance'>{{yuer?yuer:0}} | |
| 57 | + <view class='numfont'>余额</view> | |
| 58 | + </view> | |
| 59 | + <view class="t-c typefont" bindtap='deposit'>{{udata.Balance?udata.Balance:0}} | |
| 60 | + <view class='numfont'>预存款</view> | |
| 61 | + </view> | |
| 62 | + <view class="t-c typefont" bindtap='integral'>{{udata.Integral?udata.Integral:0}} | |
| 63 | + <view class='numfont'>积分</view> | |
| 64 | + </view> | |
| 65 | + <view class="t-c typefont" bindtap='coupon'>{{udata.CashCount+byquan?udata.CashCount+byquan:0}} | |
| 66 | + <view class='numfont'>优惠券</view> | |
| 67 | + </view> | |
| 68 | + </view> | |
| 69 | + </image> | |
| 70 | + | |
| 71 | + </view> | |
| 72 | + <view class="xc-add-member-frame flex-level rel addplus" wx:if="{{is_dengji==2 && show_buy_plus && is_no_plus}}"> | |
| 73 | + <view class="xc-add-member flex-center-around "> | |
| 74 | + <view class="flex jc-center ai-center"> | |
| 75 | + <image class="xc-icon" src="{{iurl}}/miniapp/images/user/user_vip.png"></image> | |
| 76 | + <view class="member fs28 "> 加入plus会员预计可省3031元</view> | |
| 77 | + </view> | |
| 78 | + <view class="xc-opening-button t-c" data-url="/pages/user/plus/plus" bindtap="goto"> | |
| 79 | + <view class="xc-opening fs28">立即开通</view> | |
| 80 | + </view> | |
| 81 | + </view> | |
| 82 | + </view> | |
| 83 | + | |
| 84 | + <view class="xc-add-member-frame flex-level rel addplus" wx:if="{{is_dengji==3 && show_buy_plus}}"> | |
| 85 | + <view class="xc-add-member flex-center-around "> | |
| 86 | + <view class="flex jc-center ai-center"> | |
| 87 | + <image class="xc-icon" src="{{iurl}}/miniapp/images/user/user_vip.png"></image> | |
| 88 | + <view class="member fs28 "> 加入plus会员预计可省3031元</view> | |
| 89 | + </view> | |
| 90 | + <view class="xc-opening-button t-c" data-url="/pages/user/cardinfo/cardinfo" bindtap="goto"> | |
| 91 | + <view class="xc-opening fs28">立即续费</view> | |
| 92 | + </view> | |
| 93 | + </view> | |
| 100 | 94 | </view> |
| 101 | - <view class="xc-after-sale rel"> | |
| 102 | - <!-- 顶上的一栏 --> | |
| 103 | - <view class="xc-equity-title flex-level"> | |
| 104 | - <view class="xc-title-frame flex ai-center"> | |
| 105 | - <view class="flex-vertical xc-title-content" bindtap="go_order" data-url="/pages/user/order_list/order_list"> | |
| 106 | - <image class="xc-title-img" src="{{iurl}}/miniapp/images/hdindan.png" style="width: 50rpx; height: 55rpx;margin-right: 5rpx"></image> | |
| 107 | - <view class="three-level-word">我的订单</view> | |
| 108 | - </view> | |
| 95 | + | |
| 96 | + </view> | |
| 97 | + <view class="xc-after-sale rel"> | |
| 98 | + <!-- 顶上的一栏 --> | |
| 99 | + <view class="xc-equity-title flex-level"> | |
| 100 | + <view class="xc-title-frame flex ai-center"> | |
| 101 | + <view class="flex-vertical xc-title-content" bindtap="go_order" data-url="/pages/user/order_list/order_list"> | |
| 102 | + <image class="xc-title-img" src="{{iurl}}/miniapp/images/hdindan.png" style="width: 50rpx; height: 55rpx;margin-right: 5rpx"></image> | |
| 103 | + <view class="three-level-word">我的订单</view> | |
| 104 | + </view> | |
| 109 | 105 | <!-- 物流信息提醒 --> |
| 110 | 106 | <view class="fs26 c-5 pdl60" wx:if="{{countDadaOrder && countDadaOrder != 0}}" bindtap="go_order" data-url="/pages/user/order_list/order_list?index=1"><text class="iconfont icon-dingwei"></text>您有<text class="c-red">{{countDadaOrder}}</text>个同城配送订单</view> |
| 111 | - </view> | |
| 112 | - <view class="three-level-word xc-more-frame flex-vertical" bindtap="go_order" data-url="/pages/user/order_list/order_list"> | |
| 113 | - <view class="three-level-word xc-more">更多</view> | |
| 114 | - <view class="bg_right xc-more-click bcolor"></view> | |
| 115 | - </view> | |
| 116 | - </view> | |
| 117 | - <!-- 内容的一栏 --> | |
| 118 | - <view class="xc-after-sale-left flex-center-around"> | |
| 119 | - <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=1"> | |
| 120 | - <image class="xc-no-money" src="{{iurl}}/miniapp/images/daifuk.png"></image> | |
| 121 | - <view class=" xc-word-color four-level-word">待付款</view> | |
| 122 | - <text class="order-num" hidden='{{toji.wait_pay>0?"":"true"}}'>{{toji.wait_pay}}</text> | |
| 123 | - </view> | |
| 124 | - | |
| 125 | - <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=2"> | |
| 126 | - <image class="xc-send" src="{{iurl}}/miniapp/images/dfahuo.png?v=1"></image> | |
| 127 | - <view class="xc-word-color four-level-word">待发货</view> | |
| 128 | - <text class="order-num" hidden='{{toji.wait_send>0?"":"true"}}'>{{toji.wait_send}}</text> | |
| 129 | - </view> | |
| 130 | - | |
| 131 | - <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=3"> | |
| 132 | - <image class="xc-await" src="{{iurl}}/miniapp/images/shouhuo1.png"></image> | |
| 133 | - <view class="xc-word-color four-level-word">待收货</view> | |
| 134 | - <text class="order-num" hidden='{{toji.wait_receive>0?"":"true"}}'>{{toji.wait_receive}}</text> | |
| 135 | - </view> | |
| 136 | - <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=4"> | |
| 137 | - <image class="xc-no-money" src="{{iurl}}/miniapp/images/dpr1.png"></image> | |
| 138 | - <view class="xc-word-color four-level-word">待评论</view> | |
| 139 | - <text class="order-num" hidden='{{toji.wait_pj>0?"":"true"}}'>{{toji.wait_pj}}</text> | |
| 140 | - </view> | |
| 141 | - <view class="t-c margin-auto rel" style='margin-left:30rpx;' bindtap="go_order" data-url="/pages/user/return_goods_list/return_goods_list"> | |
| 142 | - <image class="xc-no-money" src="{{iurl}}/miniapp/images/shouh1.png"></image> | |
| 143 | - <view style='height:36rpx;'> </view> | |
| 144 | - <view class="xc-word-color four-level-word abs">售后/退款</view> | |
| 145 | - <!--<text class="order-num" hidden='{{toji.wait_return>0>0?"":"true"}}' style="right: -20rpx">{{toji.wait_return}}</text>--> | |
| 146 | - </view> | |
| 147 | - | |
| 148 | - </view> | |
| 149 | - <view style="clear: both"></view> | |
| 150 | - | |
| 151 | - </view> | |
| 152 | - | |
| 153 | - <!-- 我的权益 --> | |
| 154 | - <view class="xc-my-equity-frame" wx:if="{{is_init }}"> | |
| 155 | - <view class="xc-equity-title flex-level" bindtap="go_qy"> | |
| 156 | - <view class="xc-title-frame flex-space-between"> | |
| 157 | - <view class="flex-vertical xc-title-content"> | |
| 158 | - <image class="xc-title-img" src="{{iurl}}/miniapp/images/medal.png"></image> | |
| 159 | - <view class="three-level-word">我的权益</view> | |
| 160 | - </view> | |
| 161 | - </view> | |
| 162 | - <view wx:if="{{is_grad_get}}" class="three-level-word xc-more-frame flex-vertical"> | |
| 163 | - <view class="three-level-word xc-more">更多</view> | |
| 164 | - <view class="bg_right xc-more-click bcolor"></view> | |
| 165 | - </view> | |
| 166 | - <view wx:else class="three-level-word xc-more-frame flex-vertical" style="justify-content: flex-end"> | |
| 167 | - <image style="width: 40rpx; height: 40rpx; margin-right: 20rpx" src="{{iurl}}/miniapp/images/loader.gif"></image> | |
| 168 | - </view> | |
| 169 | - </view> | |
| 170 | - | |
| 171 | - <block wx:if="{{is_grad_get}}"> | |
| 172 | - <block wx:if="{{qy_list && gradeId}}"> | |
| 173 | - <view class="xc-specific-more-frame flex-vertical" wx:if="{{qy_list}}"> | |
| 174 | - | |
| 175 | - <view bindtap="click_pre"> | |
| 176 | - <view class="bg_left xc-left bcolor"></view> | |
| 177 | - </view> | |
| 178 | - | |
| 179 | - <swiper current="{{sw_index}}" style='width:82.7%; height:108rpx' bindchange='onSli' indicator-dots="{{false}}" autoplay="{{false}}"> | |
| 180 | - | |
| 181 | - <swiper-item wx:for="{{qy_list}}" wx:for-item="aitem" wx:for-index="pidx"> | |
| 182 | - <view class="flex xc-middle"> | |
| 183 | - | |
| 184 | - <view class="xc-center-frame t-c" wx:for="{{aitem}}" data-img="{{item.PrivilegeImageUrl}}" data-no="{{item.PrivilegeType}}" data-ind="{{index}}" data-find="{{pidx}}" bindtap="go_qy_url"> | |
| 185 | - <!-- <text>qy_list.privilegeICOUrl</text> --> | |
| 186 | - <image class="xc-center-img {{item.ishas==1?'':'img_gray'}}" src="{{item.PrivilegeICOUrl}}"></image> | |
| 187 | - <view class="four-level-word">{{item.PrivilegeName}}</view> | |
| 188 | - </view> | |
| 189 | - </view> | |
| 190 | - </swiper-item> | |
| 191 | - | |
| 192 | - </swiper> | |
| 193 | - | |
| 194 | - <view bindtap="click_next"> | |
| 195 | - <view class="bg_right xc-right bcolor mt"></view> | |
| 196 | - </view> | |
| 197 | - </view> | |
| 198 | - </block> | |
| 199 | - <view wx:else style="text-align: center"> | |
| 200 | - 未找到数据 | |
| 201 | - </view> | |
| 202 | - </block> | |
| 203 | - | |
| 204 | - | |
| 205 | - | |
| 206 | - | |
| 207 | - </view> | |
| 208 | - <!-- 生日营销 is_banner--> | |
| 209 | - <block wx:if="{{is_banner}}"> | |
| 210 | - <view class="t-c banner-frame" bindtap="clike_banne"> | |
| 211 | - <image class="banner-img" src="{{actImg==''?iurl+'/miniapp/images/user/banner-img.jpg':iurl+actImg}}"> | |
| 212 | - </image> | |
| 213 | - </view> | |
| 214 | - </block> | |
| 215 | - | |
| 216 | - <!-- 工具与服务 --> | |
| 217 | - <view class="xc-tool-service"> | |
| 218 | - <view class="xc-tool-service-title flex-vertical"> | |
| 219 | - <image class="xc-tool-service-img" src="{{iurl}}/miniapp/images/gj.png"></image> | |
| 220 | - <view class="three-level-word xc-tool-service-word">工具与服务</view> | |
| 221 | - </view> | |
| 222 | - <view class="xc-project-frame"> | |
| 223 | - <!-- 跳转页面 --> | |
| 224 | - <view class="center_v" style="display: flex;flex-wrap: wrap;align-items: center;"> | |
| 225 | - <!-- 循环使用自定义菜单,显示和掩藏 --> | |
| 226 | - <block wx:for="{{user_tool}}"> | |
| 227 | - <!-- 判断系统配置中有没有把菜单关闭 --> | |
| 228 | - <block wx:if="{{!util.is_close(item.name,c_list)}}"> | |
| 229 | - <!-- 有链接地址的时候 --> | |
| 230 | - <block wx:if="{{item.weappurl}}"> | |
| 231 | - <block wx:if="{{item.name=='PLUS会员'}}"> | |
| 232 | - <view class="item t-c" data-url="{{item.weappurl}}" bindtap="goto" wx:if="{{is_dengji==1}}"> | |
| 233 | - <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image> | |
| 234 | - <view class="fs26">PLUS会员</view> | |
| 235 | - </view> | |
| 236 | - </block> | |
| 237 | - <block wx:elif="{{item.name=='助力活动'}}"> | |
| 238 | - <view class="item t-c" data-url="/pages/user/assistance/assistance" bindtap="goto_nav" wx:if="{{is_assistance==1}}"> | |
| 239 | - <image class="xc-center-img" src="{{iurl}}/miniapp/images/friendhelp/icon-zl.png"></image> | |
| 240 | - <view class="four-level-word">助力活动</view> | |
| 241 | - </view> | |
| 242 | - </block> | |
| 243 | - <block wx:elif="{{item.name=='我的权益'}}"> | |
| 244 | - <view class="item t-c" bindtap="go_qy" wx:if="{{qy_list!=null && is_init && gradeId}}"> | |
| 245 | - <image class="xc-center-img" src="{{iurl+item.icoimg}}"></image> | |
| 246 | - <view class="fs26">我的权益</view> | |
| 247 | - </view> | |
| 248 | - </block> | |
| 249 | - <block wx:elif="{{item.name=='套盒商品'}}"> | |
| 250 | - <view class="item t-c" data-url="{{item.weappurl}}" bindtap="goto" wx:if="{{enableMeiye}}"> | |
| 251 | - <image class="xc-center-img" src="{{iurl+item.icoimg}}"></image> | |
| 252 | - <view class="fs26">套盒商品</view> | |
| 253 | - </view> | |
| 254 | - </block> | |
| 255 | - <block wx:else> | |
| 256 | - <view class="item t-c" data-url="{{item.weappurl}}" bindtap="goto_nav"> | |
| 107 | + </view> | |
| 108 | + <view class="three-level-word xc-more-frame flex-vertical" bindtap="go_order" data-url="/pages/user/order_list/order_list"> | |
| 109 | + <view class="three-level-word xc-more">更多</view> | |
| 110 | + <view class="bg_right xc-more-click bcolor"></view> | |
| 111 | + </view> | |
| 112 | + </view> | |
| 113 | + <!-- 内容的一栏 --> | |
| 114 | + <view class="xc-after-sale-left flex-center-around"> | |
| 115 | + <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=1"> | |
| 116 | + <image class="xc-no-money" src="{{iurl}}/miniapp/images/daifuk.png"></image> | |
| 117 | + <view class=" xc-word-color four-level-word">待付款</view> | |
| 118 | + <text class="order-num" hidden='{{toji.wait_pay>0?"":"true"}}'>{{toji.wait_pay}}</text> | |
| 119 | + </view> | |
| 120 | + | |
| 121 | + <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=2"> | |
| 122 | + <image class="xc-send" src="{{iurl}}/miniapp/images/dfahuo.png?v=1"></image> | |
| 123 | + <view class="xc-word-color four-level-word">待发货</view> | |
| 124 | + <text class="order-num" hidden='{{toji.wait_send>0?"":"true"}}'>{{toji.wait_send}}</text> | |
| 125 | + </view> | |
| 126 | + | |
| 127 | + <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=3"> | |
| 128 | + <image class="xc-await" src="{{iurl}}/miniapp/images/shouhuo1.png"></image> | |
| 129 | + <view class="xc-word-color four-level-word">待收货</view> | |
| 130 | + <text class="order-num" hidden='{{toji.wait_receive>0?"":"true"}}'>{{toji.wait_receive}}</text> | |
| 131 | + </view> | |
| 132 | + <view class="t-c margin-auto rel" bindtap="go_order" data-url="/pages/user/order_list/order_list?type=4"> | |
| 133 | + <image class="xc-no-money" src="{{iurl}}/miniapp/images/dpr1.png"></image> | |
| 134 | + <view class="xc-word-color four-level-word">待评论</view> | |
| 135 | + <text class="order-num" hidden='{{toji.wait_pj>0?"":"true"}}'>{{toji.wait_pj}}</text> | |
| 136 | + </view> | |
| 137 | + <view class="t-c margin-auto rel" style='margin-left:30rpx;' bindtap="go_order" data-url="/pages/user/return_goods_list/return_goods_list"> | |
| 138 | + <image class="xc-no-money" src="{{iurl}}/miniapp/images/shouh1.png"></image> | |
| 139 | + <view style='height:36rpx;'> </view> | |
| 140 | + <view class="xc-word-color four-level-word abs">售后/退款</view> | |
| 141 | + <!--<text class="order-num" hidden='{{toji.wait_return>0>0?"":"true"}}' style="right: -20rpx">{{toji.wait_return}}</text>--> | |
| 142 | + </view> | |
| 143 | + | |
| 144 | + </view> | |
| 145 | + <view style="clear: both"></view> | |
| 146 | + | |
| 147 | + </view> | |
| 148 | + | |
| 149 | + <!-- 我的权益 --> | |
| 150 | + <view class="xc-my-equity-frame" wx:if="{{is_init }}"> | |
| 151 | + <view class="xc-equity-title flex-level" bindtap="go_qy"> | |
| 152 | + <view class="xc-title-frame flex-space-between"> | |
| 153 | + <view class="flex-vertical xc-title-content"> | |
| 154 | + <image class="xc-title-img" src="{{iurl}}/miniapp/images/medal.png"></image> | |
| 155 | + <view class="three-level-word">我的权益</view> | |
| 156 | + </view> | |
| 157 | + </view> | |
| 158 | + <view wx:if="{{is_grad_get}}" class="three-level-word xc-more-frame flex-vertical"> | |
| 159 | + <view class="three-level-word xc-more">更多</view> | |
| 160 | + <view class="bg_right xc-more-click bcolor"></view> | |
| 161 | + </view> | |
| 162 | + <view wx:else class="three-level-word xc-more-frame flex-vertical" style="justify-content: flex-end"> | |
| 163 | + <image style="width: 40rpx; height: 40rpx; margin-right: 20rpx" src="{{iurl}}/miniapp/images/loader.gif"></image> | |
| 164 | + </view> | |
| 165 | + </view> | |
| 166 | + | |
| 167 | + <block wx:if="{{is_grad_get}}"> | |
| 168 | + <block wx:if="{{qy_list && gradeId}}"> | |
| 169 | + <view class="xc-specific-more-frame flex-vertical" wx:if="{{qy_list}}"> | |
| 170 | + | |
| 171 | + <view bindtap="click_pre"> | |
| 172 | + <view class="bg_left xc-left bcolor"></view> | |
| 173 | + </view> | |
| 174 | + | |
| 175 | + <swiper current="{{sw_index}}" style='width:82.7%; height:108rpx' bindchange='onSli' indicator-dots="{{false}}" autoplay="{{false}}"> | |
| 176 | + | |
| 177 | + <swiper-item wx:for="{{qy_list}}" wx:for-item="aitem" wx:for-index="pidx"> | |
| 178 | + <view class="flex xc-middle"> | |
| 179 | + | |
| 180 | + <view class="xc-center-frame t-c" wx:for="{{aitem}}" data-img="{{item.PrivilegeImageUrl}}" data-no="{{item.PrivilegeType}}" data-ind="{{index}}" data-find="{{pidx}}" bindtap="go_qy_url"> | |
| 181 | + <!-- <text>qy_list.privilegeICOUrl</text> --> | |
| 182 | + <image class="xc-center-img {{item.ishas==1?'':'img_gray'}}" src="{{item.PrivilegeICOUrl}}"></image> | |
| 183 | + <view class="four-level-word">{{item.PrivilegeName}}</view> | |
| 184 | + </view> | |
| 185 | + </view> | |
| 186 | + </swiper-item> | |
| 187 | + | |
| 188 | + </swiper> | |
| 189 | + | |
| 190 | + <view bindtap="click_next"> | |
| 191 | + <view class="bg_right xc-right bcolor mt"></view> | |
| 192 | + </view> | |
| 193 | + </view> | |
| 194 | + </block> | |
| 195 | + <view wx:else style="text-align: center"> | |
| 196 | + 未找到数据 | |
| 197 | + </view> | |
| 198 | + </block> | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + </view> | |
| 204 | + <!-- 生日营销 is_banner--> | |
| 205 | + <block wx:if="{{is_banner}}"> | |
| 206 | + <view class="t-c banner-frame"bindtap="clike_banne"> | |
| 207 | + <image class="banner-img" src="{{actImg==''?iurl+'/miniapp/images/user/banner-img.jpg':iurl+actImg}}"> | |
| 208 | + </image> | |
| 209 | + </view> | |
| 210 | + </block> | |
| 211 | + | |
| 212 | + <!-- 工具与服务 --> | |
| 213 | + <view class="xc-tool-service" > | |
| 214 | + <view class="xc-tool-service-title flex-vertical"> | |
| 215 | + <image class="xc-tool-service-img" src="{{iurl}}/miniapp/images/gj.png"></image> | |
| 216 | + <view class="three-level-word xc-tool-service-word">工具与服务</view> | |
| 217 | + </view> | |
| 218 | + <view class="xc-project-frame"> | |
| 219 | + <!-- 跳转页面 --> | |
| 220 | + <view class="center_v" style="display: flex;flex-wrap: wrap;align-items: center;"> | |
| 221 | + <!-- 循环使用自定义菜单,显示和掩藏 --> | |
| 222 | + <block wx:for="{{user_tool}}"> | |
| 223 | + <!-- 判断系统配置中有没有把菜单关闭 --> | |
| 224 | + <block wx:if="{{!util.is_close(item.name,c_list)}}"> | |
| 225 | + <!-- 有链接地址的时候 --> | |
| 226 | + <block wx:if="{{item.weappurl}}"> | |
| 227 | + <block wx:if="{{item.name=='PLUS会员'}}"> | |
| 228 | + <view class="item t-c" data-url="{{item.weappurl}}" bindtap="goto" wx:if="{{is_dengji==1}}"> | |
| 229 | + <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image> | |
| 230 | + <view class="fs26">PLUS会员</view> | |
| 231 | + </view> | |
| 232 | + </block> | |
| 233 | + <block wx:elif="{{item.name=='助力活动'}}"> | |
| 234 | + <view class="item t-c" data-url="/pages/user/assistance/assistance" bindtap="goto_nav" wx:if="{{is_assistance==1}}"> | |
| 235 | + <image class="xc-center-img" src="{{iurl}}/miniapp/images/friendhelp/icon-zl.png"></image> | |
| 236 | + <view class="four-level-word">助力活动</view> | |
| 237 | + </view> | |
| 238 | + </block> | |
| 239 | + <block wx:elif="{{item.name=='我的权益'}}"> | |
| 240 | + <view class="item t-c" bindtap="go_qy" wx:if="{{qy_list!=null && is_init && gradeId}}"> | |
| 241 | + <image class="xc-center-img" src="{{iurl+item.icoimg}}"></image> | |
| 242 | + <view class="fs26">我的权益</view> | |
| 243 | + </view> | |
| 244 | + </block> | |
| 245 | + <block wx:elif="{{item.name=='套盒商品'}}"> | |
| 246 | + <view class="item t-c" data-url="{{item.weappurl}}" bindtap="goto" wx:if="{{enableMeiye}}"> | |
| 247 | + <image class="xc-center-img" src="{{iurl+item.icoimg}}"></image> | |
| 248 | + <view class="fs26">套盒商品</view> | |
| 249 | + </view> | |
| 250 | + </block> | |
| 251 | + <block wx:else> | |
| 252 | + <view class="item t-c" data-url="{{item.weappurl}}" bindtap="goto_nav"> | |
| 257 | 253 | <image class="xc-center-img" src="{{iurl+item.icoimg}}"></image> |
| 258 | 254 | <view class="fs26">{{item.name}}</view> |
| 259 | - </view> | |
| 260 | - </block> | |
| 261 | - </block> | |
| 262 | - <!-- 没有链接地址的时候 --> | |
| 263 | - <block wx:else> | |
| 264 | - <block wx:if="{{item.name=='联系客服'}}"> | |
| 265 | - <button class="item t-c" wx:if="{{sys_switch.weapp_customertype==1}}" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}"> | |
| 266 | - <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image> | |
| 267 | - <view class="fs26">联系客服</view> | |
| 268 | - </button> | |
| 269 | - | |
| 270 | - <view class="item t-c" bindtap="con_weixin" wx:elif="{{sys_switch.weapp_customertype==2}}"> | |
| 271 | - <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image> | |
| 272 | - <view class="fs26">联系客服</view> | |
| 273 | - </view> | |
| 274 | - | |
| 275 | - <view class="item t-c" bindtap="contactService" wx:else> | |
| 276 | - <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image> | |
| 277 | - <view class="fs26">联系客服</view> | |
| 278 | - </view> | |
| 279 | - | |
| 280 | - </block> | |
| 281 | - <block wx:elif="{{item.name=='收入卡包'}}"> | |
| 282 | - <view class="item t-c" bindtap="addcard" wx:if="{{add_card_data}}"> | |
| 255 | + </view> | |
| 256 | + </block> | |
| 257 | + </block> | |
| 258 | + <!-- 没有链接地址的时候 --> | |
| 259 | + <block wx:else> | |
| 260 | + <block wx:if="{{item.name=='联系客服'}}"> | |
| 261 | + <button class="item t-c" wx:if="{{sys_switch.weapp_customertype==1}}" open-type="contact" session-from="wechat|{{userInfo.user_id}}|{{userInfo.nickname}}|{{userInfo.head_pic}}"> | |
| 262 | + <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image> | |
| 263 | + <view class="fs26">联系客服</view> | |
| 264 | + </button> | |
| 265 | + | |
| 266 | + <view class="item t-c" bindtap="con_weixin" wx:elif="{{sys_switch.weapp_customertype==2}}"> | |
| 267 | + <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image> | |
| 268 | + <view class="fs26">联系客服</view> | |
| 269 | + </view> | |
| 270 | + | |
| 271 | + <view class="item t-c" bindtap="contactService" wx:else> | |
| 272 | + <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image> | |
| 273 | + <view class="fs26">联系客服</view> | |
| 274 | + </view> | |
| 275 | + | |
| 276 | + </block> | |
| 277 | + <block wx:elif="{{item.name=='收入卡包'}}"> | |
| 278 | + <view class="item t-c" bindtap="addcard" wx:if="{{add_card_data}}"> | |
| 283 | 279 | <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image> |
| 284 | 280 | <view class="four-level-word">收入卡包</view> |
| 285 | - </view> | |
| 286 | - </block> | |
| 287 | - </block> | |
| 288 | - </block> | |
| 289 | - </block> | |
| 290 | - </view> | |
| 291 | - | |
| 292 | - </view> | |
| 293 | - </view> | |
| 294 | - <view style='width:100%;height:73rpx;'> | |
| 295 | - <view class="xc-recommend-goods flex-center"> | |
| 296 | - | |
| 297 | - <view class="circle xc-small"> | |
| 298 | - </view> | |
| 299 | - <view class="circle xc-zhong"> | |
| 300 | - </view> | |
| 301 | - <view class="circle xc-big"> | |
| 302 | - </view> | |
| 303 | - <view class="three-level-word xc-recommend">为你推荐</view> | |
| 304 | - <view class="circle xc-big"> | |
| 305 | - </view> | |
| 306 | - <view class="circle xc-zhong"> | |
| 307 | - </view> | |
| 308 | - <view class="circle xc-small" style='margin-left:15rpx;'> | |
| 309 | - <!-- </view> --> | |
| 310 | - </view> | |
| 311 | - </view> | |
| 312 | - </view> | |
| 313 | - | |
| 281 | + </view> | |
| 282 | + </block> | |
| 283 | + </block> | |
| 284 | + </block> | |
| 285 | + </block> | |
| 286 | + </view> | |
| 287 | + | |
| 288 | + </view> | |
| 289 | + </view> | |
| 290 | + <view style='width:100%;height:73rpx;'> | |
| 291 | + <view class="xc-recommend-goods flex-center"> | |
| 292 | + | |
| 293 | + <view class="circle xc-small"> | |
| 294 | + </view> | |
| 295 | + <view class="circle xc-zhong"> | |
| 296 | + </view> | |
| 297 | + <view class="circle xc-big"> | |
| 298 | + </view> | |
| 299 | + <view class="three-level-word xc-recommend">为你推荐</view> | |
| 300 | + <view class="circle xc-big"> | |
| 301 | + </view> | |
| 302 | + <view class="circle xc-zhong"> | |
| 303 | + </view> | |
| 304 | + <view class="circle xc-small" style='margin-left:15rpx;'> | |
| 305 | + <!-- </view> --> | |
| 306 | + </view> | |
| 307 | + </view> | |
| 308 | + </view> | |
| 309 | + | |
| 314 | 310 | <!-- 显示商品 --> |
| 315 | 311 | <!-- 好物推荐 --> |
| 316 | 312 | <goods_recommend id="goods_recommend"></goods_recommend> |
| 317 | - | |
| 313 | + | |
| 318 | 314 | <!-- 技术支持 --> |
| 319 | 315 | <view class="logo-container t-c"> |
| 320 | - <view class="flex ai_c fs24 jc-center pdv30 white"> | |
| 321 | - <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>提供技术支持 | |
| 322 | - </view> | |
| 316 | + <view class="flex ai_c fs24 jc-center pdv30 white"><image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>提供技术支持</view> | |
| 323 | 317 | </view> |
| 324 | 318 | </view> |
| 325 | 319 | |
| 326 | 320 | <!--弹出层内容,其中的“我知道”中绑定让弹出层消失的函数:bindtap="hide"--> |
| 327 | 321 | <view class="tc_view" hidden='{{tc_hide}}' bindtap='hide_tc'> |
| 328 | - <view class="modal-box" hidden="{{flag}}" bindtap="hide" catchtouchmove="true"></view> | |
| 329 | - <view class="modal-body" catchtouchmove="true"> | |
| 330 | - <view class="modal-content"> | |
| 331 | - <view class="flex"> | |
| 332 | - <image src="{{userInfo.head_pic}}" class="hd_img"></image> | |
| 333 | - <view class="ctent_txt"> | |
| 334 | - <view class='txt1'>{{userInfo.nickname}} | |
| 335 | - <image wx:if="{{userInfo.sex==2}}" class="arrow-right" style="width: 35rpx; height:35rpx; top: 5rpx" src="{{iurl}}/miniapp/images/user/wum.png"></image> | |
| 336 | - <image wx:else class="arrow-right fu" style="width: 35rpx; height:35rpx;top:5rpx" src="{{iurl}}/miniapp/images/user/man.png"></image> | |
| 337 | - </view> | |
| 338 | - <view wx:if="{{userInfo.address}}" class='txt2'>{{userInfo.address}}</view> | |
| 339 | - </view> | |
| 340 | - </view> | |
| 341 | - <view class="m_ta"> | |
| 342 | - <!--<image class='g_img' src='https://mshop.yolipai.net//index.php?m=Home&c=Index&a=qr_code&data={{userInfo.mobile}}'></image>--> | |
| 343 | - <canvas class="g_img" canvas-id="qrcode" /> | |
| 344 | - </view> | |
| 345 | - <view class="s_sao">扫一扫上面的二维码图案,即可消费</view> | |
| 346 | - </view> | |
| 347 | - </view> | |
| 322 | + <view class="modal-box" hidden="{{flag}}" bindtap="hide" catchtouchmove="true"></view> | |
| 323 | + <view class="modal-body" catchtouchmove="true"> | |
| 324 | + <view class="modal-content"> | |
| 325 | + <view class="flex"> | |
| 326 | + <image src="{{userInfo.head_pic}}" class="hd_img"></image> | |
| 327 | + <view class="ctent_txt"> | |
| 328 | + <view class='txt1'>{{userInfo.nickname}} | |
| 329 | + <image wx:if="{{userInfo.sex==2}}" class="arrow-right" style="width: 35rpx; height:35rpx; top: 5rpx" src="{{iurl}}/miniapp/images/user/wum.png"></image> | |
| 330 | + <image wx:else class="arrow-right fu" style="width: 35rpx; height:35rpx;top:5rpx" src="{{iurl}}/miniapp/images/user/man.png"></image> | |
| 331 | + </view> | |
| 332 | + <view wx:if="{{userInfo.address}}" class='txt2'>{{userInfo.address}}</view> | |
| 333 | + </view> | |
| 334 | + </view> | |
| 335 | + <view class="m_ta"> | |
| 336 | + <!--<image class='g_img' src='https://mshop.yolipai.net//index.php?m=Home&c=Index&a=qr_code&data={{userInfo.mobile}}'></image>--> | |
| 337 | + <canvas class="g_img" canvas-id="qrcode" /> | |
| 338 | + </view> | |
| 339 | + <view class="s_sao">扫一扫上面的二维码图案,即可消费</view> | |
| 340 | + </view> | |
| 341 | + </view> | |
| 348 | 342 | </view> |
| 349 | 343 | |
| 350 | -<pop_txt id="pop_txt"></pop_txt> | |
| 351 | 344 | \ No newline at end of file |
| 345 | +<pop_txt id="pop_txt"></pop_txt> | ... | ... |