wxd / MShopWeApp

Commit 54967f40741b69f9135e3289d4d2d0713bb3401f

Authored by abson
1 parent 14981844

测肤 未闭眼拍摄

Inline Side-by-side
Showing 17 changed files with 881 additions and 918 deletions
components/diy_goodsGroup/diy_goodsGroup.js
  View file @54967f4
... ... @@ -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 () { },
... ... @@ -106,7 +107,7 @@ Component({
106 107 }
107 108 if (this.data.object.bg_color) {
108 109 this.setData({
109   - bg_color:this.data.object.bg_color,
  110 + bg_color: this.data.object.bg_color,
110 111 })
111 112 }
112 113 this.setData({
... ... @@ -332,6 +333,21 @@ Component({
332 333 })
333 334 }
334 335 })
  336 + //调用接口判断商家plus有没有过期
  337 + getApp().request.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=3", {}).then(res => {
  338 + if (res.data.code == 0) {
  339 + var arr = res.data.data.pageData;
  340 + if (arr.length > 0) {
  341 + var item = arr[0];
  342 + if (item.is_sy == 0) {
  343 + var now = Date.parse(new Date()); now = now / 1000;
  344 + if (item.end_time < now) {
  345 + th.setData({ is_no_plus: 0 })
  346 + }
  347 + }
  348 + }
  349 + }
  350 + })
335 351  
336 352 },
337 353  
... ...
components/diy_goodsGroup/diy_goodsGroup.wxml
  View file @54967f4
... ... @@ -102,7 +102,7 @@
102 102 </block>
103 103 <block wx:else>
104 104 <!-- 如果商品有设置等级价大于0的 -->
105   - <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
  105 + <block wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}">
106 106 <view class="money flex">
107 107 <!-- 办卡价 -->
108 108 <view class="flex xc-wc">
... ... @@ -253,7 +253,7 @@
253 253 </block>
254 254 <block wx:else>
255 255 <!-- 如果商品有设置等级价大于0的 -->
256   - <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
  256 + <block wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}">
257 257 <view class="money flex">
258 258 <!-- 办卡价 -->
259 259 <view class="flex xc-wc">
... ... @@ -403,7 +403,7 @@
403 403 </block>
404 404 <block wx:else>
405 405 <!-- 如果商品有设置等级价大于0的 -->
406   - <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
  406 + <block wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}">
407 407 <view class="money flex">
408 408 <!-- 办卡价 -->
409 409 <view class="flex xc-wc">
... ... @@ -577,7 +577,7 @@
577 577 <!-- 等级价 -->
578 578 <view class="price flex ai_and">
579 579 <view class="fs22">￥</view>
580   - <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
  580 + <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2) && is_no_plus}}</view>
581 581 <view class="card_bg">
582 582 <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>{{g_filter.get_card_price(item,card_list,1)}}
583 583 </view>
... ... @@ -734,7 +734,7 @@
734 734 </block>
735 735 <block wx:else>
736 736 <!-- 如果商品有设置等级价大于0的 -->
737   - <block wx:if="{{g_filter.get_card_price(aitem,card_list,0)}}">
  737 + <block wx:if="{{g_filter.get_card_price(aitem,card_list,0) && is_no_plus}}">
738 738 <view class="money flex">
739 739 <!-- 办卡价 -->
740 740 <view class="flex xc-wc">
... ...
components/goods_list/goods_list.js
  View file @54967f4
... ... @@ -16,21 +16,22 @@ 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属性，属性值可以在组件使⽤时指定
23 24 },
24   - ready: function () {},
  25 + ready: function () { },
