wxd / MShopWeApp

Commit 1cc33abae66a9b4051ca2fe9031206eddc946f11

Authored by yvan.ni
2 parents 46973518 352e1132

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

Inline Side-by-side
Showing 14 changed files with 1195 additions and 1024 deletions
components/diy_goodsGroup/diy_goodsGroup.js
  View file @1cc33ab
... ... @@ -46,6 +46,7 @@ Component({
46 46 title_index: 0,
47 47 swiper_hei: 0,
48 48 title_class: "",
  49 + is_no_plus:1,
49 50 },
50 51  
51 52 ready: function () { },
... ... @@ -62,8 +63,7 @@ Component({
62 63 if (!getApp().globalData.func_list) getApp().globalData.func_list = [];
63 64 getApp().globalData.func_list.push(this);
64 65 }
65   -
66   -
  66 +
67 67 //最新的版本才有nav_list
68 68 if (nav_list) {
69 69 nav_item = nav_list[0];
... ... @@ -142,8 +142,10 @@ Component({
142 142 pageLifetimes: {
143 143 //游客登录后，只要更新卡的情况
144 144 show: function () {
  145 + let th = this;
145 146 //--初始化卡类--
146 147 this.card_init();
  148 +
147 149 },
148 150 },
149 151  
... ... @@ -263,6 +265,24 @@ Component({
263 265 })
264 266 break;
265 267 }
  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 +
266 286 },
267 287  
268 288 setLoading: function () {
... ...
components/diy_goodsGroup/diy_goodsGroup.wxml
  View file @1cc33ab
... ... @@ -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)}}">
  62 + <block wx:if="{{g_filter.is_has_rank(rank_switch,item) && is_no_plus}}">
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)}}">
  213 + <block wx:if="{{g_filter.is_has_rank(rank_switch,item) && is_no_plus}}">
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)}}">
  363 + <block wx:if="{{g_filter.is_has_rank(rank_switch,item) && is_no_plus}}">
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)}}">
  519 + <block wx:if="{{g_filter.is_has_rank(rank_switch,item) && is_no_plus}}">
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)}}">
  694 + <block wx:if="{{g_filter.is_has_rank(rank_switch,aitem) && is_no_plus}}">
695 695 <!-- 当会员是等级卡的时候 -->
696 696 <block wx:if="{{card_field}}">
697 697 <!-- 等级价>0 -->
... ...
components/goods_list/goods_list.js
  View file @1cc33ab
... ... @@ -16,7 +16,8 @@ Component({
16 16 card_field: "",
17 17 card_name: "",
18 18 max_card_field: "",
19   - card_list: null
  19 + card_list: null,
  20 + is_no_plus:1,
20 21 },
21 22 properties: {
22 23 // 这⾥定义了innerText属性，属性值可以在组件使⽤时指定
... ... @@ -87,7 +88,23 @@ Component({
87 88  
88 89  
89 90 }
90   - })
  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 + })
91 108 },
92 109  
93 110 get_list: function () {
... ...
components/goods_list/goods_list.wxml
  View file @1cc33ab
... ... @@ -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   -
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   - <!-- 等级价 -->
  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 + <!-- 等级价 -->
99 98 <view class="price flex ai-center">
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>
  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>
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" 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>
  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>
154 154 </view>
155 155 \ No newline at end of file
... ...
packageA/pages/distribution/shop/shop.js
  View file @1cc33ab
... ... @@ -36,6 +36,7 @@ Page({
36 36 card_list: null,
37 37  
38 38 isAll: true,
  39 + is_no_plus:1,
39 40  
40 41 default_img: '/miniapp/images/default_g_img.gif',
41 42 },
... ... @@ -214,6 +215,23 @@ Page({
214 215 }
215 216 })
216 217 }
  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 +
217 235  
218 236 if (app.globalData.key_word) {
219 237 this.setData({
... ...
packageA/pages/distribution/shop/shop.wxml
  View file @1cc33ab
... ... @@ -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)}}">
  102 + <block wx:if="{{g_filter.is_has_rank(rank_switch,item) && is_no_plus}}">
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" style="">
  158 + <view class="flexr">
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)}}">
  246 + <block wx:if="{{g_filter.is_has_rank(rank_switch,item) && is_no_plus}}">