25 26 pageLifetimes: {
26 27 //要处理一下，游客登录后的界面的变化,主要还该是改变会员
27 28 show: function () {
28 29 this.init();
29   - if(getApp().globalData.login_back==1){
30   - getApp().globalData.login_back==0;
31   - this.data.curPage=1;
32   - this.setData({ recommend: [] });
33   - this.get_list();
  30 + if (getApp().globalData.login_back == 1) {
  31 + getApp().globalData.login_back == 0;
  32 + this.data.curPage = 1;
  33 + this.setData({ recommend: [] });
  34 + this.get_list();
34 35 }
35 36 }
36 37 },
... ... @@ -83,9 +84,21 @@ Component({
83 84 })
84 85  
85 86 }
86   -
87   -
88   -
  87 + }
  88 + })
  89 + //调用接口判断商家plus有没有过期
  90 + getApp().request.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=3", {}).then(res => {
  91 + if (res.data.code == 0) {
  92 + var arr = res.data.data.pageData;
  93 + if (arr.length > 0) {
  94 + var item = arr[0];
  95 + if (item.is_sy == 0) {
  96 + var now = Date.parse(new Date()); now = now / 1000;
  97 + if (item.end_time < now) {
  98 + th.setData({ is_no_plus: 0 })
  99 + }
  100 + }
  101 + }
89 102 }
90 103 })
91 104 },
... ... @@ -93,8 +106,8 @@ Component({
93 106 get_list: function () {
94 107 var that = this;
95 108 if (that.data.is_no_more == 0) return false;
96   - var user_id=getApp().globalData.user_id;
97   - if(!user_id) user_id=0;
  109 + var user_id = getApp().globalData.user_id;
  110 + if (!user_id) user_id = 0;
98 111  
99 112 var curPage = that.data.curPage;
100 113 getApp().request.get('/api/weshop/goods/page?page', {
... ... @@ -124,10 +137,10 @@ Component({
124 137 //加载完成
125 138 if (data.data.pageData) {
126 139  
127   - for(let i in data.data.pageData){
128   - let item=data.data.pageData[i];
129   - if(item.user_price)
130   - item.prom_price=item.user_price;
  140 + for (let i in data.data.pageData) {
  141 + let item = data.data.pageData[i];
  142 + if (item.user_price)
  143 + item.prom_price = item.user_price;
131 144 }
132 145  
133 146 that.setData({
... ... @@ -197,10 +210,10 @@ Component({
197 210 })
198 211 },
199 212  
200   - go_url:function (e) {
201   - var url=e.currentTarget.dataset.url;
202   - getApp().goto(url);
203   - }
  213 + go_url: function (e) {
  214 + var url = e.currentTarget.dataset.url;
  215 + getApp().goto(url);
  216 + }
204 217  
205 218 },
206 219 })
207 220 \ No newline at end of file
... ...
components/goods_list/goods_list.wxml
  View file @54967f4
... ... @@ -6,9 +6,9 @@
6 6 <!-- 商品详情 -->
7 7  
8 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)}}">-->
  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 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">
  11 + <navigator hover-class="none">
12 12 <!-- 商品图⽚ -->
13 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 14 <view class="bottom">
... ... @@ -16,25 +16,25 @@
16 16 <view class="goods_name ellipsis-2 fs28">{{item.goods_name}}</view>
17 17 <!-- 判断是否有活动价 -->
18 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   - <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>
36   - </view>
37   -
  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>
  36 + </view>
  37 +
38 38 </block>
39 39 <block wx:else>
40 40 <!-- 商品价格,先判断下是后⼜等级价-->
... ... @@ -81,7 +81,7 @@
81 81 </block>
82 82 <block wx:else>
83 83 <!-- 如果商品有设置等级价⼤于0的 -->
84   - <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
  84 + <block wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}">
85 85 <view class="money flex">
86 86 <!-- 办卡价 -->
87 87 <view class="flex xc-wc">
... ... @@ -94,16 +94,16 @@
94 94 <view class="fs22">{{item.market_price}}</view>
95 95 </view>
96 96 </view>
97   - <view class="flexr" style="">
  97 + <view class="flexr">
98 98 <!-- 等级价 -->
99   - <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>
105   - </view>
106   - </view>
  99 + <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"/>
  104 + <text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text>
  105 + </view>
  106 + </view>
107 107 </view>
108 108 </block>
109 109 <block wx:else>
... ...
packageA/pages/distribution/goods/goods.js
  View file @54967f4
... ... @@ -14,18 +14,14 @@ Page({
14 14 inputVal: '',//记录搜索输入框的内容
15 15 isSort: false,//控制排序开关状态，true开启排序
16 16 isDescending: false, //isDescending降序，ascending升序
17   -
18   -
19 17 tabArr: [],
20 18 currentTabIndex: 0,
21 19 isShowRow: false,//控制视图切换状态
22 20 isHiddenDropdown: true,//控制筛选下拉菜单显隐
23   -
24 21 list: null,
25 22 isLoading: false, // 检测是否已经发送请求,防止重复发送请求
26 23 noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据
27 24 pageNum: 1, // 当前页数
28   -
29 25 isCheckAll: false, //记录是否全选
30 26 currentQuery: {
31 27 store_id: app.globalData.setting.stoid,
... ...
packageA/pages/distribution/goods/goods.wxml
  View file @54967f4
... ... @@ -5,12 +5,12 @@
5 5 <!-- 搜索 -->
6 6 <view class="flex ai-center fs26 bg-white pd20">
7 7 <view class="input-container f1">
8   - <input class="input" type="text" value="{{inputVal}}" placeholder="请输入商品关键字" bindfocus="inputFocus" bindblur="inputBlur" bindinput="input" confirm-type="search" bindconfirm="search"/>
  8 + <input class="input" type="text" value="{{inputVal}}" placeholder="请输入商品关键字" bindfocus="inputFocus" bindblur="inputBlur" bindinput="input" confirm-type="search" bindconfirm="search" />
9 9 <text class="iconfont icon-guanbi" hidden="{{!isInputFocus}}" catchtap="inputClear"></text>
10 10 <!-- 搜索输入框聚焦时显示关闭按钮，否则隐藏关闭按钮 -->
11 11 </view>
12 12 <view class="pd20 filter {{isHiddenDropdown ? '':'c-red'}}" bindtap="clickFilter">筛选</view>
13   -
  13 +
14 14 <view class="dropdown {{isHiddenDropdown ? '':'show'}}" hidden="{{isHiddenDropdown}}">
15 15 <view class="dropdown-wrapper">
16 16 <view class="pd20 bsbb" wx:if="{{nationList.length != 0}}">
... ... @@ -28,9 +28,9 @@
28 28 <view class="pd20 bsbb">
29 29 <view class="pdb20">价格区间</view>
30 30 <view class="flex t-c ai-center jc-center">
31   - <view class="w30 pdh20"><input type="number" value="{{price}}" placeholder="最低价" class="input-price" bindinput="getPrice" data-ismax="0"/></view>
  31 + <view class="w30 pdh20"><input type="number" value="{{price}}" placeholder="最低价" class="input-price" bindinput="getPrice" data-ismax="0" /></view>
32 32 <view class="mgh20">-</view>
33   - <view class="w30 pdh20"><input type="number" value="{{price}}" placeholder="最高价" class="input-price" bindinput="getPrice" data-ismax="1"/></view>
  33 + <view class="w30 pdh20"><input type="number" value="{{price}}" placeholder="最高价" class="input-price" bindinput="getPrice" data-ismax="1" /></view>
34 34 <!-- <view class="w25 pdt20"><text class="label">品牌一</text></view> -->
35 35 </view>
36 36 </view>
... ... @@ -50,12 +50,12 @@
50 50 </view>
51 51 <view class="mask" bindtap="clickMask"></view>
52 52 </view>
53   -
54   -
  53 +
  54 +
55 55 <view class="flex t-c fs26 bg-white bdb" bindtap="clickTab">
56 56 <block wx:for="{{tabArr}}">
57 57 <view class="f1 pd20 {{currentTabIndex == index ? 'active':''}}" data-index="{{index}}" wx:if="{{index != 3}}">{{item}}</view>
58   - <view class="f1 pd20 {{currentTabIndex == index ? 'active':''}}" data-index="{{index}}" wx:else bindtap="clickSort">
  58 + <view class="f1 pd20 {{currentTabIndex == index ? 'active':''}}" data-index="{{index}}" wx:else bindtap="clickSort">
59 59 {{item}}<text class="iconfont icon-sort2 c-db" wx:if="{{!isSort}}" data-index="{{index}}"></text>
60 60 <text class="t-icon t-icon-sort-up {{isDescending ? 'reverse':''}}" data-index="{{index}}" wx:else></text>
61 61 </view>
... ... @@ -64,287 +64,291 @@
64 64 <text class="iconfont {{isShowRow ? 'icon-fenxiang':'icon-fenlie'}}"></text>
65 65 </view>
66 66 </view>
67   -
  67 +
68 68 </view>
69   -
70   -
  69 +
  70 +
71 71 <view class="content {{(options.index == 1 && currentTabIndex ==1) ? 'pdb0':''}}">
72 72 <checkbox-group class="fs26" wx:if="{{isShowRow}}" bindchange="checkboxChange">
73 73 <view class="item bg-white flex ai-center pd16" wx:for="{{list.pageData}}">
74 74 <!-- <label>
75 75  
76 76 </label> -->
77   - <checkbox value="{{item.goods_id}}" checked="{{item.checked}}" wx:if="{{!(options.index == 1 && currentTabIndex ==1)}}"/>
  77 + <checkbox value="{{item.goods_id}}" checked="{{item.checked}}" wx:if="{{!(options.index == 1 && currentTabIndex ==1)}}" />
78 78 <view class="flex pdl10" bindtap="goto" data-url="{{g_filter.get_goods_url(item)}}">
79   - <view class="pdr20"><image class="img" src="{{imghost + (item.original_img ? item.original_img : default_img)}}" lazy-load/></view>
  79 + <view class="pdr20">
  80 + <image class="img" src="{{imghost + (item.original_img ? item.original_img : default_img)}}" lazy-load />
  81 + </view>
80 82 <view class="flex fdc jc_sb">
81 83 <view class="ellipsis-2">{{item.goods_name}}</view>
82 84 <view>
83 85 <!-- 判断是否有活动价 -->
84 86 <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2 && item.prom_id>0}}">
85   - <view class="flex xc-wc ai-center" >
86   - <text wx:if="{{item.prom_integral}}"><text class="fs30">{{item.prom_integral}}</text>积分</text>
87   - <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
88   - <!-- 活动价 -->
89   - <view class="flex xc-wc ai-center" wx:if="{{item.prom_price}}">
90   - <!-- <view class="fs24">￥</view> -->
91   - <view class="fs30 money">{{item.prom_price}}</view>
92   - </view>
93   - </view>
94   - <view class="flex" style="line-height: 28rpx;">
95   - <!-- 原价 -->
96   - <view class="price flex xc-ash line_th">
97   - <!-- <view class="fs22">￥</view> -->
98   - <view class="fs22 money">{{item.market_price}}</view>
99   - </view>
100   - </view>
  87 + <view class="flex xc-wc ai-center">
  88 + <text wx:if="{{item.prom_integral}}"><text class="fs30">{{item.prom_integral}}</text>积分</text>
  89 + <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
  90 + <!-- 活动价 -->
  91 + <view class="flex xc-wc ai-center" wx:if="{{item.prom_price}}">
  92 + <!-- <view class="fs24">￥</view> -->
  93 + <view class="fs30 money">{{item.prom_price}}</view>
  94 + </view>
  95 + </view>
  96 + <view class="flex" style="line-height: 28rpx;">
  97 + <!-- 原价 -->
  98 + <view class="price flex xc-ash line_th">
  99 + <!-- <view class="fs22">￥</view> -->
  100 + <view class="fs22 money">{{item.market_price}}</view>
  101 + </view>
  102 + </view>
101 103 </block>
102 104 <block wx:else>
103   - <!-- 商品价格,先判断下是后⼜等级价-->
104   - <block wx:if="{{g_filter.is_has_rank(rank_switch,item) && is_no_plus}}">
105   - <!-- 当会员是等级卡的时候 -->
106   - <block wx:if="{{card_field}}">
107   - <!-- 等级价>0 -->
108   - <block wx:if="{{item[card_field]>0}}">
109   - <view class="flex">
110   - <!-- 办卡价 -->
111   - <view class="flex xc-wc ai-center">
112   - <!-- <view class="fs24">￥</view> -->
113   - <view class="fs30 money">{{filter.toFix(item[card_field],2)}}</view>
114   - <view class="card_bg">
115   - <image src="{{imghost + 'miniapp/images/plus/dj_icon.png'}}"></image>
116   - <text class="card_name ellipsis-1">{{card_name}}</text>
117   - </view>
118   - </view>
119   - </view>
120   - <view class="flex" style="line-height: 28rpx;">
121   - <!-- 原价 -->
122   - <view class="price flex xc-ash line_th">
123   - <!-- <view class="fs22">￥</view> -->
124   - <view class="fs22 money">{{item.market_price}}</view>
125   - </view>
126   - </view>
127   - </block>
128   - <blocK wx:else>
129   - <view class="flex">
130   - <!-- 办卡价 -->
131   - <view class="flex xc-wc ai-center">
132   - <!-- <view class="fs24">￥</view> -->
133   - <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
134   - </view>
135   - </view>
136   - <view class="flex" style="line-height: 28rpx;">
137   - <!-- 原价 -->
138   - <view class="price flex xc-ash line_th">
139   - <!-- <view class="fs22">￥</view> -->
140   - <view class="fs22 money">{{item.market_price}}</view>
141   - </view>
142   - </view>
143   - </blocK>
144   - </block>
145   - <block wx:else>
146   - <!-- 如果商品有设置等级价⼤于0的 -->
147   - <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
148   - <view class="flex">
149   - <!-- 办卡价 -->
150   - <view class="flex xc-wc ai-center">
151   - <!-- <view class="fs24">￥</view> -->
152   - <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
153   - </view>
154   - <!-- 原价 -->
155   - <view class="price flex xc-ash line_th">
156   - <!-- <view class="fs22">￥</view> -->
157   - <view class="fs22 money">{{item.market_price}}</view>
158   - </view>
159   - </view>
160   - <view class="flexr">
161   - <!-- 等级价 -->
162   - <view class="price flex ai-center">
163   - <!-- <view class="fs22">￥</view> -->
164   - <view class="fs28 money">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
165   - <view class="card_bg">
166   - <image src="{{imghost + 'miniapp/images/plus/dj_icon.png'}}" class="badge"></ image>
167   - <text class="card_name ellipsis-1">{{g_filter.get_card_price(item,card_list,1)}}</text>
168   - </view>
169   - </view>
170   - </view>
171   - </block>
172   - <block wx:else>
173   - <view class="flex">
174   - <!-- 办卡价 -->
175   - <view class="flex xc-wc ai-center">
176   - <!-- <view class="fs24">￥</view> -->
177   - <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
178   - </view>
179   - </view>
180   - <view class="flex" style="line-height: 28rpx;">
181   - <!-- 原价 -->
182   - <view class="price flex xc-ash line_th">
183   - <!-- <view class="fs22">￥</view> -->
184   - <view class="fs22 money">{{item.market_price}}</view>
185   - </view>
186   - </view>
187   - </block>
188   - </block>
189   - </block>
190   - <!-- 商品压根就没有等级价 -->
191   - <block wx:else>
192   - <view class="flex">
193   - <!-- 办卡价 -->
194   - <view class="flex xc-wc ai-center">
195   - <!-- <view class="fs24">￥</view> -->
196   - <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
197   - </view>
198   - </view>
199   - <view class="flex" style="line-height: 28rpx;">
200   - <!-- 原价 -->
201   - <view class="price flex xc-ash line_th">
202   - <!-- <view class="fs22">￥</view> -->
203   - <view class="fs22 money">{{item.market_price}}</view>
204   - </view>
205   - </view>
206   - </block>
  105 + <!-- 商品价格,先判断下是后⼜等级价-->
  106 + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
  107 + <!-- 当会员是等级卡的时候 -->
  108 + <block wx:if="{{card_field}}">
  109 + <!-- 等级价>0 -->
  110 + <block wx:if="{{item[card_field]>0}}">
  111 + <view class="flex">
  112 + <!-- 办卡价 -->
  113 + <view class="flex xc-wc ai-center">
  114 + <!-- <view class="fs24">￥</view> -->
  115 + <view class="fs30 money">{{filter.toFix(item[card_field],2)}}</view>
  116 + <view class="card_bg">
  117 + <image src="{{imghost + 'miniapp/images/plus/dj_icon.png'}}"></image>
  118 + <text class="card_name ellipsis-1">{{card_name}}</text>
  119 + </view>
  120 + </view>
  121 + </view>
  122 + <view class="flex" style="line-height: 28rpx;">
  123 + <!-- 原价 -->
  124 + <view class="price flex xc-ash line_th">
  125 + <!-- <view class="fs22">￥</view> -->
  126 + <view class="fs22 money">{{item.market_price}}</view>
  127 + </view>
  128 + </view>
  129 + </block>
  130 + <blocK wx:else>
  131 + <view class="flex">
  132 + <!-- 办卡价 -->
  133 + <view class="flex xc-wc ai-center">
  134 + <!-- <view class="fs24">￥</view> -->
  135 + <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
  136 + </view>
  137 + </view>
  138 + <view class="flex" style="line-height: 28rpx;">
  139 + <!-- 原价 -->
  140 + <view class="price flex xc-ash line_th">
  141 + <!-- <view class="fs22">￥</view> -->
  142 + <view class="fs22 money">{{item.market_price}}</view>
  143 + </view>
  144 + </view>
  145 + </blocK>
  146 + </block>
  147 + <block wx:else>
  148 + <!-- 如果商品有设置等级价⼤于0的 -->
  149 + <block wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}">
  150 + <view class="flex">
  151 + <!-- 办卡价 -->
  152 + <view class="flex xc-wc ai-center">
  153 + <!-- <view class="fs24">￥</view> -->
  154 + <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
  155 + </view>
  156 + <!-- 原价 -->
  157 + <view class="price flex xc-ash line_th">
  158 + <!-- <view class="fs22">￥</view> -->
  159 + <view class="fs22 money">{{item.market_price}}</view>
  160 + </view>
  161 + </view>
  162 + <view class="flexr">
  163 + <!-- 等级价 -->
  164 + <view class="price flex ai-center">
  165 + <!-- <view class="fs22">￥</view> -->
  166 + <view class="fs28 money">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
  167 + <view class="card_bg">
  168 + <image src="{{imghost + 'miniapp/images/plus/dj_icon.png'}}" class="badge">
  169 + </ image>
  170 + <text class="card_name ellipsis-1">{{g_filter.get_card_price(item,card_list,1)}}</text>
  171 + </view>
  172 + </view>
  173 + </view>
  174 + </block>
  175 + <block wx:else>
  176 + <view class="flex">
  177 + <!-- 办卡价 -->
  178 + <view class="flex xc-wc ai-center">
  179 + <!-- <view class="fs24">￥</view> -->
  180 + <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
  181 + </view>
  182 + </view>
  183 + <view class="flex" style="line-height: 28rpx;">
  184 + <!-- 原价 -->
  185 + <view class="price flex xc-ash line_th">
  186 + <!-- <view class="fs22">￥</view> -->
  187 + <view class="fs22 money">{{item.market_price}}</view>
  188 + </view>
  189 + </view>
  190 + </block>
  191 + </block>
  192 + </block>
  193 + <!-- 商品压根就没有等级价 -->
  194 + <block wx:else>
  195 + <view class="flex">
  196 + <!-- 办卡价 -->
  197 + <view class="flex xc-wc ai-center">
  198 + <!-- <view class="fs24">￥</view> -->
  199 + <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
  200 + </view>
  201 + </view>
  202 + <view class="flex" style="line-height: 28rpx;">
  203 + <!-- 原价 -->
  204 + <view class="price flex xc-ash line_th">
  205 + <!-- <view class="fs22">￥</view> -->
  206 + <view class="fs22 money">{{item.market_price}}</view>
  207 + </view>
  208 + </view>
  209 + </block>
207 210 </block>
208 211 <!-- <view class="money fs32 c-red">{{item.market_price}}</view> -->
209 212 <view class="fs24 c-a">分成金额：<text class="money c-red">{{filter.toFix(item.commission, 2)}}</text></view>
210 213 </view>
211 214 </view>
212 215 </view>
213   - </view>
  216 + </view>
214 217 </checkbox-group>
215   -
216   - <checkbox-group class="fs26 flex pd16 wrap" catchchange="checkboxChange" wx:else>
  218 +
  219 + <checkbox-group class="fs26 flex pd16 wrap" catchchange="checkboxChange" wx:else>
217 220 <view class="item2 bg-white" wx:for="{{list.pageData}}" bindtap="goto" data-url="{{g_filter.get_goods_url(item)}}">
218   - <image class="img2" src="{{imghost + (item.original_img ? item.original_img : default_img)}}" mode="aspectFit" lazy-load/>
  221 + <image class="img2" src="{{imghost + (item.original_img ? item.original_img : default_img)}}" mode="aspectFit" lazy-load />
219 222 <view class="pd20 fs26 flex jc_sb fdc f1">
220 223 <view class="ellipsis-2">{{item.goods_name}}</view>
221 224 <view class="flex ai-center pdt20">
222   - <checkbox value="{{item.goods_id}}" checked="{{item.checked}}" data-name="checkbox" wx:if="{{!(options.index == 1 && currentTabIndex ==1)}}"/>
  225 + <checkbox value="{{item.goods_id}}" checked="{{item.checked}}" data-name="checkbox" wx:if="{{!(options.index == 1 && currentTabIndex ==1)}}" />
223 226 <view>
224 227 <!-- 判断是否有活动价 -->
225 228 <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2 && item.prom_id>0 }}">
226   - <view class="flex xc-wc ai-center" >
227   - <text wx:if="{{item.prom_integral}}"><text class="fs30">{{item.prom_integral}}</text>积分</text>
228   - <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
229   - <!-- 活动价 -->
230   - <view class="flex xc-wc ai-center" wx:if="{{item.prom_price}}">
231   - <!-- <view class="fs24">￥</view> -->
232   - <view class="fs30 money">{{item.prom_price}}</view>
233   - </view>
234   - </view>
235   - <view class="flex" style="line-height: 28rpx;">
236   - <!-- 原价 -->
237   - <view class="price flex xc-ash line_th">
238   - <!-- <view class="fs22">￥</view> -->
239   - <view class="fs22 money">{{item.market_price}}</view>
240   - </view>
241   - </view>
  229 + <view class="flex xc-wc ai-center">
  230 + <text wx:if="{{item.prom_integral}}"><text class="fs30">{{item.prom_integral}}</text>积分</text>
  231 + <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
  232 + <!-- 活动价 -->
  233 + <view class="flex xc-wc ai-center" wx:if="{{item.prom_price}}">
  234 + <!-- <view class="fs24">￥</view> -->
  235 + <view class="fs30 money">{{item.prom_price}}</view>
  236 + </view>
  237 + </view>
  238 + <view class="flex" style="line-height: 28rpx;">
  239 + <!-- 原价 -->
  240 + <view class="price flex xc-ash line_th">
  241 + <!-- <view class="fs22">￥</view> -->
  242 + <view class="fs22 money">{{item.market_price}}</view>
  243 + </view>
  244 + </view>
242 245 </block>
243 246 <block wx:else>
244   - <!-- 商品价格,先判断下是后⼜等级价-->
245   - <block wx:if="{{g_filter.is_has_rank(rank_switch,item) && is_no_plus}}">
246   - <!-- 当会员是等级卡的时候 -->
247   - <block wx:if="{{card_field}}">
248   - <!-- 等级价>0 -->
249   - <block wx:if="{{item[card_field]>0}}">
250   - <view class="flex">
251   - <!-- 办卡价 -->
252   - <view class="flex xc-wc ai-center">
253   - <!-- <view class="fs24">￥</view> -->
254   - <view class="fs30 money">{{filter.toFix(item[card_field],2)}}</view>
255   - <view class="card_bg">
256   - <image src="{{imghost + 'miniapp/images/plus/dj_icon.png'}}" class="badge"></image>
257   - <text class="card_name ellipsis-1">{{card_name}}</text>
258   - </view>
259   - </view>
260   - </view>
261   - <view class="flex" style="line-height: 28rpx;">
262   - <!-- 原价 -->
263   - <view class="price flex xc-ash line_th">
264   - <!-- <view class="fs22">￥</view> -->
265   - <view class="fs22 money">{{item.market_price}}</view>
266   - </view>
267   - </view>
268   - </block>
269   - <blocK wx:else>
270   - <view class="flex">
271   - <!-- 办卡价 -->
272   - <view class="flex xc-wc ai-center">
273   - <!-- <view class="fs24">￥</view> -->
274   - <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
275   - </view>
276   - </view>
277   - <view class="flex" style="line-height: 28rpx;">
278   - <!-- 原价 -->
279   - <view class="price flex xc-ash line_th">
280   - <!-- <view class="fs22">￥</view> -->
281   - <view class="fs22 money">{{item.market_price}}</view>
282   - </view>
283   - </view>
284   - </blocK>
285   - </block>
286   - <block wx:else>
287   - <!-- 如果商品有设置等级价⼤于0的 -->
288   - <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
289   - <view class="flex">
290   - <!-- 办卡价 -->
291   - <view class="flex xc-wc ai-center">
292   - <!-- <view class="fs24">￥</view> -->
293   - <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
294   - </view>
295   - <!-- 原价 -->
296   - <view class="price flex xc-ash line_th">
297   - <!-- <view class="fs22">￥</view> -->
298   - <view class="fs22 money">{{item.market_price}}</view>
299   - </view>
300   - </view>
301   - <view class="flexr" style="">
302   - <!-- 等级价 -->
303   - <view class="price flex ai-center">
304   - <!-- <view class="fs22">￥</view> -->
305   - <view class="fs28 money">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
306   - <view class="card_bg">
307   - <image src="{{imghost + 'miniapp/images/plus/dj_icon.png'}}"></ image>
  247 + <!-- 商品价格,先判断下是后⼜等级价-->
  248 + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
  249 + <!-- 当会员是等级卡的时候 -->
  250 + <block wx:if="{{card_field}}">
  251 + <!-- 等级价>0 -->
  252 + <block wx:if="{{item[card_field]>0}}">
  253 + <view class="flex">
  254 + <!-- 办卡价 -->
  255 + <view class="flex xc-wc ai-center">
  256 + <!-- <view class="fs24">￥</view> -->
  257 + <view class="fs30 money">{{filter.toFix(item[card_field],2)}}</view>
  258 + <view class="card_bg">
  259 + <image src="{{imghost + 'miniapp/images/plus/dj_icon.png'}}" class="badge"></image>
  260 + <text class="card_name ellipsis-1">{{card_name}}</text>
  261 + </view>
  262 + </view>
  263 + </view>
  264 + <view class="flex" style="line-height: 28rpx;">
  265 + <!-- 原价 -->
  266 + <view class="price flex xc-ash line_th">
  267 + <!-- <view class="fs22">￥</view> -->
  268 + <view class="fs22 money">{{item.market_price}}</view>
  269 + </view>
  270 + </view>
  271 + </block>
  272 + <blocK wx:else>
  273 + <view class="flex">
  274 + <!-- 办卡价 -->
  275 + <view class="flex xc-wc ai-center">
  276 + <!-- <view class="fs24">￥</view> -->
  277 + <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
  278 + </view>
  279 + </view>
  280 + <view class="flex" style="line-height: 28rpx;">
  281 + <!-- 原价 -->
  282 + <view class="price flex xc-ash line_th">
  283 + <!-- <view class="fs22">￥</view> -->
  284 + <view class="fs22 money">{{item.market_price}}</view>
  285 + </view>
  286 + </view>
  287 + </blocK>
  288 + </block>
  289 + <block wx:else>
  290 + <!-- 如果商品有设置等级价⼤于0的 -->
  291 + <block wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}">
  292 + <view class="flex">
  293 + <!-- 办卡价 -->
  294 + <view class="flex xc-wc ai-center">
  295 + <!-- <view class="fs24">￥</view> -->
  296 + <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
  297 + </view>
  298 + <!-- 原价 -->
  299 + <view class="price flex xc-ash line_th">
  300 + <!-- <view class="fs22">￥</view> -->
  301 + <view class="fs22 money">{{item.market_price}}</view>
  302 + </view>
  303 + </view>
  304 + <view class="flexr">
  305 + <!-- 等级价 -->
  306 + <view class="price flex ai-center">
  307 + <!-- <view class="fs22">￥</view> -->
  308 + <view class="fs28 money">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
  309 + <view class="card_bg">
  310 + <image src="{{imghost + 'miniapp/images/plus/dj_icon.png'}}">
  311 + </ image>
308 312 <text class="card_name ellipsis-1">{{g_filter.get_card_price(item,card_list,1)}}</text>
309   - </view>
310 313 </view>
311   - </view>
312   - </block>
313   - <block wx:else>
314   - <view class="flex">
315   - <!-- 办卡价 -->
316   - <view class="flex xc-wc ai-center">
317   - <!-- <view class="fs24">￥</view> -->
318   - <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
319   - </view>
320   - </view>
321   - <view class="flex" style="line-height: 28rpx;">
322   - <!-- 原价 -->
323   - <view class="price flex xc-ash line_th">
324   - <!-- <view class="fs22">￥</view> -->
325   - <view class="fs22 money">{{item.market_price}}</view>
326   - </view>
327   - </view>
328   - </block>
329   - </block>
330   - </block>
331   - <!-- 商品压根就没有等级价 -->
332   - <block wx:else>
333   - <view class="flex">
334   - <!-- 办卡价 -->
335   - <view class="flex xc-wc ai-center">
336   - <!-- <view class="fs24">￥</view> -->
337   - <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
338   - </view>
339   - </view>
340   - <view class="flex" style="line-height: 28rpx;">
341   - <!-- 原价 -->
342   - <view class="price flex xc-ash line_th">
343   - <!-- <view class="fs22">￥</view> -->
344   - <view class="fs22 money">{{item.market_price}}</view>
345   - </view>
346   - </view>
347   - </block>
  314 + </view>
  315 + </view>
  316 + </block>
  317 + <block wx:else>
  318 + <view class="flex">
  319 + <!-- 办卡价 -->
  320 + <view class="flex xc-wc ai-center">
  321 + <!-- <view class="fs24">￥</view> -->
  322 + <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
  323 + </view>
  324 + </view>
  325 + <view class="flex" style="line-height: 28rpx;">
  326 + <!-- 原价 -->
  327 + <view class="price flex xc-ash line_th">
  328 + <!-- <view class="fs22">￥</view> -->
  329 + <view class="fs22 money">{{item.market_price}}</view>
  330 + </view>
  331 + </view>
  332 + </block>
  333 + </block>
  334 + </block>
  335 + <!-- 商品压根就没有等级价 -->
  336 + <block wx:else>
  337 + <view class="flex">
  338 + <!-- 办卡价 -->
  339 + <view class="flex xc-wc ai-center">
  340 + <!-- <view class="fs24">￥</view> -->
  341 + <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
  342 + </view>
  343 + </view>
  344 + <view class="flex" style="line-height: 28rpx;">
  345 + <!-- 原价 -->
  346 + <view class="price flex xc-ash line_th">
  347 + <!-- <view class="fs22">￥</view> -->
  348 + <view class="fs22 money">{{item.market_price}}</view>
  349 + </view>
  350 + </view>
  351 + </block>
348 352 </block>
349 353 <!-- <view class="money c-red fs32">{{item.market_price}}</view> -->
350 354 <view class="c-a fs24">分成金额：<text class="money c-red">{{filter.toFix(item.commission, 2)}}</text></view>
... ... @@ -353,25 +357,17 @@
353 357 </view>
354 358 </view>
355 359 </checkbox-group>
356   -
  360 +