247 247 <!-- 当会员是等级卡的时候 -->
248 248 <block wx:if="{{card_field}}">
249 249 <!-- 等级价>0 -->
... ...
packageA/pages/goodsInfo/goodsInfo.js
  View file @1cc33ab
... ... @@ -113,7 +113,7 @@ Page({
113 113 is_sec_mend: 0,
114 114 sto_sele_name: "", //选中的门店名称
115 115 sto_sele_id: "", //选中的门店id
116   - sto_sele_keyid:'', //选中的门店线下
  116 + sto_sele_keyid:'', //选中的门店线下
117 117 sto_sele_distr: "", //选择的门店的配送方式
118 118 is_show_sto_cat: 1, //是否显示门店分类
119 119 only_pk: null,
... ... @@ -269,11 +269,11 @@ Page({
269 269  
270 270 ee.setData({ gid: gid});
271 271  
272   - if(first_leader){
  272 + if(first_leader) {
273 273 getApp().globalData.first_leader=first_leader;
274 274 //调用接口判断是不是会员
275 275 getApp().request.promiseGet("/api/weshop/shoppingGuide/get/"+os.stoid+"/"+first_leader,{}).then(res=>{
276   - if(res.data.code==0){
  276 + if(res.data.code==0) {
277 277 getApp().globalData.guide_id=res.data.data.id;
278 278 }
279 279 })
... ... @@ -545,7 +545,8 @@ Page({
545 545 });
546 546 };
547 547  
548   - console.log('!!!!!!~~~~~~~~~prom~~~~~~~~~~!!!!!!');
  548 + // console.log('!!!!!!~~~~~~~~~prom~~~~~~~~~~!!!!!!');
  549 +
549 550 // this.setData({
550 551 // prom,
551 552 // });
... ... @@ -667,6 +668,10 @@ Page({
667 668 this.wait_for_store_config();
668 669  
669 670  
  671 +
  672 +
  673 +
  674 +
670 675 i.get("/api/weshop/serviceCard/get/" + o.stoid + "/" + ee.data.gid, {
671 676 failRollback: !0,
672 677 success: function(t) {
... ... @@ -772,11 +777,11 @@ Page({
772 777 }), 1 == e ? this.tabGoodsContent() : 2 == e && this.tabComment();
773 778 },
774 779  
775   - tabClick2: function(t) {
776   - this.setData({
777   - activeCategoryId2: t.currentTarget.id
778   - });
779   - },
  780 + // tabClick2: function(t) {
  781 + // this.setData({
  782 + // activeCategoryId2: t.currentTarget.id
  783 + // });
  784 + // },
780 785  
781 786 tabClick3: function(t) {
782 787 var e = this;
... ... @@ -790,11 +795,11 @@ Page({
790 795 }
791 796 },
792 797  
793   - doScrollTop: function() {
794   - wx.pageScrollTo({
795   - scrollTop: 0
796   - });
797   - },
  798 + // doScrollTop: function() {
  799 + // wx.pageScrollTo({
  800 + // scrollTop: 0
  801 + // });
  802 + // },
798 803  
799 804 tabComment: function() {
800 805 this.setData({
... ... @@ -3091,6 +3096,46 @@ Page({
3091 3096  
3092 3097  
3093 3098  
  3099 + //-- 检验商品的活动情况 --
  3100 + check_gd_prom_new: function (func) {
  3101 + var th = this;
  3102 + var user_id = getApp().globalData.user_id;
  3103 + if (!user_id) user_id = 0;
  3104 +
  3105 + var url = '/api/weshop/activitylist/listGoodActInfo2';
  3106 + var req_d = {
  3107 + "store_id": os.stoid,
  3108 + "goods_id": this.data.gid,
  3109 + "user_id": user_id,
  3110 + }
  3111 + getApp().request.get(url, {
  3112 + data: req_d,
  3113 + success: function (e) {
  3114 + if (e.data.code == 0 && e.data.data && e.data.data.length > 0) {
  3115 + var arr = e.data.data;
  3116 + var arr2 = arr.filter(function (e) {
  3117 + return e.s_time < ut.gettimestamp();
  3118 + })
  3119 + //-- 如果只有一个活动的话 --
  3120 + if (arr.length == 1) {
  3121 + th.data.prom_type = arr[0].prom_type;
  3122 + th.data.prom_id = arr[0].act_id;
  3123 + }
  3124 + //-- 如果只有一个进行中的活动的话 --
  3125 + else if (arr2.length == 1) {
  3126 + th.data.prom_type = arr2[0].prom_type;
  3127 + th.data.prom_id = arr2[0].act_id;
  3128 + }
  3129 + }
  3130 + //-- 调用回调 --
  3131 + func();
  3132 + }
  3133 + });
  3134 + },
  3135 +
  3136 +
  3137 +
  3138 +
3094 3139  
3095 3140  
3096 3141  
... ...
packageA/pages/goodsInfo/goodsInfo.wxml
  View file @1cc33ab
... ... @@ -263,7 +263,7 @@
263 263 <!-- 图文详情 -->
264 264 <view class="t_g_info bdt16">
265 265 <view class="red_shu"></view>
266   - <view class="fs30 bold">商品详情</view>
  266 + <view class="fs30 bold">卡项详情</view>
267 267 </view>
268 268 <view class="pdh20">
269 269  
... ... @@ -348,7 +348,7 @@
348 348  
349 349 <view class="goods-norms" hidden="{{activeCategoryId==1?false:true}}">
350 350 <view class="pd20">
351   - <view class="table_s" wx:if="{{service_list}}">
  351 + <!-- <view class="table_s" wx:if="{{service_list}}">
352 352 <view class="tb_item tb-l">
353 353 <view class="item_left f1">
354 354 <text>项目名称</text>
... ... @@ -371,7 +371,42 @@
371 371 <text>{{item.frequency}}</text>
372 372 </view>
373 373 </view>
374   - </view>
  374 + </view> -->
  375 +
  376 + <block wx:if="{{listServiceItem && listServiceItem.length > 0}}">
  377 + <view class="card fs28" wx:for="{{listServiceItem}}">
  378 + <view class="flex ai_c jc_sb" style="height: 88rpx;">
  379 + <view class="ellipsis-2 f1">{{item.projectName}}（{{item.frequency}}次）</view>
  380 + <view class="pdl30 t-r">
  381 + <view class="rmb fs36 bold c-red">{{item.vipprice}}</view>
  382 + <view class="fs22 c-9 del" wx:if="{{item.showPrice}}">零售价：￥{{item.showPrice}}</view>
  383 + </view>
  384 + </view>
  385 + <view class="flex ai_c jc_sb fs24 c-6">
  386 + <view class="ellipsis-1">备注：{{filters.show_default(item.remark, '无')}}</view>
  387 + <!-- 指定开始日期和结束日期 -->
  388 + <view class="pdl30 shrink0">有效期：{{filters.showStartAndEndDate(item, data.validDays)}}</view>
  389 + </view>
  390 + </view>
  391 + </block>
  392 +
  393 + <block wx:if="{{enableMeiye}}">
  394 + <block wx:if="{{taoheList && taoheList.length > 0}}">
  395 + <view class="taohe fs28" wx:for="{{taoheList}}">
  396 + <view class="flex ai_c jc_sb" style="height: 88rpx;">
  397 + <view class="ellipsis-2 f1">{{item.goods_name}} ({{item.goods_sn}}) ({{item.frequency}}个)</view>
  398 + <view class="pdl30 t-r">
  399 + <view class="rmb fs36 bold c-red">{{item.vipprice}}</view>
  400 + <view class="fs22 c-9 del">零售价：￥{{item.show_price}}</view>
  401 + </view>
  402 + </view>
  403 + <view class="flex ai_c jc_sb fs24 c-6 pdt10">
  404 + <view class="ellipsis-1">备注：{{filters.show_default(item.remark, '无')}}</view>
  405 + <view class="pdl30 shrink0">有效期：{{filters.showStartAndEndDate(item,data.validDays)}}</view>
  406 + </view>
  407 + </view>
  408 + </block>
  409 + </block>
375 410  
376 411 <view class="wxParse">
377 412 <template is="wxParse" data="{{wxParseData:content.nodes}}"></template>
... ...
pages/goods/goodsList/goodsList.js
  View file @1cc33ab
... ... @@ -24,6 +24,7 @@ Page({
24 24 rq_data:null,
25 25 isToggle: false, //切换商品视图控制符
26 26 show_all:1, //判断显示
  27 + is_no_plus:1
27 28 },
28 29  
29 30 onLoad: function(t) {
... ... @@ -186,7 +187,22 @@ Page({
186 187 })
187 188 },500)
188 189 }
189   - });
  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 + })
190 206 },
191 207  
192 208 //设置优惠券的
... ... @@ -442,7 +458,10 @@ Page({
442 458  
443 459  
444 460 go_url:function (e) {
445   - var url=e.currentTarget.dataset.url;
  461 + var url = e.currentTarget.dataset.url;
  462 + var rq_data = JSON.stringify(this.data.rq_data);
  463 + url += `&o=${rq_data}`;
  464 + // console.log('url!!!=======<<<<', url);
446 465 getApp().goto(url);
447 466 }
448 467  
... ...
pages/goods/goodsList/goodsList.wxml
  View file @1cc33ab
... ... @@ -19,7 +19,7 @@
19 19 <view class="pd20 flex ai-center jc_sb search_fixed">
20 20 <!-- 搜索框 -->
21 21 <view class="search-box f1">
22   - <navigator hover-class="none" url="/pages/goods/search/search?ladder_id={{ladder_id}}"><text class="iconfont icon-sousuo pdr10"></text>搜索店铺商品</navigator>
  22 + <view hover-class="none" data-url="/pages/goods/search/search?ladder_id={{ladder_id}}" bindtap="go_url"><text class="iconfont icon-sousuo pdr10"></text>搜索店铺商品</view>
23 23 </view>
24 24 <!-- 单列/双列 显示切换 -->
25 25 <text class="iconfont {{isToggle ? 'icon-fenlie':'icon-fenxiang'}} pdl30 fs36" bindtap="bindToggleDisplay"></text>
... ... @@ -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)}}">
  91 + <block wx:if="{{g_filter.is_has_rank(rank_switch,item) && is_no_plus}}">
92 92 <!-- 当会员是等级卡的时候 -->
93 93 <block wx:if="{{card_field}}">
94 94 <!-- 等级价>0 -->
... ...
pages/goods/search/search.js
  View file @1cc33ab
... ... @@ -30,6 +30,8 @@ Page({
30 30  
31 31 onLoad: function(t) {
32 32 this.data.rq_data=t;
  33 + this.data.rq_data.o = JSON.parse(t.o);
  34 +
33 35 //接受有没有导购的参数
34 36 var first_leader=t.first_leader;
35 37 if(first_leader){
... ... @@ -154,7 +156,7 @@ Page({
154 156  
155 157 //-----------真的调用地址进行搜索------------
156 158 requestSearch: function(t) {
157   - console.log('t===>', t);
  159 + // console.log('t===>', t);
158 160 if(this.data.loading) return false;
159 161 this.data.loading=1;
160 162 var e = this,th=e;
... ... @@ -165,8 +167,22 @@ Page({
165 167  
166 168 var user_id=getApp().globalData.user_id;
167 169 if(!user_id) user_id=0;
168   -
169   - getApp().request.promiseGet(t, {data:{is_mainshow: 1, isonsale: 1, store_id: oo.stoid,orderField: e.data.tabname, orderType: e.data.adname, page: e.data.currentPage}}).then(async res=>{
  170 + let data = {
  171 + is_mainshow: 1,
  172 + isonsale: 1,
  173 + store_id: oo.stoid,
  174 + orderField: e.data.tabname,
  175 + orderType: e.data.adname,
  176 + page: e.data.currentPage,
  177 + };
  178 +
  179 + let o = this.data.rq_data.o;
  180 + if(o.cat_id) data.cat_id = o.cat_id;
  181 + if(o.pid && o.pid != 'three') data.parent_id = o.pid;
  182 + if(o.nation_id) data.nation_id = o.nation_id;
  183 + if(o.brand_id) data.brand_id = o.brand_id;
  184 +
  185 + getApp().request.promiseGet(t, {data:data}).then(async res=>{
170 186 th.data.loading=0;
171 187 if(ut.ajax_ok(res)){
172 188 if(!e.data.requestData) e.data.requestData=[];
... ...
pages/index/index/index.wxml
  View file @1cc33ab
... ... @@ -461,7 +461,6 @@
461 461 <!--商品分组-->
462 462 <block wx:if="{{item.ename=='goodsGroup'}}">
463 463 <goodsGroup object="{{item.content}}"></goodsGroup>
464   -
465 464 </block>
466 465 <!--通知-->
467 466 <block wx:if="{{item.ename=='notice'}}">
... ...
pages/user/index/index.js
  View file @1cc33ab
... ... @@ -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:'', //等级卡的内容
  44 + ad_img: "",
  45 + add_card_data: '', //等级卡的内容
  46 +
46 47  
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();
  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 77  
78 78  
79   -
80 79  
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});
  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});
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   - }
129   - })
130   - }
131   - ob.isbuy = isbuy;
132   - th.setappdata(ob);
133   - }
  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 + }
134 129 })
  130 + }
  131 + ob.isbuy = isbuy;
  132 + th.setappdata(ob);
135 133 }
136   - })
  134 + })
  135 + }
  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 })
148   - }
149   - }
  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 })
150 148 }
  149 + }
151 150 }
  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,295 +186,293 @@ 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();
  192 + this.birthday();
  193 + this.is_assistance();
194 194  
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) {
  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) {
219 205 s.setData({
220   - toji: su.data.data,
  206 + add_card_data: su.data.data,
221 207 });
222 208 }
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   -
  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 + });
237 235 }
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   - }
  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 + });
256 255 }
257   - })
  256 + }
  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   - });
273   - }
  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 + });
274 273 }
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   -
  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 + });
427 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;
428 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,
429 322  
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
  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});
441 339 })
442   - } else {
443   - th.setData({
444   - is_dengji: 3
  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 + }
445 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);
446 405 }
  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 + })
447 440 } else {
448 441 th.setData({
449   - is_dengji: 2
  442 + is_dengji: 3
450 443 })
451 444 }
  445 + } else {
  446 + th.setData({
  447 + is_dengji: 2
  448 + })
452 449 }
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   - } --*/
  450 + }
  451 + })
  452 + //th.requestRecommend();
  453 +
  454 +
  455 +
470 456  
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)
  457 +
  458 + }
  459 +
  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)
478 476  
479 477  
480 478  
... ... @@ -483,7 +481,7 @@ Page({
483 481  
484 482  
485 483 //判断会员是后有改服务项目
486   - check_is_has_qy: function(item, g_qy_list) {
  484 + check_is_has_qy: function (item, g_qy_list) {
487 485 if (!g_qy_list) return false;
488 486  
489 487 for (var i in g_qy_list) {
... ... @@ -496,13 +494,13 @@ Page({
496 494 /**
497 495 * 生命周期函数--监听页面隐藏
498 496 */
499   - onHide: function() {
500   - for(var i = 1; i < 100; i++) {
  497 + onHide: function () {
  498 + for (var i = 1; i < 100; i++) {
501 499 clearInterval(i);
502 500 }
503 501 },
504   - setappdata: function(t) {
505   - var t=getApp().globalData.wxapp_buy_obj;
  502 + setappdata: function (t) {
  503 + var t = getApp().globalData.wxapp_buy_obj;
506 504 if (t && t.isout == 1)
507 505 wx.navigateTo({
508 506 url: "/pages/error/error?msg=小程序已经过期",
... ... @@ -516,11 +514,11 @@ Page({
516 514 /**
517 515 * 页面上拉触底事件的处理函数
518 516 */
519   - onReachBottom: function() {
  517 + onReachBottom: function () {
520 518 //!this.nomore && this.requestRecommend();
521 519 var goods_list = this.selectComponent("#goods_recommend"); //组件的id
522 520 goods_list.init();
523   - setTimeout(function() {
  521 + setTimeout(function () {
524 522 goods_list.get_list();
525 523 }, 300)
526 524 },
... ... @@ -528,42 +526,42 @@ Page({
528 526 /**
529 527 * 用户点击右上角分享
530 528 */
531   - onShareAppMessage: function() {},
  529 + onShareAppMessage: function () { },
532 530  
533 531 //------卡片的显示和关闭--------
534   - show_tc: function() {
  532 + show_tc: function () {
535 533 if (!this.data.userInfo) return false;
536 534 //base64_encode($user.mobile.'|'.date('Y-m-d H:i:s')
537   - var val=this.data.userInfo.mobile+"|"+ut.formatTime();
538   - val="^"+ut.base64_encode(val);
  535 + var val = this.data.userInfo.mobile + "|" + ut.formatTime();
  536 + val = "^" + ut.base64_encode(val);
539 537  
540 538 qrcode('qrcode', val, 480, 480, this);
541 539 this.setData({
542 540 tc_hide: false,
543 541 });
544 542 },
545   - hide_tc: function() {
  543 + hide_tc: function () {
546 544 this.setData({
547 545 tc_hide: true,
548 546 });
549 547 },
550 548  
551 549 //--跳转到预存款页面--
552   - deposit: function() {
  550 + deposit: function () {
553 551 if (!this.data.userInfo) return false;
554 552 wx.navigateTo({
555 553 url: '../deposit/deposit',
556 554 })
557 555 },
558 556 //--跳转到余额页面--
559   - balance: function() {
  557 + balance: function () {
560 558 if (!this.data.userInfo) return false;
561 559 wx.navigateTo({
562 560 url: '../member/menber',
563 561 })
564 562 },
565 563 //--跳转到优惠券--
566   - coupon: function() {
  564 + coupon: function () {
567 565 var th = this;
568 566 if (!this.data.userInfo) return false;
569 567 // th.sendsm();
... ... @@ -572,20 +570,20 @@ Page({
572 570 })
573 571 },
574 572 //--跳转到积分--
575   - integral: function() {
  573 + integral: function () {
576 574 if (!this.data.userInfo) return false;
577 575 wx.navigateTo({
578 576 url: '../integral/integral',
579 577 })
580 578 },
581 579 //--跳到绑定页面--
582   - gobindtel: function() {
  580 + gobindtel: function () {
583 581 wx.navigateTo({
584 582 url: '/pages/togoin/togoin',
585 583 })
586 584 },
587 585  
588   - go_order: function(e) {
  586 + go_order: function (e) {
589 587 if (!this.data.userInfo) return false;
590 588 var url = e.currentTarget.dataset.url;
591 589 wx.navigateTo({
... ... @@ -595,7 +593,7 @@ Page({
595 593 },
596 594  
597 595 //--加载更多商品--
598   - requestRecommend: function() {
  596 + requestRecommend: function () {
599 597 var e = this,
600 598 t = '/api/weshop/goods/page?page=' + e.data.currentPage;
601 599 var th_recommend_list = e.data.recommend_list;
... ... @@ -608,7 +606,7 @@ Page({
608 606 store_id: os.stoid,
609 607 pageSize: 10
610 608 },
611   - success: function(ee) {
  609 + success: function (ee) {
612 610 var recommend_list = ee.data.data.pageData;
613 611 if (recommend_list && recommend_list.length > 0) {
614 612 var dd = [...th_recommend_list, ...recommend_list];
... ... @@ -627,20 +625,20 @@ Page({
627 625 },
628 626  
629 627 //--跳转到权益页面--
630   - go_qy: function() {
  628 + go_qy: function () {
631 629 if (!this.data.userInfo) return false;
632 630 var url = "/pages/user/userqy/userqy";
633 631 getApp().goto(url);
634 632 },
635 633  
636 634 //--跳转到商品详情页面--
637   - go_goods: function(e) {
  635 + go_goods: function (e) {
638 636 var gid = e.currentTarget.dataset.gid;
639 637 var url = "/pages/goods/goodsInfo/goodsInfo?goods_id=" + gid;
640 638 getApp().goto(url);
641 639 },
642 640  
643   - click_next: function() {
  641 + click_next: function () {
644 642 var index = this.data.sw_index;
645 643 index++;
646 644 if (index >= this.data.qy_list.length) return;
... ... @@ -649,7 +647,7 @@ Page({
649 647 })
650 648 },
651 649  
652   - click_pre: function() {
  650 + click_pre: function () {
653 651 var index = this.data.sw_index;
654 652 index--;
655 653 if (index < 0) return;
... ... @@ -658,7 +656,7 @@ Page({
658 656 })
659 657 },
660 658  
661   - onSli: function(e) {
  659 + onSli: function (e) {
662 660 var that = this;
663 661 that.setData({
664 662 sw_index: e.detail.current
... ... @@ -666,7 +664,7 @@ Page({
666 664 },
667 665  
668 666 //--权益使用--
669   - go_qy_url: function(e) {
  667 + go_qy_url: function (e) {
670 668 var th = this;
671 669 var no = e.currentTarget.dataset.no;
672 670 var ind = e.currentTarget.dataset.ind;
... ... @@ -683,8 +681,8 @@ Page({
683 681 }
684 682  
685 683 var url = e.currentTarget.dataset.img;
686   - if(!url || url==""){
687   - url=`/public/upload/userqy/quanbg.jpg`
  684 + if (!url || url == "") {
  685 + url = `/public/upload/userqy/quanbg.jpg`
688 686 }
689 687 switch (no) {
690 688 case "01":
... ... @@ -696,7 +694,7 @@ Page({
696 694 break;
697 695 case "03":
698 696 getApp().goto("/pages/user/user_spsy/user_spsy?img=" +
699   - url + "&gradeId=" + th.data.gradeId + "&FormId=" + item.Id);
  697 + url + "&gradeId=" + th.data.gradeId + "&FormId=" + item.Id);
700 698 break;
701 699 case "10":
702 700 getApp().request.get("/api/weshop/users/grade/vipprivilegelist/other/get", {
... ... @@ -706,7 +704,7 @@ Page({
706 704 userId: getApp().globalData.user_id,
707 705 gradeId: th.data.gradeId
708 706 },
709   - success: function(res) {
  707 + success: function (res) {
710 708 var val = res.data.data.Remark;
711 709 var title = res.data.data.PrivilegeName;
712 710 var qt_txt = th.selectComponent("#pop_txt"); //组件的id
... ... @@ -722,20 +720,20 @@ Page({
722 720 },
723 721  
724 722 //跳转到链接
725   - goto: function(e) {
  723 + goto: function (e) {
726 724 var url = e.currentTarget.dataset.url;
727 725 getApp().goto(url);
728 726 },
729 727  
730 728 //---------联系客服------------
731   - contactService: function() {
  729 + contactService: function () {
732 730 var s = getApp();
733   - s.getConfig(function(t) {
  731 + s.getConfig(function (t) {
734 732 if (t.store_tel == undefined) {
735 733 getApp().request.get("/api/weshop/store/get/" + os.stoid, {
736 734 isShowLoading: 1,
737 735 data: {},
738   - success: function(rs) {
  736 + success: function (rs) {
739 737 getApp().globalData.config = rs.data.data;
740 738 if (rs.data.data.store_tel == null && rs.data.data.store_tel == undefined) {
741 739 getApp().showWarning("商家未设置电话");
... ... @@ -750,15 +748,15 @@ Page({
750 748 });
751 749 },
752 750  
753   - go_info: function() {
  751 + go_info: function () {
754 752 getApp().goto("/pages/user/userinfo/userinfo");
755 753 },
756 754  
757   - jump: function() {
  755 + jump: function () {
758 756 getApp().goto("/pages/user/grow_value/grow_value")
759 757 },
760 758 // 判断生日营销的页面是不是存在
761   - birthday: function() {
  759 + birthday: function () {
762 760  
763 761 var th = this;
764 762 rq.get("/api/weshop/marketing/birthday/act/judge", {
... ... @@ -771,13 +769,13 @@ Page({
771 769 var actId = res.data.data.id;
772 770 var actImg = res.data.data.actImg;
773 771 th.setData({ giftbagid: giftbagid, actId: actId, actImg: actImg });
774   - th.setData({is_banner:1});
  772 + th.setData({ is_banner: 1 });
775 773 }
776 774  
777 775 }
778 776 })
779 777 },
780   - clike_banne: function() {
  778 + clike_banne: function () {
781 779 var th = this;
782 780 var actId = th.data.actId;
783 781 var giftbagid = th.data.giftbagid;
... ... @@ -792,143 +790,141 @@ Page({
792 790 },
793 791  
794 792 // 判断助力活动是不是存在
795   - is_assistance: function() {
796   - var th = this,r=Math.random()*100;
  793 + is_assistance: function () {
  794 + var th = this, r = Math.random() * 100;
797 795 rq.get("/api/weshop/marketing/help/act/judge", {
798 796 data: {
799 797 storeId: os.stoid,
800 798 userId: app_d.user_id,
801   - r:r,
  799 + r: r,
802 800 },
803   - success: function(res) {
  801 + success: function (res) {
804 802 var code = res.data.code;
805 803 if (code == 0) {
806 804 th.setData({
807 805 is_assistance: 1
808 806 });
809   - }else{
810   - th.setData({
811   - is_assistance: 0
812   - });
813   - }
  807 + } else {
  808 + th.setData({
  809 + is_assistance: 0
  810 + });
  811 + }
814 812  
815 813 }
816 814 })
817 815 },
818 816  
819 817 //导航跳转
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   - })
882   - }
  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 + '"}'
883 849 }
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   - })
919 850  
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   - }
  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 +
928 876 }
929   - })
930   - this.setData({user_tool:d_list});
931   - }
  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);
  911 + }
  912 + }
  913 + }
  914 + })
  915 +
  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 + }
932 928  
933 929  
934 930  
... ...
pages/user/index/index.wxml
  View file @1cc33ab
... ... @@ -2,343 +2,349 @@
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}}</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>
94   - </view>
  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>
95 99  
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>
  100 + </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>
105 109 <!-- 物流信息提醒 -->
106 110 <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>
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">
  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">
253 257 <image class="xc-center-img" src="{{iurl+item.icoimg}}"></image>
254 258 <view class="fs26">{{item.name}}</view>
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}}">
  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}}">
279 283 <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
280 284 <view class="four-level-word">收入卡包</view>
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   -
  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 +
310 314 <!-- 显示商品 -->
311 315 <!-- 好物推荐 -->
312 316 <goods_recommend id="goods_recommend"></goods_recommend>
313   -
  317 +
314 318 <!-- 技术支持 -->
315 319 <view class="logo-container t-c">
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>
  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>
317 323 </view>
318 324 </view>
319 325  
320 326 <!--弹出层内容，其中的“我知道”中绑定让弹出层消失的函数：bindtap="hide"-->
321 327 <view class="tc_view" hidden='{{tc_hide}}' bindtap='hide_tc'>
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>
  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>
342 348 </view>
343 349  
344 350 -<pop_txt id="pop_txt"></pop_txt>
  351 +<pop_txt id="pop_txt"></pop_txt>
345 352 \ No newline at end of file
... ...