357 361 <nodata class="t-c" wx:if="{{list.pageData.length == 0 || list == null}}"></nodata>
358 362 <view class="noMore" hidden="{{!noMore}}" wx:if="{{list.pageData.length !== 0}}">- 已经到底了 -</view>
359 363 </view>
360   -
361   -
362   -
363   -
364   -
365 364 <view class="bottomBar flex pd20 jc_sb fs26 ai-center" wx:if="{{!(options.index == 1 && currentTabIndex ==1)}}">
366 365 <!-- <view> -->
367   - <label class="flex ai-center" bindtap="clickCheckAll" wx:if="{{!(options.index == 1 && currentTabIndex ==1)}}">
368   - <checkbox checked="{{isCheckAll}}"/>全选
369   - </label>
  366 + <label class="flex ai-center" bindtap="clickCheckAll" wx:if="{{!(options.index == 1 && currentTabIndex ==1)}}">
  367 + <checkbox checked="{{isCheckAll}}" />全选
  368 + </label>
370 369 <!-- </view> -->
371 370 <view class="pd20 btn" wx:if="{{options.index == 0}}" bindtap="putOn">一键上架</view>
372 371 <view class="pd20 btn" wx:else bindtap="pullOff">一键下架</view>
373 372 </view>
374   -
375   -
376   -
377   -</view>
  373 +</view>
378 374 \ No newline at end of file
... ...
packageA/pages/distribution/shop/shop.js
  View file @54967f4
... ... @@ -17,26 +17,21 @@ Page({
17 17 isDescending: false, //isDescending降序，ascending升序
18 18 imghost: '',
19 19 url: os.imghost,
20   -
21 20 tabArr: ['最新', '销量', '评论', '价格'],
22 21 currentTabIndex: 0,
23 22 isShowRow: false,//控制视图切换状态
24 23 isHiddenDropdown: true,//控制筛选下拉菜单显隐
25   -
26 24 list: [],
27 25 isLoading: false, // 检测是否已经发送请求,防止重复发送请求
28 26 noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据
29 27 pageNum: 1, // 当前页数
30   -
31   -
32 28 rank_switch: false,
33 29 card_field: "",
34 30 card_name: "",
35 31 max_card_field: "",
36 32 card_list: null,
37   -
38 33 isAll: true,
39   -
  34 + is_no_plus:1,
40 35 default_img: '/miniapp/images/default_g_img.gif',
41 36 },
42 37  
... ... @@ -213,6 +208,21 @@ Page({
213 208 })
214 209 }
215 210 })
  211 + //调用接口判断商家plus有没有过期
  212 + getApp().request.promiseGet("/store/storemoduleendtime/page?store_id=" + os.stoid + "&type=3", {}).then(res => {
  213 + if (res.data.code == 0) {
  214 + var arr = res.data.data.pageData;
  215 + if (arr.length > 0) {
  216 + var item = arr[0];
  217 + if (item.is_sy == 0) {
  218 + var now = Date.parse(new Date()); now = now / 1000;
  219 + if (item.end_time < now) {
  220 + th.setData({ is_no_plus: 0 })
  221 + }
  222 + }
  223 + }
  224 + }
  225 + })
216 226 }
217 227  
218 228 if (app.globalData.key_word) {
... ...
packageA/pages/distribution/shop/shop.wxml
  View file @54967f4
1 1 <wxs src="../../../../utils/filter.wxs" module="filter"></wxs>
2 2 <wxs module="g_filter" src="g_filter.wxs"></wxs>
3 3 <view>
4   - <view class="head pr">
5   - <view class="bdb">
6   - <!-- <view><image src="../../../images/jfbuy.jpg" mode="widthFix" class="banner"/></view> -->
7   - <view>
8   - <image src="{{imghost + (ad_img ? ad_img:'/miniapp/images/user_index_powder.jpg')}}" mode="widthFix" class="banner" />
9   - </view>
10   - <view class="flex bg-white pdh20 jc_sb pr">
11   - <!-- 分享人的头像 -->
12   - <view class="avatar-container" wx:if="{{userInfo2}}">
13   - <image class="avatar" src="{{userInfo2.head_pic}}" />
14   - <view class="pdt20">
15   - <text class="nickname">{{userInfo2.nickname}}</text>
16   - </view>
17   - </view>
18   - <!-- 自己的头像 -->
19   - <view class="avatar-container" wx:else>
20   - <image class="avatar" src="{{userInfo.head_pic}}" />
21   - <view class="pdt20">
22   - <text class="nickname">{{userInfo.nickname}}</text>
23   - </view>
24   - </view>
25   - <view class="flex t-c fs24 f1 jc_fe">
26   - <view class="pdv20 pdh40 {{isAll ? 'selected':''}}" bindtap="clickAll">
27   - <view class="fs30">{{filter.show_default(total)}}</view>
28   - <view>全部商品</view>
29   - </view>
30   - <view class="pdv20 pdh40 {{!isAll ? 'selected':''}}" bindtap="clickNew">
31   - <view class="fs30">{{filter.show_default(newListTotal)}}</view>
32   - <view>新品</view>
33   - </view>
34   - <view class="pdv20 pdh40" bindtap="goto" data-url="/pages/user/index/index">
35   - <view class="fs26">
36   - <text class="iconfont icon-ren1 bold"></text>
37   - </view>
38   - <view>会员中心</view>
39   - </view>
40   - </view>
41   - </view>
42   - </view>
43   - <!-- 搜索 -->
44   - <view class="flex ai-center fs26 bg-white pd20">
45   - <text class="pdr20 c-a iconfont icon-fenlei" catch:tap="goto" data-url="/packageC/pages/goods/distributionCategoryList/index"></text>
46   - <view class="input-container f1">
47   - <input class="input" type="text" value="{{inputVal}}" placeholder="请输入商品关键字" placeholder-style="color:#aaa;" confirm-type="search" bindfocus="inputFocus" bindblur="inputBlur" bindinput="input" bindconfirm="search" />
48   - <text class="iconfont icon-guanbi" hidden="{{!isInputFocus}}" catchtap="inputClear"></text>
49   - <!-- 搜索输入框聚焦时显示关闭按钮，否则隐藏关闭按钮 -->
50   - </view>
51   - <view class="pdl20 c-a" bindtap="search">搜索</view>
52   - </view>
53   - </view>
54   - <view class="flex t-c fs26 bg-white bdb sticky c-a" catchtap="clickTab">
55   - <block wx:for="{{tabArr}}">
56   - <view class="f1 pd20 {{currentTabIndex == index ? 'active':''}}" data-index="{{index}}" wx:if="{{index != 3}}">
57   - {{item}}
58   - </view>
59   - <view class="f1 pd20 {{currentTabIndex == index ? 'active':''}}" data-index="{{index}}" wx:else bindtap="clickSort">
60   - {{item}}
61   - <text class="iconfont icon-sort2 c-db" wx:if="{{!isSort}}"></text>
62   - <text class="t-icon t-icon-sort-up {{isDescending ? 'reverse':''}}" wx:else></text>
63   - </view>
64   - </block>
65   - <view class="f1 pd20" catchtap="change">
66   - <text class="iconfont {{isShowRow ? 'icon-fenxiang':'icon-fenlie'}}"></text>
67   - </view>
68   - </view>
69   - <view class="content">
70   - <view class="fs26" wx:if="{{isShowRow}}">
71   - <view class="item bg-white flex ai-center pd20" wx:for="{{list}}">
72   - <view class="flex pdl10" bindtap="goto" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_type={{item.prom_type}}&prom_id={{item.prom_id}}">
73   - <view class="img-container pdr20" data-txt="已售:{{item.sales_sum}}">
74   - <image class="img" src="{{imghost + (item.original_img ? item.original_img : default_img)}}" lazy-load mode="aspectFit" />
75   - </view>
76   - <view class="flex fdc jc_sb">
77   - <view class="ellipsis-2 h68 mgb20">{{item.goods_name}}</view>
78   - <!-- 判断是否有活动价 -->
79   - <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2 && item.prom_id>0}}">
80   - <view class="flex xc-wc pdt20">
81   - <text wx:if="{{item.prom_integral}}">
82   - <text class="fs30">{{item.prom_integral}}</text>
83   - 积分
84   - </text>
85   - <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
86   - <!-- 活动价 -->
87   - <view class="flex xc-wc ai_and" wx:if="{{item.prom_price}}">
88   - <!-- <view class="fs24">￥</view> -->
89   - <view class="fs30 money">{{item.prom_price}}</view>
90   - </view>
91   - </view>
92   - <view class="flex" style="line-height: 28rpx;">
93   - <!-- 原价 -->
94   - <view class="price flex xc-ash line_th">
95   - <!-- <view class="fs22">￥</view> -->
96   - <view class="fs22 money">{{item.market_price}}</view>
97   - </view>
98   - </view>
99   - </block>
100   - <block wx:else>
101   - <!-- 商品价格,先判断下是后⼜等级价 -->
102   - <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
103   - <!-- 当会员是等级卡的时候 -->
104   - <block wx:if="{{card_field}}">
105   - <!-- 等级价>0 -->
106   - <block wx:if="{{item[card_field]>0}}">
107   - <view class="flex">
108   - <!-- 办卡价 -->
109   - <view class="flex xc-wc ai_and">
110   - <!-- <view class="fs24">￥</view> -->
111   - <view class="fs30 money">{{filter.toFix(item[card_field],2)}}</view>
112   - <view class="card_bg">
113   - <image src="{{url + 'miniapp/images/plus/dj_icon.png'}}" />
114   - <text class="card_name ellipsis-1">{{card_name}}</text>
115   - </view>
116   - </view>
117   - </view>
118   - <view class="flex" style="line-height: 28rpx;">
119   - <!-- 原价 -->
120   - <view class="price flex xc-ash line_th">
121   - <!-- <view class="fs22">￥</view> -->
122   - <view class="fs22 money">{{item.market_price}}</view>
123   - </view>
124   - </view>
125   - </block>
126   - <blocK wx:else>
127   - <view class="flex">
128   - <!-- 办卡价 -->
129   - <view class="flex xc-wc">
130   - <!-- <view class="fs24">￥</view> -->
131   - <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
132   - </view>
133   - </view>
134   - <view class="flex" style="line-height: 28rpx;">
135   - <!-- 原价 -->
136   - <view class="price flex xc-ash line_th">
137   - <!-- <view class="fs22">￥</view> -->
138   - <view class="fs22 money">{{item.market_price}}</view>
139   - </view>
140   - </view>
141   - </blocK>
142   - </block>
143   - <block wx:else>
144   - <!-- 如果商品有设置等级价⼤于0的 -->
145   - <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
146   - <view class="flex">
147   - <!-- 办卡价 -->
148   - <view class="flex xc-wc">
149   - <!-- <view class="fs24">￥</view> -->
150   - <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
151   - </view>
152   - <!-- 原价 -->
153   - <view class="price flex xc-ash line_th">
154   - <!-- <view class="fs22">￥</view> -->
155   - <view class="fs22 money">{{item.market_price}}</view>
156   - </view>
157   - </view>
158   - <view class="flexr" style="">
159   - <!-- 等级价 -->
160   - <view class="price flex ai-center">
161   - <!-- <view class="fs22">￥</view> -->
162   - <view class="fs28 money">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
163   - <view class="card_bg">
164   - <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
165   - <text class="card_name ellipsis-1">{{g_filter.get_card_price(item,card_list,1)}} </text>
166   - </view>
167   - </view>
168   - </view>
169   - </block>
170   - <block wx:else>
171   - <view class="flex">
172   - <!-- 办卡价 -->
173   - <view class="flex xc-wc">
174   - <!-- <view class="fs24">￥</view> -->
175   - <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
176   - </view>
177   - </view>
178   - <view class="flex" style="line-height: 28rpx;">
179   - <!-- 原价 -->
180   - <view class="price flex xc-ash line_th">
181   - <!-- <view class="fs22">￥</view> -->
182   - <view class="fs22 money">{{item.market_price}}</view>
183   - </view>
184   - </view>
185   - </block>
186   - </block>
187   - </block>
188   - <!-- 商品压根就没有等级价 -->
189   - <block wx:else>
190   - <view class="flex">
191   - <!-- 办卡价 -->
192   - <view class="flex xc-wc">
193   - <!-- <view class="fs24">￥</view> -->
194   - <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
195   - </view>
196   - </view>
197   - <view class="flex" style="line-height: 28rpx;">
198   - <!-- 原价 -->
199   - <view class="price flex xc-ash line_th">
200   - <!-- <view class="fs22">￥</view> -->
201   - <view class="fs22 money">{{item.market_price}}</view>
202   - </view>
203   - </view>
204   - </block>
205   - </block>
206   - <!-- 分层金额 -->
207   - <view hidden="{{ishidden_comise}}" class="fs24 c-a">
208   - 分成金额：
209   - <text class="money c-red">{{filter.toFix(item.commission,2)}}</text>
210   - </view>
211   - </view>
212   - </view>
213   - </view>
214   - </view>
215   - <view class="fs26 flex pd20 wrap" wx:else>
216   - <view class="item2 bg-white" wx:for="{{list}}" bindtap="goto" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_type={{item.prom_type}}&prom_id={{item.prom_id}}">
217   - <view class="img-container" data-txt="已售:{{item.sales_sum}}">
218   - <image class="img2" src="{{imghost + (item.original_img ? item.original_img : default_img)}}" lazy-load="true" />
219   - </view>
220   - <view class="pd20 fs26">
221   - <view class="ellipsis-2 h68 mgb20">{{item.goods_name}}</view>
222   - <!-- 判断是否有活动价 -->
223   - <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2 && item.prom_id>0}}">
224   - <view class="flex xc-wc">
225   - <text wx:if="{{item.prom_integral}}">
226   - <text class="fs30" style="font-weight: bold;">{{item.prom_integral}}</text>
227   - 积分
228   - </text>
229   - <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
230   - <!-- 活动价 -->
231   - <view class="flex xc-wc" wx:if="{{item.prom_price}}">
232   - <!-- <view class="fs24">￥</view> -->
233   - <view class="fs30 money">{{item.prom_price}}</view>
234   - </view>
235   - </view>
236   - <view class="flex" style="line-height: 28rpx;">
237   - <!-- 原价 -->
238   - <view class="price flex xc-ash line_th">
239   - <!-- <view class="fs22">￥</view> -->
240   - <view class="fs22 money">{{item.market_price}}</view>
241   - </view>
242   - </view>
243   - </block>
244   - <block wx:else>
245   - <!-- 商品价格,先判断下是后⼜等级价 -->
246   - <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
247   - <!-- 当会员是等级卡的时候 -->
248   - <block wx:if="{{card_field}}">
249   - <!-- 等级价>0 -->
250   - <block wx:if="{{item[card_field]>0}}">
251   - <view class="flex">
252   - <!-- 办卡价 -->
253   - <view class="flex xc-wc ai_and">
254   - <!-- <view class="fs24">￥</view> -->
255   - <view class="fs30 money">{{filter.toFix(item[card_field],2)}}</view>
256   - <view class="card_bg">
257   - <image src="{{url}}/miniapp/images/plus/dj_icon.png" />
258   - <text class="card_name ellipsis-1">{{card_name}}</text>
259   - </view>
260   - </view>
261   - </view>
262   - <view class="flex" style="line-height: 28rpx;">
263   - <!-- 原价 -->
264   - <view class="price flex xc-ash line_th">
265   - <!-- <view class="fs22">￥</view> -->
266   - <view class="fs22 money">{{item.market_price}}</view>
267   - </view>
268   - </view>
269   - </block>
270   - <blocK wx:else>
271   - <view class="flex">
272   - <!-- 办卡价 -->
273   - <view class="flex xc-wc ai_and">
274   - <!-- <view class="fs24">￥</view> -->
275   - <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
276   - </view>
277   - </view>
278   - <view class="flex" style="line-height: 28rpx;">
279   - <!-- 原价 -->
280   - <view class="price flex xc-ash line_th">
281   - <!-- <view class="fs22">￥</view> -->
282   - <view class="fs22 money">{{item.market_price}}</view>
283   - </view>
284   - </view>
285   - </blocK>
286   - </block>
287   - <block wx:else>
288   - <!-- 如果商品有设置等级价⼤于0的 -->
289   - <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
290   - <view class="flex">
291   - <!-- 办卡价 -->
292   - <view class="flex xc-wc ai_and">
293   - <!-- <view class="fs24">￥</view> -->
294   - <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
295   - </view>
296   - <!-- 原价 -->
297   - <view class="price flex xc-ash line_th">
298   - <!-- <view class="fs22">￥</view> -->
299   - <view class="fs22 money">{{item.market_price}}</view>
300   - </view>
301   - </view>
302   - <view class="flexr" style="">
303   - <!-- 等级价 -->
304   - <view class="price flex ai-center">
305   - <!-- <view class="fs22">￥</view> -->
306   - <view class="fs28 money">
307   - {{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}
308   - </view>
309   - <view class="card_bg">
310   - <image src="{{url}}/miniapp/images/plus/dj_icon.png" />
311   - <text class="card_name ellipsis-1">{{g_filter.get_card_price(item,card_list,1)}}</text>
312   - </view>
313   - </view>
314   - </view>
315   - </block>
316   - <block wx:else>
317   - <view class="flex">
318   - <!-- 办卡价 -->
319   - <view class="flex xc-wc ai_and">
320   - <!-- <view class="fs24">￥</view> -->
321   - <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
322   - </view>
323   - </view>
324   - <view class="flex" style="line-height: 28rpx;">
325   - <!-- 原价 -->
326   - <view class="price flex xc-ash line_th">
327   - <!-- <view class="fs22">￥</view> -->
328   - <view class="fs22 money">{{item.market_price}}</view>
329   - </view>
330   - </view>
331   - </block>
332   - </block>
333   - </block>
334   - <!-- 商品压根就没有等级价 -->
335   - <block wx:else>
336   - <view class="flex">
337   - <!-- 办卡价 -->
338   - <view class="flex xc-wc ai_and">
339   - <!-- <view class="fs24">￥</view> -->
340   - <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
341   - </view>
342   - </view>
343   - <view class="flex" style="line-height: 28rpx;">
344   - <!-- 原价 -->
345   - <view class="price flex xc-ash line_th">
346   - <!-- <view class="fs22">￥</view> -->
347   - <view class="fs22 money">{{item.market_price}}</view>
348   - </view>
349   - </view>
350   - </block>
351   - </block>
352   - <!-- 分层金额 -->
353   - <view class="fs24 c-a">
354   - 分成金额：
355   - <text class="money c-red">{{filter.toFix(item.commission,2)}}</text>
356   - </view>
357   - </view>
358   - </view>
359   - </view>
360   - <nodata class="t-c" wx:if="{{list.length == 0 && list}}"></nodata>
361   - <view class="noMore" hidden="{{!noMore}}" wx:if="{{list.length !== 0}}">
362   - - 已经到底了 -
363   - </view>
364   - </view>
  4 + <view class="head pr">
  5 + <view class="bdb">
  6 + <!-- <view><image src="../../../images/jfbuy.jpg" mode="widthFix" class="banner"/></view> -->
  7 + <view>
  8 + <image src="{{imghost + (ad_img ? ad_img:'/miniapp/images/user_index_powder.jpg')}}" mode="widthFix" class="banner" />
  9 + </view>
  10 + <view class="flex bg-white pdh20 jc_sb pr">
  11 + <!-- 分享人的头像 -->
  12 + <view class="avatar-container" wx:if="{{userInfo2}}">
  13 + <image class="avatar" src="{{userInfo2.head_pic}}" />
  14 + <view class="pdt20">
  15 + <text class="nickname">{{userInfo2.nickname}}</text>
  16 + </view>
  17 + </view>
  18 + <!-- 自己的头像 -->
  19 + <view class="avatar-container" wx:else>
  20 + <image class="avatar" src="{{userInfo.head_pic}}" />
  21 + <view class="pdt20">
  22 + <text class="nickname">{{userInfo.nickname}}</text>
  23 + </view>
  24 + </view>
  25 + <view class="flex t-c fs24 f1 jc_fe">
  26 + <view class="pdv20 pdh40 {{isAll ? 'selected':''}}" bindtap="clickAll">
  27 + <view class="fs30">{{filter.show_default(total)}}</view>
  28 + <view>全部商品</view>
  29 + </view>
  30 + <view class="pdv20 pdh40 {{!isAll ? 'selected':''}}" bindtap="clickNew">
  31 + <view class="fs30">{{filter.show_default(newListTotal)}}</view>
  32 + <view>新品</view>
  33 + </view>
  34 + <view class="pdv20 pdh40" bindtap="goto" data-url="/pages/user/index/index">
  35 + <view class="fs26">
  36 + <text class="iconfont icon-ren1 bold"></text>
  37 + </view>
  38 + <view>会员中心</view>
  39 + </view>
  40 + </view>
  41 + </view>
  42 + </view>
  43 + <!-- 搜索 -->
  44 + <view class="flex ai-center fs26 bg-white pd20">
  45 + <text class="pdr20 c-a iconfont icon-fenlei" catch:tap="goto" data-url="/packageC/pages/goods/distributionCategoryList/index"></text>
  46 + <view class="input-container f1">
  47 + <input class="input" type="text" value="{{inputVal}}" placeholder="请输入商品关键字" placeholder-style="color:#aaa;" confirm-type="search" bindfocus="inputFocus" bindblur="inputBlur" bindinput="input" bindconfirm="search" />
  48 + <text class="iconfont icon-guanbi" hidden="{{!isInputFocus}}" catchtap="inputClear"></text>
  49 + <!-- 搜索输入框聚焦时显示关闭按钮，否则隐藏关闭按钮 -->
  50 + </view>
  51 + <view class="pdl20 c-a" bindtap="search">搜索</view>
  52 + </view>
  53 + </view>
  54 + <view class="flex t-c fs26 bg-white bdb sticky c-a" catchtap="clickTab">
  55 + <block wx:for="{{tabArr}}">
  56 + <view class="f1 pd20 {{currentTabIndex == index ? 'active':''}}" data-index="{{index}}" wx:if="{{index != 3}}">
  57 + {{item}}
  58 + </view>
  59 + <view class="f1 pd20 {{currentTabIndex == index ? 'active':''}}" data-index="{{index}}" wx:else bindtap="clickSort">
  60 + {{item}}
  61 + <text class="iconfont icon-sort2 c-db" wx:if="{{!isSort}}"></text>
  62 + <text class="t-icon t-icon-sort-up {{isDescending ? 'reverse':''}}" wx:else></text>
  63 + </view>
  64 + </block>
  65 + <view class="f1 pd20" catchtap="change">
  66 + <text class="iconfont {{isShowRow ? 'icon-fenxiang':'icon-fenlie'}}"></text>
  67 + </view>
  68 + </view>
  69 + <view class="content">
  70 + <view class="fs26" wx:if="{{isShowRow}}">
  71 + <view class="item bg-white flex ai-center pd20" wx:for="{{list}}">
  72 + <view class="flex pdl10" bindtap="goto" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_type={{item.prom_type}}&prom_id={{item.prom_id}}">
  73 + <view class="img-container pdr20" data-txt="已售:{{item.sales_sum}}">
  74 + <image class="img" src="{{imghost + (item.original_img ? item.original_img : default_img)}}" lazy-load mode="aspectFit" />
  75 + </view>
  76 + <view class="flex fdc jc_sb">
  77 + <view class="ellipsis-2 h68 mgb20">{{item.goods_name}}</view>
  78 + <!-- 判断是否有活动价 -->
  79 + <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2 && item.prom_id>0}}">
  80 + <view class="flex xc-wc pdt20">
  81 + <text wx:if="{{item.prom_integral}}">
  82 + <text class="fs30">{{item.prom_integral}}</text>
  83 + 积分
  84 + </text>
  85 + <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
  86 + <!-- 活动价 -->
  87 + <view class="flex xc-wc ai_and" wx:if="{{item.prom_price}}">
  88 + <!-- <view class="fs24">￥</view> -->
  89 + <view class="fs30 money">{{item.prom_price}}</view>
  90 + </view>
  91 + </view>
  92 + <view class="flex" style="line-height: 28rpx;">
  93 + <!-- 原价 -->
  94 + <view class="price flex xc-ash line_th">
  95 + <!-- <view class="fs22">￥</view> -->
  96 + <view class="fs22 money">{{item.market_price}}</view>
  97 + </view>
  98 + </view>
  99 + </block>
  100 + <block wx:else>
  101 + <!-- 商品价格,先判断下是后⼜等级价 -->
  102 + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
  103 + <!-- 当会员是等级卡的时候 -->
  104 + <block wx:if="{{card_field}}">
  105 + <!-- 等级价>0 -->
  106 + <block wx:if="{{item[card_field]>0}}">
  107 + <view class="flex">
  108 + <!-- 办卡价 -->
  109 + <view class="flex xc-wc ai_and">
  110 + <!-- <view class="fs24">￥</view> -->
  111 + <view class="fs30 money">{{filter.toFix(item[card_field],2)}}</view>
  112 + <view class="card_bg">
  113 + <image src="{{url + 'miniapp/images/plus/dj_icon.png'}}" />
  114 + <text class="card_name ellipsis-1">{{card_name}}</text>
  115 + </view>
  116 + </view>
  117 + </view>
  118 + <view class="flex" style="line-height: 28rpx;">
  119 + <!-- 原价 -->
  120 + <view class="price flex xc-ash line_th">
  121 + <!-- <view class="fs22">￥</view> -->
  122 + <view class="fs22 money">{{item.market_price}}</view>
  123 + </view>
  124 + </view>
  125 + </block>
  126 + <blocK wx:else>
  127 + <view class="flex">
  128 + <!-- 办卡价 -->
  129 + <view class="flex xc-wc">
  130 + <!-- <view class="fs24">￥</view> -->
  131 + <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
  132 + </view>
  133 + </view>
  134 + <view class="flex" style="line-height: 28rpx;">
  135 + <!-- 原价 -->
  136 + <view class="price flex xc-ash line_th">
  137 + <!-- <view class="fs22">￥</view> -->
  138 + <view class="fs22 money">{{item.market_price}}</view>
  139 + </view>
  140 + </view>
  141 + </blocK>
  142 + </block>
  143 + <block wx:else>
  144 + <!-- 如果商品有设置等级价⼤于0的 -->
  145 + <block wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}">
  146 + <view class="flex">
  147 + <!-- 办卡价 -->
  148 + <view class="flex xc-wc">
  149 + <!-- <view class="fs24">￥</view> -->
  150 + <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
  151 + </view>
  152 + <!-- 原价 -->
  153 + <view class="price flex xc-ash line_th">
  154 + <!-- <view class="fs22">￥</view> -->
  155 + <view class="fs22 money">{{item.market_price}}</view>
  156 + </view>
  157 + </view>
  158 + <view class="flexr">
  159 + <!-- 等级价 -->
  160 + <view class="price flex ai-center">
  161 + <!-- <view class="fs22">￥</view> -->
  162 + <view class="fs28 money">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
  163 + <view class="card_bg">
  164 + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
  165 + <text class="card_name ellipsis-1">{{g_filter.get_card_price(item,card_list,1)}} </text>
  166 + </view>
  167 + </view>
  168 + </view>
  169 + </block>
  170 + <block wx:else>
  171 + <view class="flex">
  172 + <!-- 办卡价 -->
  173 + <view class="flex xc-wc">
  174 + <!-- <view class="fs24">￥</view> -->
  175 + <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
  176 + </view>
  177 + </view>
  178 + <view class="flex" style="line-height: 28rpx;">
  179 + <!-- 原价 -->
  180 + <view class="price flex xc-ash line_th">
  181 + <!-- <view class="fs22">￥</view> -->
  182 + <view class="fs22 money">{{item.market_price}}</view>
  183 + </view>
  184 + </view>
  185 + </block>
  186 + </block>
  187 + </block>
  188 + <!-- 商品压根就没有等级价 -->
  189 + <block wx:else>
  190 + <view class="flex">
  191 + <!-- 办卡价 -->
  192 + <view class="flex xc-wc">
  193 + <!-- <view class="fs24">￥</view> -->
  194 + <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
  195 + </view>
  196 + </view>
  197 + <view class="flex" style="line-height: 28rpx;">
  198 + <!-- 原价 -->
  199 + <view class="price flex xc-ash line_th">
  200 + <!-- <view class="fs22">￥</view> -->
  201 + <view class="fs22 money">{{item.market_price}}</view>
  202 + </view>
  203 + </view>
  204 + </block>
  205 + </block>
  206 + <!-- 分层金额 -->
  207 + <view hidden="{{ishidden_comise}}" class="fs24 c-a">
  208 + 分成金额：
  209 + <text class="money c-red">{{filter.toFix(item.commission,2)}}</text>
  210 + </view>
  211 + </view>
  212 + </view>
  213 + </view>
  214 + </view>
  215 + <view class="fs26 flex pd20 wrap" wx:else>
  216 + <view class="item2 bg-white" wx:for="{{list}}" bindtap="goto" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_type={{item.prom_type}}&prom_id={{item.prom_id}}">
  217 + <view class="img-container" data-txt="已售:{{item.sales_sum}}">
  218 + <image class="img2" src="{{imghost + (item.original_img ? item.original_img : default_img)}}" lazy-load="true" />
  219 + </view>
  220 + <view class="pd20 fs26">
  221 + <view class="ellipsis-2 h68 mgb20">{{item.goods_name}}</view>
  222 + <!-- 判断是否有活动价 -->
  223 + <block wx:if="{{(item.prom_price>0 || item.prom_integral>0) && item.prom_type!=2 && item.prom_id>0}}">
  224 + <view class="flex xc-wc">
  225 + <text wx:if="{{item.prom_integral}}">
  226 + <text class="fs30" style="font-weight: bold;">{{item.prom_integral}}</text>
  227 + 积分
  228 + </text>
  229 + <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
  230 + <!-- 活动价 -->
  231 + <view class="flex xc-wc" wx:if="{{item.prom_price}}">
  232 + <!-- <view class="fs24">￥</view> -->
  233 + <view class="fs30 money">{{item.prom_price}}</view>
  234 + </view>
  235 + </view>
  236 + <view class="flex" style="line-height: 28rpx;">
  237 + <!-- 原价 -->
  238 + <view class="price flex xc-ash line_th">
  239 + <!-- <view class="fs22">￥</view> -->
  240 + <view class="fs22 money">{{item.market_price}}</view>
  241 + </view>
  242 + </view>
  243 + </block>
  244 + <block wx:else>
  245 + <!-- 商品价格,先判断下是后⼜等级价 -->
  246 + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
  247 + <!-- 当会员是等级卡的时候 -->
  248 + <block wx:if="{{card_field}}">
  249 + <!-- 等级价>0 -->
  250 + <block wx:if="{{item[card_field]>0}}">
  251 + <view class="flex">
  252 + <!-- 办卡价 -->
  253 + <view class="flex xc-wc ai_and">
  254 + <!-- <view class="fs24">￥</view> -->
  255 + <view class="fs30 money">{{filter.toFix(item[card_field],2)}}</view>
  256 + <view class="card_bg">
  257 + <image src="{{url}}/miniapp/images/plus/dj_icon.png" />
  258 + <text class="card_name ellipsis-1">{{card_name}}</text>
  259 + </view>
  260 + </view>
  261 + </view>
  262 + <view class="flex" style="line-height: 28rpx;">
  263 + <!-- 原价 -->
  264 + <view class="price flex xc-ash line_th">
  265 + <!-- <view class="fs22">￥</view> -->
  266 + <view class="fs22 money">{{item.market_price}}</view>
  267 + </view>
  268 + </view>
  269 + </block>
  270 + <blocK wx:else>
  271 + <view class="flex">
  272 + <!-- 办卡价 -->
  273 + <view class="flex xc-wc ai_and">
  274 + <!-- <view class="fs24">￥</view> -->
  275 + <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
  276 + </view>
  277 + </view>
  278 + <view class="flex" style="line-height: 28rpx;">
  279 + <!-- 原价 -->
  280 + <view class="price flex xc-ash line_th">
  281 + <!-- <view class="fs22">￥</view> -->
  282 + <view class="fs22 money">{{item.market_price}}</view>
  283 + </view>
  284 + </view>
  285 + </blocK>
  286 + </block>
  287 + <block wx:else>
  288 + <!-- 如果商品有设置等级价⼤于0的 -->
  289 + <block wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}">
  290 + <view class="flex">
  291 + <!-- 办卡价 -->
  292 + <view class="flex xc-wc ai_and">
  293 + <!-- <view class="fs24">￥</view> -->
  294 + <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
  295 + </view>
  296 + <!-- 原价 -->
  297 + <view class="price flex xc-ash line_th">
  298 + <!-- <view class="fs22">￥</view> -->
  299 + <view class="fs22 money">{{item.market_price}}</view>
  300 + </view>
  301 + </view>
  302 + <view class="flexr">
  303 + <!-- 等级价 -->
  304 + <view class="price flex ai-center">
  305 + <!-- <view class="fs22">￥</view> -->
  306 + <view class="fs28 money">
  307 + {{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}
  308 + </view>
  309 + <view class="card_bg">
  310 + <image src="{{url}}/miniapp/images/plus/dj_icon.png" />
  311 + <text class="card_name ellipsis-1">{{g_filter.get_card_price(item,card_list,1)}}</text>
  312 + </view>
  313 + </view>
  314 + </view>
  315 + </block>
  316 + <block wx:else>
  317 + <view class="flex">
  318 + <!-- 办卡价 -->
  319 + <view class="flex xc-wc ai_and">
  320 + <!-- <view class="fs24">￥</view> -->
  321 + <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
  322 + </view>
  323 + </view>
  324 + <view class="flex" style="line-height: 28rpx;">
  325 + <!-- 原价 -->
  326 + <view class="price flex xc-ash line_th">
  327 + <!-- <view class="fs22">￥</view> -->
  328 + <view class="fs22 money">{{item.market_price}}</view>
  329 + </view>
  330 + </view>
  331 + </block>
  332 + </block>
  333 + </block>
  334 + <!-- 商品压根就没有等级价 -->
  335 + <block wx:else>
  336 + <view class="flex">
  337 + <!-- 办卡价 -->
  338 + <view class="flex xc-wc ai_and">
  339 + <!-- <view class="fs24">￥</view> -->
  340 + <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
  341 + </view>
  342 + </view>
  343 + <view class="flex" style="line-height: 28rpx;">
  344 + <!-- 原价 -->
  345 + <view class="price flex xc-ash line_th">
  346 + <!-- <view class="fs22">￥</view> -->
  347 + <view class="fs22 money">{{item.market_price}}</view>
  348 + </view>
  349 + </view>
  350 + </block>
  351 + </block>
  352 + <!-- 分层金额 -->
  353 + <view class="fs24 c-a">
  354 + 分成金额：
  355 + <text class="money c-red">{{filter.toFix(item.commission,2)}}</text>
  356 + </view>
  357 + </view>
  358 + </view>
  359 + </view>
  360 + <nodata class="t-c" wx:if="{{list.length == 0 && list}}"></nodata>
  361 + <view class="noMore" hidden="{{!noMore}}" wx:if="{{list.length !== 0}}">
  362 + - 已经到底了 -
  363 + </view>
  364 + </view>
365 365 </view>
366 366 \ No newline at end of file
... ...
packageD/pages/AI-test-skin/analyse/analyse.js
  View file @54967f4
... ... @@ -236,7 +236,7 @@ Page({
236 236 //检查睁眼闭眼
237 237 var eye_status = check_data.eye_status;
238 238 console.log('eye_status',eye_status);
239   - if (eye_status.left_eye > 0.1 || eye_status.right_eye > 0.1) {
  239 + if (eye_status.left_eye > 0.5 || eye_status.right_eye > 0.5) {
240 240 // var msg = "未闭眼拍照";
241 241 // th.go_error(msg);
242 242 // return false;
... ...
pages/cart/cart2/cart2.js
  View file @54967f4
... ... @@ -227,23 +227,6 @@ Page({
227 227 } else {
228 228 th.setData({ user_addr: ie });
229 229 }
230   - var going = 0;
231   -
232   -
233   - //使用计时器，避免空现象
234   - /*---
235   - var jishi= setInterval(function () {
236   - if (th.data.is_b_now == 1 && going==0) {
237   - if(th.data.bn_goods) {
238   - th.calculatePrice2();going=1;clearInterval(jishi);
239   - }
240   - }else if(going==0) {
241   - if (th.data.cartlist){
242   - th.calculatePrice();going = 1; clearInterval(jishi);
243   - }
244   - }
245   - },500)--*/
246   -
247 230 });
248 231 var is_card_back = getApp().globalData.is_card_back;
249 232 //--更新默认地址--,看一下是不是跳到地址页面,同时也不是购买等级卡返回的，这里很重要，否则会重新更新收货物流公司
... ... @@ -392,6 +375,7 @@ Page({
392 375 th.setData({ user_addr: addr });
393 376 //--------------------------立即购买------------------
394 377 if (ta.is_bnow == 1) {
  378 + console.log('is_bnow');
395 379 //读取门店
396 380 to.get_allsto(function (e) {
397 381 th.setData({ allsto: e });
... ... @@ -404,6 +388,8 @@ Page({
404 388 to.get_allsto(function (e) {
405 389 th.setData({ allsto: e });
406 390 //-------获取购物车已经选择的商品--------
  391 + console.log('购物车结算');
  392 +
407 393 th.get_cart();
408 394 })
409 395 }
... ... @@ -533,7 +519,7 @@ Page({
533 519 }
534 520 if (item1.prom_type == 10) {
535 521 if (!th.data.ladder_map[item1.prom_id]) {
536   - //如果有组合购
  522 + //如果有预售
537 523 var isok = 1;
538 524 var is_flag = 1;
539 525 var act = null;
... ... @@ -984,7 +970,6 @@ Page({
984 970 if (gg.prom_type == 5) {
985 971 t.data.data.prom_id = gg.prom_id;
986 972 t.data.data.prom_type = 5;
987   -
988 973 // console.log('xxxxxxxxxxxxxxxxxx', gg.is_coupon)
989 974 th.is_coupon = gg.is_coupon;
990 975 th.setData({
... ... @@ -3786,7 +3771,7 @@ Page({
3786 3771 for (var i in goodlist) {
3787 3772 var gd = goodlist[i];
3788 3773 //--如果是秒杀就跳出,如果是赠品，如果是组合购，如果是限制使用优惠券--
3789   - if (gd.prom_type == 1 || gd.is_gift || gd.prom_type == 7) {
  3774 + if (gd.prom_type == 1 || gd.is_gift || (gd.prom_type == 7 && gd.act.is_xz_yh)) {
3790 3775 continue;
3791 3776 }
3792 3777  
... ...
pages/goods/goodsInfo/goodsInfo.wxml
  View file @54967f4
... ... @@ -294,7 +294,7 @@
294 294 <view class="co-red" wx:if="{{prom_type==0 || prom_type==3}}">
295 295  
296 296 <view class="market-price flex" style="align-items: baseline;">
297   - <block wx:if="{{card_field && data[card_field]>0 && is_no_plus}}">
  297 + <block wx:if="{{card_field && data[card_field]>0}}">
298 298 <view class="flex ai-center grade-card-frame">
299 299 <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
300 300 <view class="fs24 white view card-name ellipsis-1">{{card_name}}</view>
... ...
pages/goods/goodsList/goodsList.js
  View file @54967f4
... ... @@ -19,7 +19,8 @@ Page({
19 19 tabname:"sort", //排序的字段
20 20 adname:"asc", //升降的字段
21 21 is_new:0,
22   - is_hot:0,
  22 + is_hot:0,
  23 + is_no_plus:1,
23 24 prom_goods_list:null,
24 25 rq_data:null,
25 26 isToggle: false, //切换商品视图控制符
... ... @@ -43,9 +44,6 @@ Page({
43 44 }
44 45  
45 46 var th=this;
46   -
47   - //a.init(this, "", "requestData");
48   -
49 47 var url = this.data.baseUrl;
50 48 this.data.is_new=t.is_new;
51 49 this.data.is_hot=t.is_hot;
... ... @@ -152,9 +150,6 @@ Page({
152 150 }
153 151 })
154 152 }
155   -
156   -
157   -
158 153 this.requestGoodsList(url);
159 154 getApp().getConfig2(function(rs){
160 155 //计算等级价相关
... ... @@ -186,7 +181,23 @@ Page({
186 181 })
187 182 },500)
188 183 }
189   - });
  184 + });
  185 +
  186 + //调用接口判断商家plus有没有过期
  187 + getApp().request.promiseGet("/store/storemoduleendtime/page?store_id=" + oo.stoid + "&type=3", {}).then(res => {
  188 + if (res.data.code == 0) {
  189 + var arr = res.data.data.pageData;
  190 + if (arr.length > 0) {
  191 + var item = arr[0];
  192 + if (item.is_sy == 0) {
  193 + var now = Date.parse(new Date()); now = now / 1000;
  194 + if (item.end_time < now) {
  195 + th.setData({ is_no_plus: 0 })
  196 + }
  197 + }
  198 + }
  199 + }
  200 + })
190 201 },
191 202  
192 203 //设置优惠券的
... ...
pages/goods/goodsList/goodsList.wxml
  View file @54967f4
... ... @@ -120,7 +120,7 @@
120 120 </block>
121 121 </block>
122 122 <block wx:else>
123   - <view wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
  123 + <view wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}">
124 124 <view class="flex ai-center">
125 125 <view class="price rmb">{{item.shop_price}}</view>
126 126 <view class="word-line xc-ash mk_price rmb">{{item.market_price}}</view>
... ... @@ -203,7 +203,7 @@
203 203 </block>
204 204 <block wx:else>
205 205 <!-- 商品价格,先判断下是后又等级价-->
206   - <block wx:if="{{g_filter.is_has_rank(rank_switch,item) && is_no_plus}}">
  206 + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
207 207 <!-- 当会员是等级卡的时候 -->
208 208 <block wx:if="{{card_field}}">
209 209 <!-- 等级价>0 -->
... ... @@ -235,7 +235,7 @@
235 235 </block>
236 236 </block>
237 237 <block wx:else>
238   - <view wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
  238 + <view wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}">
239 239 <view class="flex ai-center">
240 240 <view class="price rmb">{{item.shop_price}}</view>
241 241 <view class="word-line xc-ash mk_price rmb">{{item.market_price}}</view>
... ...
pages/goods/search/search.wxml
  View file @54967f4
... ... @@ -97,7 +97,7 @@
97 97 </block>
98 98 <block wx:else>
99 99 <!-- 商品价格,先判断下是后又等级价-->
100   - <block wx:if="{{g_filter.is_has_rank(rank_switch,item) && is_no_plus}}">
  100 + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
101 101 <!-- 当会员是等级卡的时候 -->
102 102 <block wx:if="{{card_field}}">
103 103 <!-- 等级价>0 -->
... ... @@ -124,7 +124,7 @@
124 124 </block>
125 125 </block>
126 126 <block wx:else>
127   - <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
  127 + <block wx:if="{{g_filter.get_card_price(item,card_list,0) && is_no_plus}}">
128 128 <view class="flex ai-center">
129 129 <view class="price">￥{{item.shop_price}}</view>
130 130 <view class="word-line xc-ash mk_price">￥{{item.market_price}}</view>
... ... @@ -161,11 +161,9 @@
161 161 </block>
162 162 </view>
163 163 </navigator>
164   -
165 164 <!-- 有商品列表的时候，要有分享攻击 -->
166 165 <share_box id="share"></share_box>
167 166 </view>
168   -
169 167 <!-- 无数据提示 -->
170 168 <view class="no-data" wx:if="{{!requestData||requestData.length==0}}">
171 169 <image class="cart-image" src="{{url}}/miniapp/images/cart-null.png"></image>
... ... @@ -174,13 +172,7 @@
174 172 </view>
175 173  
176 174 </block>
177   -
178   -
179   -
180 175 </view>
181   -
182   -
183   -
184 176 <view hidden="{{!openFilterModal}}">
185 177 <view bindtap="closeFilterModal" class="cover-layer"></view>
186 178 <view class="filter-modal">
... ... @@ -215,39 +207,4 @@
215 207 </view>
216 208 </view>
217 209 </view>
218   -</view>
219   -
220   -
221   -
222   -<!-- <view wx:if="{{openSearchModal}}">
223   - <view class="search-modal">
224   - <view class="search-bar">
225   - <form bindsubmit="submitSearch">
226   - <input autoFocus class="search-input" name="word" placeholder="搜索商品" bindconfirm="submitSearch" bindinput="getInput"></input>
227   - <button class="search-btn" formType="submit">
228   - <image class="wh100 search-img" src="{{url}}/miniapp/images/sea.png"></image>
229   - </button>
230   - </form>
231   - </view>
232   - <view class="search-hot">
233   - <view class="hot-title">热门搜索</view>
234   - <block wx:if="{{hotWords.length>0}}">
235   - <view class="hot-row" wx:for="{{hotWords}}" wx:key="{{index}}">
236   - <view bindtap="searchHotWord" class="hot-item" data-word="{{item}}" wx:for="{{item}}" wx:key="{{index}}">{{item}}</view>
237   - </view>
238   - </block>
239   - </view>
240   - <view class="search-hot">
241   - <view class="hot-title flex jc_sb ai_c">
242   - <text>历史搜索</text>
243   - <text class="iconfont icon-shanchu xc-ash" bindtap="clearSearchRecord" wx:if="{{searchRecord.length != 0}}"></text>
244   - </view>
245   - <block wx:if="{{searchRecord.length>0}}">
246   - <view class="hot-row flex flex-wrap" wx:key="{{index}}">
247   - <view class="hot-item history ellipsis-1" bindtap="searchHotWord" data-word="{{item}}" wx:for="{{searchRecord}}" wx:key="{{index}}">{{item}}</view>
248   - </view>
249   - </block>
250   - <view wx:else class="fs24">暂无历史搜索记录</view>
251   - </view>
252   - </view>
253   -</view> -->
254 210 \ No newline at end of file
  211 +</view>
255 212 \ No newline at end of file
... ...
pages/user/index/index.js
  View file @54967f4
... ... @@ -74,32 +74,6 @@ Page({
74 74 }
75 75 })
76 76 app.getUserFir();
77   -
78   -
79   -
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   -
96   -
97   -
98   - })
99   - }
100   - }
101   - })
102   - --*/
103 77 this.init_user_tool()
104 78  
105 79 },
... ...
pages/user/index/index.wxml
  View file @54967f4
... ... @@ -10,9 +10,10 @@
10 10 <image class="xc-user-img circle" bindtap="go_info" src="{{userInfo.head_pic?userInfo.head_pic:defaultAvatar}}"></image>
11 11 <view class="xc-uesr-name">
12 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>
  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>
16 17 </view>
17 18  
18 19 <view class="flex fs24 xc-grow-ups" style="margin-left:8rpx;margin-top:6rpx" wx:if="{{is_init && gradeId}}" bindtap='jump'>
... ... @@ -69,29 +70,31 @@
69 70 </image>
70 71  
71 72 </view>
72   - <view class="xc-add-member-frame flex-level rel addplus" wx:if="{{is_dengji==2 && show_buy_plus && is_no_plus}}">
  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 }}">
73 75 <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>
  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>
78 80 <view class="xc-opening-button t-c" data-url="/pages/user/plus/plus" bindtap="goto">
79 81 <view class="xc-opening fs28">立即开通</view>
80 82 </view>
81 83 </view>
82 84 </view>
83 85  
84   - <view class="xc-add-member-frame flex-level rel addplus" wx:if="{{is_dengji==3 && show_buy_plus}}">
  86 + <view class="xc-add-member-frame flex-level rel addplus" wx:if="{{is_dengji==3 && show_buy_plus}}">
85 87 <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>
  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>
90 92 <view class="xc-opening-button t-c" data-url="/pages/user/cardinfo/cardinfo" bindtap="goto">
91 93 <view class="xc-opening fs28">立即续费</view>
92 94 </view>
93 95 </view>
94   - </view>
  96 + </view>
  97 + </block>
95 98  
96 99 </view>
97 100 <view class="xc-after-sale rel">
... ... @@ -102,8 +105,8 @@
102 105 <image class="xc-title-img" src="{{iurl}}/miniapp/images/hdindan.png" style="width: 50rpx; height: 55rpx;margin-right: 5rpx"></image>
103 106 <view class="three-level-word">我的订单</view>
104 107 </view>
105   - <!-- 物流信息提醒 -->
106   - <view class="fs26 c-5 pdl60" wx:if="{{countDadaOrder && countDadaOrder != 0}}" bindtap="go_order" data-url="/pages/user/order_list/order_list?index=1"><text class="iconfont icon-dingwei"></text>您有<text class="c-red">{{countDadaOrder}}</text>个同城配送订单</view>
  108 + <!-- 物流信息提醒 -->
  109 + <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 110 </view>
108 111 <view class="three-level-word xc-more-frame flex-vertical" bindtap="go_order" data-url="/pages/user/order_list/order_list">
109 112 <view class="three-level-word xc-more">更多</view>
... ... @@ -152,7 +155,7 @@
152 155 <view class="xc-title-frame flex-space-between">
153 156 <view class="flex-vertical xc-title-content">
154 157 <image class="xc-title-img" src="{{iurl}}/miniapp/images/medal.png"></image>
155   - <view class="three-level-word">我的权益</view>
  158 + <view class="three-level-word">我的权益</view>
156 159 </view>
157 160 </view>
158 161 <view wx:if="{{is_grad_get}}" class="three-level-word xc-more-frame flex-vertical">
... ... @@ -168,32 +171,32 @@
168 171 <block wx:if="{{qy_list && gradeId}}">
169 172 <view class="xc-specific-more-frame flex-vertical" wx:if="{{qy_list}}">
170 173  
171   - <view bindtap="click_pre">
172   - <view class="bg_left xc-left bcolor"></view>
173   - </view>
  174 + <view bindtap="click_pre">
  175 + <view class="bg_left xc-left bcolor"></view>
  176 + </view>
174 177  
175   - <swiper current="{{sw_index}}" style='width:82.7%; height:108rpx' bindchange='onSli' indicator-dots="{{false}}" autoplay="{{false}}">
  178 + <swiper current="{{sw_index}}" style='width:82.7%; height:108rpx' bindchange='onSli' indicator-dots="{{false}}" autoplay="{{false}}">
176 179  
177   - <swiper-item wx:for="{{qy_list}}" wx:for-item="aitem" wx:for-index="pidx">
178   - <view class="flex xc-middle">
  180 + <swiper-item wx:for="{{qy_list}}" wx:for-item="aitem" wx:for-index="pidx">
  181 + <view class="flex xc-middle">
179 182  
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>
  183 + <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">
  184 + <!-- <text>qy_list.privilegeICOUrl</text> -->
  185 + <image class="xc-center-img {{item.ishas==1?'':'img_gray'}}" src="{{item.PrivilegeICOUrl}}"></image>
  186 + <view class="four-level-word">{{item.PrivilegeName}}</view>
  187 + </view>
184 188 </view>
185   - </view>
186   - </swiper-item>
  189 + </swiper-item>
187 190  
188   - </swiper>
  191 + </swiper>
189 192  
190   - <view bindtap="click_next">
191   - <view class="bg_right xc-right bcolor mt"></view>
  193 + <view bindtap="click_next">
  194 + <view class="bg_right xc-right bcolor mt"></view>
  195 + </view>
192 196 </view>
193   - </view>
194 197 </block>
195 198 <view wx:else style="text-align: center">
196   - 未找到数据
  199 + 未找到数据
197 200 </view>
198 201 </block>
199 202  
... ... @@ -202,87 +205,87 @@
202 205  
203 206 </view>
204 207 <!-- 生日营销 is_banner-->
205   - <block wx:if="{{is_banner}}">
206   - <view class="t-c banner-frame"bindtap="clike_banne">
  208 + <block wx:if="{{is_banner}}">
  209 + <view class="t-c banner-frame" bindtap="clike_banne">
207 210 <image class="banner-img" src="{{actImg==''?iurl+'/miniapp/images/user/banner-img.jpg':iurl+actImg}}">
208 211 </image>
209   - </view>
210   - </block>
  212 + </view>
  213 + </block>
211 214  
212 215 <!-- 工具与服务 -->
213   - <view class="xc-tool-service" >
  216 + <view class="xc-tool-service">
214 217 <view class="xc-tool-service-title flex-vertical">
215   - <image class="xc-tool-service-img" src="{{iurl}}/miniapp/images/gj.png"></image>
  218 + <image class="xc-tool-service-img" src="{{iurl}}/miniapp/images/gj.png"></image>
216 219 <view class="three-level-word xc-tool-service-word">工具与服务</view>
217 220 </view>
218 221 <view class="xc-project-frame">
219 222 <!-- 跳转页面 -->
220 223 <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">
253   - <image class="xc-center-img" src="{{iurl+item.icoimg}}"></image>
254   - <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}}">
279   - <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
280   - <view class="four-level-word">收入卡包</view>
281   - </view>
282   - </block>
283   - </block>
284   - </block>
285   - </block>
  224 + <!-- 循环使用自定义菜单，显示和掩藏 -->
  225 + <block wx:for="{{user_tool}}">
  226 + <!-- 判断系统配置中有没有把菜单关闭 -->
  227 + <block wx:if="{{!util.is_close(item.name,c_list)}}">
  228 + <!-- 有链接地址的时候 -->
  229 + <block wx:if="{{item.weappurl}}">
  230 + <block wx:if="{{item.name=='PLUS会员'}}">
  231 + <view class="item t-c" data-url="{{item.weappurl}}" bindtap="goto" wx:if="{{is_dengji==1}}">
  232 + <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
  233 + <view class="fs26">PLUS会员</view>
  234 + </view>
  235 + </block>
  236 + <block wx:elif="{{item.name=='助力活动'}}">
  237 + <view class="item t-c" data-url="/pages/user/assistance/assistance" bindtap="goto_nav" wx:if="{{is_assistance==1}}">
  238 + <image class="xc-center-img" src="{{iurl}}/miniapp/images/friendhelp/icon-zl.png"></image>
  239 + <view class="four-level-word">助力活动</view>
  240 + </view>
  241 + </block>
  242 + <block wx:elif="{{item.name=='我的权益'}}">
  243 + <view class="item t-c" bindtap="go_qy" wx:if="{{qy_list!=null && is_init && gradeId}}">
  244 + <image class="xc-center-img" src="{{iurl+item.icoimg}}"></image>
  245 + <view class="fs26">我的权益</view>
  246 + </view>
  247 + </block>
  248 + <block wx:elif="{{item.name=='套盒商品'}}">
  249 + <view class="item t-c" data-url="{{item.weappurl}}" bindtap="goto" wx:if="{{enableMeiye}}">
  250 + <image class="xc-center-img" src="{{iurl+item.icoimg}}"></image>
  251 + <view class="fs26">套盒商品</view>
  252 + </view>
  253 + </block>
  254 + <block wx:else>
  255 + <view class="item t-c" data-url="{{item.weappurl}}" bindtap="goto_nav">
  256 + <image class="xc-center-img" src="{{iurl+item.icoimg}}"></image>
  257 + <view class="fs26">{{item.name}}</view>
  258 + </view>
  259 + </block>
  260 + </block>
  261 + <!-- 没有链接地址的时候 -->
  262 + <block wx:else>
  263 + <block wx:if="{{item.name=='联系客服'}}">
  264 + <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}}">
  265 + <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
  266 + <view class="fs26">联系客服</view>
  267 + </button>
  268 +
  269 + <view class="item t-c" bindtap="con_weixin" wx:elif="{{sys_switch.weapp_customertype==2}}">
  270 + <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
  271 + <view class="fs26">联系客服</view>
  272 + </view>
  273 +
  274 + <view class="item t-c" bindtap="contactService" wx:else>
  275 + <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
  276 + <view class="fs26">联系客服</view>
  277 + </view>
  278 +
  279 + </block>
  280 + <block wx:elif="{{item.name=='收入卡包'}}">
  281 + <view class="item t-c" bindtap="addcard" wx:if="{{add_card_data}}">
  282 + <image class="xc-center-img " src="{{iurl+item.icoimg}}"></image>
  283 + <view class="four-level-word">收入卡包</view>
  284 + </view>
  285 + </block>
  286 + </block>
  287 + </block>
  288 + </block>
286 289 </view>
287 290  
288 291 </view>
... ... @@ -306,15 +309,17 @@
306 309 </view>
307 310 </view>
308 311 </view>
309   -
310   - <!-- 显示商品 -->
311   - <!-- 好物推荐 -->
312   - <goods_recommend id="goods_recommend"></goods_recommend>
313   -
314   - <!-- 技术支持 -->
315   - <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>
317   - </view>
  312 +
  313 + <!-- 显示商品 -->
  314 + <!-- 好物推荐 -->
  315 + <goods_recommend id="goods_recommend"></goods_recommend>
  316 +
  317 + <!-- 技术支持 -->
  318 + <view class="logo-container t-c">
  319 + <view class="flex ai_c fs24 jc-center pdv30 white">
  320 + <image src="{{iurl + 'miniapp/images/luckDraw/logo.png?v=3'}}" class="logo" lazy-load></image>提供技术支持
  321 + </view>
  322 + </view>
318 323 </view>
319 324  
320 325 <!--弹出层内容，其中的“我知道”中绑定让弹出层消失的函数：bindtap="hide"-->
... ... @@ -327,7 +332,7 @@
327 332 <view class="ctent_txt">
328 333 <view class='txt1'>{{userInfo.nickname}}
329 334 <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>
  335 + <image wx:else class="arrow-right fu" style="width: 35rpx; height:35rpx;top:5rpx" src="{{iurl}}/miniapp/images/user/man.png"></image>
331 336 </view>
332 337 <view wx:if="{{userInfo.address}}" class='txt2'>{{userInfo.address}}</view>
333 338 </view>
... ... @@ -341,4 +346,4 @@
341 346 </view>
342 347 </view>
343 348  
344 349 -<pop_txt id="pop_txt"></pop_txt>
  350 +<pop_txt id="pop_txt"></pop_txt>
345 351 \ No newline at end of file
... ...
pages/user/userinfo/userinfo.wxml
  View file @54967f4
... ... @@ -27,7 +27,7 @@
27 27 </view>
28 28 </navigator>
29 29 </block>
30   - <block wx:if="{{pulscardname && rank_switch > 0 && is_no_plus}}">
  30 + <block wx:if="{{pulscardname && rank_switch > 0 }}">
31 31 <navigator url="/pages/user/plus/plus">
32 32 <view class="flex-center plusMax">
33 33 <image class="fuls" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
... ...