wxd / MShopWeApp

Commit c81cad65d1fc036c44572845523993bdb2d7a502

Authored by 后端研发-苏明海
2 parents bd1b6595 54bc8174

Merge branch 'dev' into 'test' 

Dev

See merge request !1089
Inline Side-by-side
Showing 59 changed files with 710 additions and 403 deletions
components/diy_advertising/diy_advertising.js
  View file @c81cad6
... ... @@ -16,7 +16,7 @@ Component({
16 16 interval:3000,
17 17 duration:1000,
18 18 someData: {},
19   - max_sw_height:260,
  19 + max_sw_height:100,
20 20 },
21 21  
22 22 ready: function () {
... ...
components/diy_goodsGroup/diy_goodsGroup.wxml
  View file @c81cad6
... ... @@ -67,7 +67,7 @@
67 67 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
68 68 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
69 69 </view>
70   - <view class='del'>￥{{item.market_price}}</view>
  70 +<!-- <view class='del'>￥{{item.market_price}}</view>-->
71 71 </block>
72 72 <block wx:else>
73 73  
... ... @@ -161,7 +161,7 @@
161 161  
162 162 <block wx:else>
163 163 <view class='wz_red'>￥{{item.shop_price}}</view>
164   - <view class='del'>￥{{item.market_price}}</view>
  164 +<!-- <view class='del'>￥{{item.market_price}}</view>-->
165 165 </block>
166 166  
167 167 </block>
... ... @@ -237,7 +237,7 @@
237 237 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
238 238 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
239 239 </view>
240   - <view class='del'>￥{{item.market_price}}</view>
  240 +<!-- <view class='del'>￥{{item.market_price}}</view>-->
241 241 </block>
242 242 <block wx:else>
243 243 <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
... ... @@ -329,7 +329,7 @@
329 329 </block>
330 330 <block wx:else>
331 331 <view class='wz_red'>￥{{item.shop_price}}</view>
332   - <view class='del'>￥{{item.market_price}}</view>
  332 +<!-- <view class='del'>￥{{item.market_price}}</view>-->
333 333 </block>
334 334 </block>
335 335 </view>
... ... @@ -406,7 +406,7 @@
406 406 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
407 407 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
408 408 </view>
409   - <view class='del'>￥{{item.market_price}}</view>
  409 +<!-- <view class='del'>￥{{item.market_price}}</view>-->
410 410 </block>
411 411 <block wx:else>
412 412 <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
... ... @@ -498,7 +498,7 @@
498 498 </block>
499 499 <block wx:else>
500 500 <view class='wz_red'>￥{{item.shop_price}}</view>
501   - <view class='del'>￥{{item.market_price}}</view>
  501 +<!-- <view class='del'>￥{{item.market_price}}</view>-->
502 502 </block>
503 503 </block>
504 504 </view>
... ... @@ -577,7 +577,7 @@
577 577 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
578 578 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
579 579 </view>
580   - <view class='del'>￥{{item.market_price}}</view>
  580 +<!-- <view class='del'>￥{{item.market_price}}</view>-->
581 581 </block>
582 582 <!-- 不是活动的情况 -->
583 583 <block wx:else>
... ... @@ -671,7 +671,7 @@
671 671  
672 672 <block wx:else>
673 673 <view class='wz_red'>￥{{item.shop_price}}</view>
674   - <view class='del'>￥{{item.market_price}}</view>
  674 +<!-- <view class='del'>￥{{item.market_price}}</view>-->
675 675 </block>
676 676  
677 677 </block>
... ... @@ -717,7 +717,7 @@
717 717 <view class="button-wrapper" wx:if="{{object.goodscount * page <total }}" style="border: none">
718 718 <button type="default" size="default" loading="{{loading}}" disabled="{{disabled}}" bindtap="setLoading" style="background-color: rgba(0,0,0,0);border:none">{{loadText}}</button>
719 719 </view>
720   - <view class="fs28" wx:if="{{object.goodscount * page >=total }}" style="color:{{object.nomore_color}};text-align: center; padding: 20rpx 0">-- 没有更多 -- </view>
  720 +<!-- <view class="fs28" wx:if="{{object.goodscount * page >=total }}" style="color:{{object.nomore_color}};text-align: center; padding: 20rpx 0">&#45;&#45; 没有更多 &#45;&#45; </view>-->
721 721  
722 722 </block>
723 723 </block>
... ... @@ -772,7 +772,7 @@
772 772 <text wx:if="{{aitem.prom_integral && aitem.prom_price}}">+</text>
773 773 <text wx:if="{{aitem.prom_price}}">￥{{aitem.prom_price}}</text>
774 774 </view>
775   - <view class='del'>￥{{aitem.market_price}}</view>
  775 +<!-- <view class='del'>￥{{aitem.market_price}}</view>-->
776 776 </block>
777 777 <block wx:else>
778 778 <block wx:if="{{g_filter.is_has_rank(rank_switch,aitem)}}">
... ... @@ -864,7 +864,7 @@
864 864 </block>
865 865 <block wx:else>
866 866 <view class='wz_red'>￥{{aitem.shop_price}}</view>
867   - <view class='del'>￥{{aitem.market_price}}</view>
  867 +<!-- <view class='del'>￥{{aitem.market_price}}</view>-->
868 868 </block>
869 869 </block>
870 870 </view>
... ...
components/diy_groupbuy/diy_groupbuy.wxml
  View file @c81cad6
... ... @@ -39,7 +39,7 @@
39 39 <view class='sp_wz'>
40 40 <view class='sp_wzi'>{{aitem.goods_name}}</view>
41 41 <view class='sp_jg'>￥{{aitem.price}}</view>
42   - <view class='sp_jgx'>￥{{aitem.market_price}}</view>
  42 +<!-- <view class='sp_jgx'>￥{{aitem.shop_price}}</view>-->
43 43 </view>
44 44 <!-- <view class="progress_box">
45 45 <text class="on_sale_list">已买:{{aitem.buy_num + aitem.virtual_num}}件</text>
... ... @@ -94,7 +94,7 @@
94 94 </view>
95 95 <view>
96 96 <view class='sp_jg'>￥{{aitem.price}}</view>
97   - <view class='sp_jgx'>￥{{aitem.market_price}}</view>
  97 +<!-- <view class='sp_jgx'>￥{{aitem.shop_price}}</view>-->
98 98 </view>
99 99 </view>
100 100 </view>
... ...
components/diy_luckyGo/diy_luckyGo.wxml
  View file @c81cad6
... ... @@ -29,7 +29,7 @@
29 29 <view>
30 30 <view class="flex ai-center">
31 31 <text class="rmb c-red">{{filters.price(aitem.group_price)}}</text>
32   - <view class="del fs22 c-a pdl10"><text class="rmb">{{aitem.market_price}}</text></view>
  32 +<!-- <view class="del fs22 c-a pdl10"><text class="rmb">{{aitem.shop_price}}</text></view>-->
33 33 </view>
34 34 </view>
35 35  
... ... @@ -63,7 +63,7 @@
63 63 <view>
64 64 <view class="flex ai-center">
65 65 <text class="rmb c-red">{{filters.price(aitem.group_price)}}</text>
66   - <view class="del fs22 c-a pdl10">零售价:<text class="rmb">{{aitem.market_price}}</text></view>
  66 +<!-- <view class="del fs22 c-a pdl10"><text class="rmb">{{aitem.shop_price}}</text></view>-->
67 67 </view>
68 68 <view class="flex jc_sb">
69 69 <progress class="pdr20 f1 progress" percent="{{filters.percent(aitem.num, aitem.group_num)}}" activeColor="#FF6768"
... ...
components/diy_pingd_buy/diy_pingd_buy.wxml
  View file @c81cad6
... ... @@ -91,7 +91,7 @@
91 91 </view>
92 92 <view class="money">
93 93 <view class='sp_jg_p'>￥{{aitem.price}}</view>
94   - <view class='sp_jgx_p'>￥{{aitem.market_price}}</view>
  94 +<!-- <view class='sp_jgx_p'>￥{{aitem.shop_price}}</view>-->
95 95 </view>
96 96 <view class="o1_sj_p" wx:if="{{aitem.end_time>newTime}}">
97 97 <image class="time_img" src="{{iurl}}/miniapp/images/time.png"></image>
... ...
components/diy_pregoods/diy_pregoods.wxml
  View file @c81cad6
... ... @@ -57,7 +57,7 @@
57 57 <view class='sp_wz'>
58 58 <view class='sp_wzi'>{{aitem.act_name}}</view>
59 59 <view class='sp_jg'>￥{{aitem.presell_price}}</view>
60   - <view class='sp_jgx'>￥{{aitem.market_price}}</view>
  60 +<!-- <view class='sp_jgx'>￥{{aitem.shop_price}}</view>-->
61 61 </view>
62 62  
63 63 </view>
... ...
components/diy_seckill/diy_seckill.wxml
  View file @c81cad6
... ... @@ -82,7 +82,7 @@
82 82 <view class='sp_wz'>
83 83 <view class='sp_wzi ellipsis-2'>{{aitem.goods_name}}</view>
84 84 <view class='sp_jg'>￥{{aitem.price}}</view>
85   - <view class='sp_jgx'>￥{{aitem.market_price}}</view>
  85 +<!-- <view class='sp_jgx'>￥{{aitem.shop_price}}</view>-->
86 86 </view>
87 87  
88 88 </view>
... ... @@ -116,7 +116,7 @@
116 116 </view>
117 117 <view class="money">
118 118 <view class='sp_jg'>￥{{aitem.price}}</view>
119   - <view class='sp_jgx'>￥{{aitem.market_price}}</view>
  119 +<!-- <view class='sp_jgx'>￥{{aitem.market_price}}</view>-->
120 120 </view>
121 121 <block wx:if="{{aitem.status == 0}}">
122 122 <view class="rob">
... ...
components/goods_list/goods_list.wxml
  View file @c81cad6
... ... @@ -26,13 +26,13 @@
26 26 <view class="fs35">{{item.prom_price}}</view>
27 27 </view>
28 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>
  29 +<!-- <view class="flex">-->
  30 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  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 37  
38 38 </block>
... ... @@ -54,13 +54,13 @@
54 54 </view>
55 55 </view>
56 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>
  57 +<!-- <view class="flex">-->
  58 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  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 64 </block>
65 65 <blocK wx:else>
66 66 <view class="money flex">
... ... @@ -70,13 +70,13 @@
70 70 <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
71 71 </view>
72 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>
  73 +<!-- <view class="flex">-->
  74 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  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 80 </blocK>
81 81 </block>
82 82 <block wx:else>
... ... @@ -89,10 +89,10 @@
89 89 <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
90 90 </view>
91 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>
  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 96 </view>
97 97 <view class="flexr">
98 98 <!-- 等级价 -->
... ... @@ -114,13 +114,13 @@
114 114 <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
115 115 </view>
116 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>
  117 +<!-- <view class="flex">-->
  118 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  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 124 </block>
125 125 </block>
126 126 </block>
... ... @@ -133,13 +133,13 @@
133 133 <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
134 134 </view>
135 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>
  136 +<!-- <view class="flex" style="">-->
  137 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  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 143 </view>
144 144 </block>
145 145 </view>
... ...
packageA/pages/activity_share/activity_share.js
  View file @c81cad6
... ... @@ -66,8 +66,10 @@ Page({
66 66 //设置分享会员和导购id和归属门店ID
67 67 this.setData({first_leader:first_leader,StaffId:StaffId,StorageId:StorageId});
68 68 }
69   -
70   - this.requestGoodsList();
  69 +
  70 + console.log("11111111");
  71 + this.requestGoodsList();
  72 + console.log("22222");
71 73 //-- 自定义海报 --
72 74 getApp().request.promiseGet("/api/weshop/goods/poster/page",{
73 75 data:{store_id:os.stoid, type:1, is_use:1 }
... ... @@ -395,9 +397,11 @@ Page({
395 397 },
396 398  
397 399 get_colloction: async function(){
  400 +
  401 +
398 402 var list=null;
399 403 //-- 获取搭配购的从商品的信息 --
400   - await app.request.promiseGet("/api/weshop/goods/getGoodsPromList/"+oo.stoid+"/"+this.data.hui_active.main_goods_id+"/2"+"/"+getApp().globalData.user_id,{}).then(res=>{
  404 + await app.request.promiseGet("/api/weshop/goods/getGoodsPromList/"+oo.stoid+"/"+this.data.hui_active.main_goods_id+"/2"+"/"+(getApp().globalData.user_id || 0) ,{}).then(res=>{
401 405 if(res.data.code==0){
402 406 list=res.data.data.collocationList;
403 407 }
... ... @@ -559,8 +563,14 @@ Page({
559 563 var str=this.data.key_str.trim();
560 564 req_data.key_str=str;
561 565 }
  566 +
562 567 //-- ---调用接口----
563   - app.request.promiseGet(url,{data:req_data,isShowLoading:1}).then(res=>{
  568 + app.request.promiseGet(url,{data:req_data,isShowLoading:1}).then(res=>{
  569 +
  570 + console.log("2222");
  571 + console.log(url);
  572 + console.log(res);
  573 +
564 574 th.data.is_load=0;
565 575 if(res.data.code==0 && res.data.data.pageData && res.data.data.pageData.length>0){
566 576 th.data.currentPage++;
... ...
packageA/pages/cart2_ser/cart2_ser.js
  View file @c81cad6
... ... @@ -241,7 +241,12 @@ Page({
241 241 var th = this,
242 242 a = getApp().request;
243 243 var gg = th.data.postdata;
244   - var url = "/api/weshop/serviceCard/get/" + oo.stoid + "/" + gg.id
  244 + var url = "/api/weshop/serviceCard/get/" + oo.stoid + "/" + gg.id;
  245 +
  246 +
  247 + console.log('get_buy_goods', gg);
  248 +
  249 +
245 250 //调用商品
246 251 a.get(url, {
247 252 success: function(t) {
... ...
packageA/pages/distribution/goods/goods.wxml
  View file @c81cad6
... ... @@ -93,13 +93,13 @@
93 93 <view class="fs30 money">{{item.prom_price}}</view>
94 94 </view>
95 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>
  96 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  97 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  98 +<!-- <view class="price flex xc-ash line_th">-->
  99 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  100 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  101 +<!-- </view>-->
  102 +<!-- </view>-->
103 103 </block>
104 104 <block wx:else>
105 105 <!-- 商品价格,先判断下是后⼜等级价-->
... ... @@ -119,13 +119,13 @@
119 119 </view>
120 120 </view>
121 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>
  122 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  123 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  124 +<!-- <view class="price flex xc-ash line_th">-->
  125 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  126 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  127 +<!-- </view>-->
  128 +<!-- </view>-->
129 129 </block>
130 130 <blocK wx:else>
131 131 <view class="flex">
... ... @@ -135,13 +135,13 @@
135 135 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
136 136 </view>
137 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>
  138 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  139 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  140 +<!-- <view class="price flex xc-ash line_th">-->
  141 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  142 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  143 +<!-- </view>-->
  144 +<!-- </view>-->
145 145 </blocK>
146 146 </block>
147 147 <block wx:else>
... ... @@ -154,10 +154,10 @@
154 154 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
155 155 </view>
156 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>
  157 +<!-- <view class="price flex xc-ash line_th">-->
  158 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  159 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  160 +<!-- </view>-->
161 161 </view>
162 162 <view class="flexr">
163 163 <!-- 等级价 -->
... ... @@ -180,13 +180,13 @@
180 180 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
181 181 </view>
182 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>
  183 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  184 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  185 +<!-- <view class="price flex xc-ash line_th">-->
  186 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  187 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  188 +<!-- </view>-->
  189 +<!-- </view>-->
190 190 </block>
191 191 </block>
192 192 </block>
... ... @@ -199,13 +199,13 @@
199 199 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
200 200 </view>
201 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>
  202 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  203 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  204 +<!-- <view class="price flex xc-ash line_th">-->
  205 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  206 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  207 +<!-- </view>-->
  208 +<!-- </view>-->
209 209 </block>
210 210 </block>
211 211 <!-- <view class="money fs32 c-red">{{item.market_price}}</view> -->
... ... @@ -235,13 +235,13 @@
235 235 <view class="fs30 money">{{item.prom_price}}</view>
236 236 </view>
237 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>
  238 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  239 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  240 +<!-- <view class="price flex xc-ash line_th">-->
  241 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  242 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  243 +<!-- </view>-->
  244 +<!-- </view>-->
245 245 </block>
246 246 <block wx:else>
247 247 <!-- 商品价格,先判断下是后⼜等级价-->
... ... @@ -261,13 +261,13 @@
261 261 </view>
262 262 </view>
263 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>
  264 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  265 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  266 +<!-- <view class="price flex xc-ash line_th">-->
  267 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  268 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  269 +<!-- </view>-->
  270 +<!-- </view>-->
271 271 </block>
272 272 <blocK wx:else>
273 273 <view class="flex">
... ... @@ -277,13 +277,13 @@
277 277 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
278 278 </view>
279 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>
  280 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  281 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  282 +<!-- <view class="price flex xc-ash line_th">-->
  283 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  284 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  285 +<!-- </view>-->
  286 +<!-- </view>-->
287 287 </blocK>
288 288 </block>
289 289 <block wx:else>
... ... @@ -296,10 +296,10 @@
296 296 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
297 297 </view>
298 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>
  299 +<!-- <view class="price flex xc-ash line_th">-->
  300 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  301 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  302 +<!-- </view>-->
303 303 </view>
304 304 <view class="flexr">
305 305 <!-- 等级价 -->
... ... @@ -322,13 +322,13 @@
322 322 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
323 323 </view>
324 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>
  325 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  326 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  327 +<!-- <view class="price flex xc-ash line_th">-->
  328 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  329 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  330 +<!-- </view>-->
  331 +<!-- </view>-->
332 332 </block>
333 333 </block>
334 334 </block>
... ... @@ -341,13 +341,13 @@
341 341 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
342 342 </view>
343 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>
  344 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  345 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  346 +<!-- <view class="price flex xc-ash line_th">-->
  347 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  348 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  349 +<!-- </view>-->
  350 +<!-- </view>-->
351 351 </block>
352 352 </block>
353 353 <!-- <view class="money c-red fs32">{{item.market_price}}</view> -->
... ...
packageA/pages/distribution/shop/shop.wxml
  View file @c81cad6
... ... @@ -89,13 +89,13 @@
89 89 <view class="fs30 money">{{item.prom_price}}</view>
90 90 </view>
91 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>
  92 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  93 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  94 +<!-- <view class="price flex xc-ash line_th">-->
  95 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  96 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  97 +<!-- </view>-->
  98 +<!-- </view>-->
99 99 </block>
100 100 <block wx:else>
101 101 <!-- 商品价格,先判断下是后⼜等级价 -->
... ... @@ -115,13 +115,13 @@
115 115 </view>
116 116 </view>
117 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>
  118 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  119 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  120 +<!-- <view class="price flex xc-ash line_th">-->
  121 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  122 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  123 +<!-- </view>-->
  124 +<!-- </view>-->
125 125 </block>
126 126 <blocK wx:else>
127 127 <view class="flex">
... ... @@ -131,13 +131,13 @@
131 131 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
132 132 </view>
133 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>
  134 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  135 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  136 +<!-- <view class="price flex xc-ash line_th">-->
  137 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  138 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  139 +<!-- </view>-->
  140 +<!-- </view>-->
141 141 </blocK>
142 142 </block>
143 143 <block wx:else>
... ... @@ -150,10 +150,10 @@
150 150 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
151 151 </view>
152 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>
  153 +<!-- <view class="price flex xc-ash line_th">-->
  154 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  155 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  156 +<!-- </view>-->
157 157 </view>
158 158 <view class="flexr">
159 159 <!-- 等级价 -->
... ... @@ -175,13 +175,13 @@
175 175 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
176 176 </view>
177 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>
  178 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  179 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  180 +<!-- <view class="price flex xc-ash line_th">-->
  181 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  182 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  183 +<!-- </view>-->
  184 +<!-- </view>-->
185 185 </block>
186 186 </block>
187 187 </block>
... ... @@ -194,13 +194,13 @@
194 194 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
195 195 </view>
196 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>
  197 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  198 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  199 +<!-- <view class="price flex xc-ash line_th">-->
  200 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  201 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  202 +<!-- </view>-->
  203 +<!-- </view>-->
204 204 </block>
205 205 </block>
206 206 <!-- 分层金额 -->
... ... @@ -233,13 +233,13 @@
233 233 <view class="fs30 money">{{item.prom_price}}</view>
234 234 </view>
235 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>
  236 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  237 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  238 +<!-- <view class="price flex xc-ash line_th">-->
  239 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  240 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  241 +<!-- </view>-->
  242 +<!-- </view>-->
243 243 </block>
244 244 <block wx:else>
245 245 <!-- 商品价格,先判断下是后⼜等级价 -->
... ... @@ -259,13 +259,13 @@
259 259 </view>
260 260 </view>
261 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>
  262 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  263 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  264 +<!-- <view class="price flex xc-ash line_th">-->
  265 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  266 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  267 +<!-- </view>-->
  268 +<!-- </view>-->
269 269 </block>
270 270 <blocK wx:else>
271 271 <view class="flex">
... ... @@ -275,13 +275,13 @@
275 275 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
276 276 </view>
277 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>
  278 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  279 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  280 +<!-- <view class="price flex xc-ash line_th">-->
  281 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  282 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  283 +<!-- </view>-->
  284 +<!-- </view>-->
285 285 </blocK>
286 286 </block>
287 287 <block wx:else>
... ... @@ -294,10 +294,10 @@
294 294 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
295 295 </view>
296 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>
  297 +<!-- <view class="price flex xc-ash line_th">-->
  298 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  299 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  300 +<!-- </view>-->
301 301 </view>
302 302 <view class="flexr">
303 303 <!-- 等级价 -->
... ... @@ -321,13 +321,13 @@
321 321 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
322 322 </view>
323 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>
  324 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  325 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  326 +<!-- <view class="price flex xc-ash line_th">-->
  327 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  328 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  329 +<!-- </view>-->
  330 +<!-- </view>-->
331 331 </block>
332 332 </block>
333 333 </block>
... ... @@ -340,13 +340,13 @@
340 340 <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
341 341 </view>
342 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>
  343 +<!-- <view class="flex" style="line-height: 28rpx;">-->
  344 +<!-- &lt;!&ndash; 原价 &ndash;&gt;-->
  345 +<!-- <view class="price flex xc-ash line_th">-->
  346 +<!-- &lt;!&ndash; <view class="fs22">￥</view> &ndash;&gt;-->
  347 +<!-- <view class="fs22 money">{{item.market_price}}</view>-->
  348 +<!-- </view>-->
  349 +<!-- </view>-->
350 350 </block>
351 351 </block>
352 352 <!-- 分层金额 -->
... ...
packageA/pages/goodsInfo/goodsInfo.js
  View file @c81cad6
... ... @@ -217,6 +217,10 @@ Page({
217 217  
218 218 //------初始化加载----------
219 219 onLoad: function(t) {
  220 +
  221 +
  222 + console.log("11111111");
  223 +
220 224 self = this;
221 225  
222 226 this.setData({
... ... @@ -353,14 +357,24 @@ Page({
353 357  
354 358 //获取用户的默认门店
355 359 getApp().get_user_store(function(e) {
  360 + console.log('get_user_store');
  361 + console.log("999999999");
  362 +
  363 +
356 364 if(!e) {
357 365 th.data.fir_def_store={}; //赋值空对象
358 366 return false;
359 367 }
360 368  
  369 + console.log("000000");
  370 +
361 371 if(getApp().globalData.is_dj_pk) th.setData({has_def:1})
362 372  
363 373 var ee=JSON.parse(JSON.stringify(e));
  374 +
  375 +
  376 + console.log(e);
  377 +
364 378 //--定时器推迟一下--
365 379 setTimeout(function () {
366 380 if(!th.data.data){
... ... @@ -402,6 +416,10 @@ Page({
402 416 e.is_no_dis=ee.is_no_dis;
403 417 appd.pk_store=e;
404 418 that.data.fir_def_store=e;
  419 +
  420 + console.log('get_user_store--2');
  421 + console.log(e);
  422 +
405 423 that.setData({
406 424 def_pick_store: e,
407 425 sto_sele_name: e.pickup_name,
... ... @@ -421,6 +439,11 @@ Page({
421 439  
422 440 } else {
423 441 if (e) {
  442 +
  443 +
  444 + console.log('get_user_store3---');
  445 + console.log(e);
  446 +
424 447 e.distance = null;
425 448 that.data.fir_def_store=e;
426 449 that.setData({
... ... @@ -956,7 +979,7 @@ Page({
956 979 newd['prom_price'] = this.data.data.shop_price;
957 980 };
958 981  
959   - // console.log('newd++++++++', newd);
  982 + console.log('newd++++++++', newd);
960 983 th.buyNow(newd);
961 984 } else {
962 985  
... ... @@ -1607,7 +1630,8 @@ Page({
1607 1630 def_pick_store:e.data.data.pageData[0],
1608 1631 sto_sele_name: e.data.data.pageData[0].pickup_name,
1609 1632 sto_sele_id: e.data.data.pageData[0].pickup_id,
1610   - sto_sele_distr: e.data.data.pageData[0].distr_type
  1633 + sto_sele_distr: e.data.data.pageData[0].distr_type,
  1634 + sto_sele_keyid: e.data.data.pageData[0].keyid,
1611 1635 });
1612 1636 th.data.fir_def_store=e.data.data.pageData[0];
1613 1637 }
... ... @@ -1814,7 +1838,8 @@ Page({
1814 1838 def_pick_store:e.data.data.pageData[0],
1815 1839 sto_sele_name: e.data.data.pageData[0].pickup_name,
1816 1840 sto_sele_id: e.data.data.pageData[0].pickup_id,
1817   - sto_sele_distr: e.data.data.pageData[0].distr_type
  1841 + sto_sele_distr: e.data.data.pageData[0].distr_type,
  1842 + sto_sele_keyid:e.data.data.pageData[0].keyid,
1818 1843 })
1819 1844 }
1820 1845  
... ...
packageA/pages/jfbuy/jfbuy.wxml
  View file @c81cad6
... ... @@ -51,7 +51,7 @@
51 51 <text>{{item.integral}}积分 + ￥{{item.addmoney}}</text>
52 52 </view>
53 53 <view class="pdt14 fs22 gray flex jc_sb">
54   - <view>零售价：￥{{item.market_price}}</view>
  54 + <view>￥{{item.shop_price}}</view>
55 55 <view>销量：{{item.buy_num+item.virtual}}</view>
56 56 </view>
57 57 </view>
... ...
packageA/pages/myGift/myGift.js
  View file @c81cad6
... ... @@ -16,6 +16,7 @@ Page({
16 16 isLoading: false, // 检测是否已经发送请求,防止重复发送请求
17 17 noMore: false, // 检测是否有更多数据,true为没有更多数据,false为还有数据
18 18 pageNum: 1, // 当前页数
  19 + iurl: os.imghost, //图片前缀网址
19 20 },
20 21  
21 22 clickTab(e) {
... ... @@ -40,7 +41,8 @@ Page({
40 41 url = '/api/weshop/libao/libaoFormvip/page';
41 42 };
42 43  
43   - this.getData(true, url, data);
  44 + this.getData(true, url, data);
  45 +
44 46 },
45 47  
46 48 /**
... ... @@ -56,6 +58,23 @@ Page({
56 58 userInfo: data,
57 59 });
58 60 });
  61 +
  62 + getApp().request.promiseGet("/api/weshop/ad/page?pid=901&store_id=" + os.stoid, {
  63 + data: {
  64 + enabled: 1
  65 + }
  66 + }).then(res => {
  67 + if (res.data.code == 0 && res.data.data && res.data.data.pageData && res.data.data.pageData.length > 0) {
  68 + var a = res.data.data.pageData;
  69 + var tt = {
  70 + 'ad_code': os.imghost + a[0].ad_code,
  71 + 'media_link': '',
  72 + 'ad_weapplink': a[0].ad_weapplink,
  73 + 'bgcolor': a[0].bgcolor,
  74 + };
  75 + self.setData({ ad_data: tt });
  76 + }
  77 + })
59 78 },
60 79  
61 80 /**
... ...
packageA/pages/myGift/myGift.wxml
  View file @c81cad6
1 1 <wxs module="filter" src="../../../utils/filter.wxs"></wxs>
2 2 <view>
  3 +
  4 + <block wx:if="{{ad_data}}">
  5 + <view class="top_img">
  6 + <image mode="widthFix" src="{{ad_data.ad_code}}" lazy-load="true"
  7 + binderror="bind_bnerr2" data-errorimg="wareCard[{{index}}].lbUrl"></image>
  8 + </view>
  9 + </block>
  10 + <block wx:else>
  11 + <view class="top_img">
  12 + <!-- <image src="{{$GetInfo.imgHttp+'/miniapp/images/giftbag/gift00.jpg'}}"></image> -->
  13 + <image src="{{iurl+'/miniapp/images/giftbag/gift00.jpg?v=2019'}}" lazy-load="true"></image>
  14 + </view>
  15 + </block>
  16 +
  17 +
3 18 <view class="tab-title" bindtap="clickTab">
4 19 <view class="tab-title-item {{currentIndex == index ? 'active':''}}" wx:for="{{tabArr}}" data-index="{{index}}">{{item}}</view>
5 20 </view>
... ... @@ -31,7 +46,7 @@
31 46 </block>
32 47 </block>
33 48 </view>
34   - <view class="fs22 c-a4 line-through mgl10">零售价{{filter.toFix(item.oldprice,2)}}</view>
  49 +<!-- <view class="fs22 c-a4 line-through mgl10">零售价{{filter.toFix(item.oldprice,2)}}</view>-->
35 50 </view>
36 51 <view class="fs24 c-a4">已售{{item.salenum+item.virtualsales}}件</view>
37 52 </view>
... ...
packageA/pages/myGift/myGift.wxss
  View file @c81cad6
1 1 @charset "utf-8";
  2 +.top_img image {
  3 + width: 100%;
  4 +}
2 5  
3 6 .c-a4 {
4 7 color: #a4a4a4;
... ...
packageA/pages/myGiftDetails/myGiftDetails.wxml
  View file @c81cad6
... ... @@ -36,7 +36,7 @@
36 36 </block>
37 37  
38 38 </view>
39   - <view class="fs22 c-a4 line-through mgl10">零售价{{filter.toFix(details.oldprice,2)}}</view>
  39 +<!-- <view class="fs22 c-a4 line-through mgl10">零售价{{filter.toFix(details.oldprice,2)}}</view>-->
40 40 </view>
41 41 <view class="fs24 c-a4" wx:if="{{!is_not_start}}">已售{{details.salenum+details.virtualsales}}件</view>
42 42 </view>
... ...
packageA/pages/prom_list/prom_list.js
  View file @c81cad6
... ... @@ -270,7 +270,7 @@ Page({
270 270 if (!ee.data.collocationList) {
271 271 /*---获取活动的重表---*/
272 272 //调用接口判断订单优惠，
273   - getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + ee.data.gid + "/2"+"/"+oo.user_id, {}).then(res => {
  273 + getApp().request.promiseGet("/api/weshop/goods/getGoodsPromList/" + os.stoid + "/" + ee.data.gid + "/2"+"/"+getApp().globalData.user_id, {}).then(res => {
274 274 if (res.data.code == 0) {
275 275 var r_data = res.data.data;
276 276  
... ...
packageB/pages/user/collect_list/collect_list.wxml
  View file @c81cad6
... ... @@ -49,10 +49,10 @@
49 49 <view class="fs40">{{item.prom_price?item.prom_price:item.final_price}}</view>
50 50 </view>
51 51 <!-- 原价 -->
52   - <view class="flex fs24 line through xc-ash">
53   - <view>零售价:</view>
54   - <view>￥{{item.market_price}}</view>
55   - </view>
  52 +<!-- <view class="flex fs24 line through xc-ash">-->
  53 +<!-- <view>零售价:</view>-->
  54 +<!-- <view>￥{{item.market_price}}</view>-->
  55 +<!-- </view>-->
56 56 </view>
57 57  
58 58 <view class="money_right flex line" wx:if="{{!editEd}}">
... ...
packageB/pages/zuhegou/index/index.js
  View file @c81cad6
... ... @@ -1099,6 +1099,7 @@ Page({
1099 1099 goods_price: newd.goods_price,
1100 1100 member_goods_price: newd.goods_price,
1101 1101 store_id: os.stoid,
  1102 + state:0
1102 1103 };
1103 1104 if (th.data.s_cart_num) {
1104 1105 updata.goods_num = th.data.s_cart_num;
... ... @@ -1889,6 +1890,7 @@ Page({
1889 1890 goods_price: cur_price,
1890 1891 prom_id: th.data.act.id,
1891 1892 store_id: os.stoid,
  1893 + state:0
1892 1894 };
1893 1895 if (getApp().globalData.guide_id) {
1894 1896 updata['guide_id'] = getApp().globalData.guide_id;
... ...
packageB/pages/zuhegou/index/index.wxml
  View file @c81cad6
... ... @@ -56,7 +56,7 @@
56 56 <block wx:else>
57 57 <text class="rmb fs30 c-red">{{filters.toFix(item.shop_price,2)}}</text>
58 58 </block>
59   - <text class="rmb fs20 line-through cb">{{filters.toFix(item.market_price,2)}}</text>
  59 +<!-- <text class="rmb fs20 line-through cb">{{filters.toFix(item.market_price,2)}}</text>-->
60 60 </view>
61 61 <view class="c-red pdr10 {{item.haveAdded ? 'active':''}}" catchtap="addToCart"
62 62 data-index="{{index}}">
... ...
packageB/pages/zuhegou/preindex/index.wxml
  View file @c81cad6
... ... @@ -49,7 +49,7 @@
49 49 <block wx:else>
50 50 <text class="rmb fs30 c-red">{{filters.toFix(item.shop_price,2)}}</text>
51 51 </block>
52   - <text class="rmb fs20 line-through cb">{{filters.toFix(item.market_price,2)}}</text>
  52 +<!-- <text class="rmb fs20 line-through cb">{{filters.toFix(item.market_price,2)}}</text>-->
53 53 </view>
54 54  
55 55 </view>
... ...
packageC/pages/goods/distributionCategoryList/index.wxml
  View file @c81cad6
... ... @@ -113,9 +113,9 @@
113 113 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
114 114 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
115 115 </view>
116   - <view class="comment flex jc_sb">
117   - <view class="word-line xc-ash">￥{{item.market_price}}</view>
118   - </view>
  116 +<!-- <view class="comment flex jc_sb">-->
  117 +<!-- <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
  118 +<!-- </view>-->
119 119 <view class="fs24 c-a flex jc_sb">
120 120 <text class="money c-red">分成金额：{{filter.toFix(item.commission,2)}}</text>
121 121 <text>评论{{item.comment_count}}</text>
... ... @@ -135,9 +135,9 @@
135 135 <view class="card_name">{{card_name}}</view>
136 136 </view>
137 137 </view>
138   - <view class="comment flex jc_sb">
139   - <view class="word-line xc-ash">￥{{item.market_price}}</view>
140   - </view>
  138 +<!-- <view class="comment flex jc_sb">-->
  139 +<!-- <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
  140 +<!-- </view>-->
141 141 <view class="fs24 c-a flex jc_sb">
142 142 <text class="c-red">分成金额：{{filter.toFix(item.commission,2)}}</text>
143 143 <text>评论{{item.comment_count}}</text>
... ... @@ -145,9 +145,9 @@
145 145 </block>
146 146 <block wx:else>
147 147 <view class="price">￥{{item.shop_price}}</view>
148   - <view class="comment flex jc_sb">
149   - <view class="word-line xc-ash">￥{{item.market_price}}</view>
150   - </view>
  148 +<!-- <view class="comment flex jc_sb">-->
  149 +<!-- <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
  150 +<!-- </view>-->
151 151 <view class="fs24 c-a flex jc_sb">
152 152 <text class="c-red">分成金额：{{filter.toFix(item.commission,2)}}</text>
153 153 <text>评论{{item.comment_count}}</text>
... ... @@ -158,7 +158,7 @@
158 158 <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
159 159 <view class="flex ai-center">
160 160 <view class="price">￥{{item.shop_price}}</view>
161   - <view class="word-line xc-ash mk_price">￥{{item.market_price}}</view>
  161 +<!-- <view class="word-line xc-ash mk_price">￥{{item.market_price}}</view>-->
162 162 </view>
163 163 <view class="comment flex jc_sb">
164 164 <view class="flex ai-center">
... ... @@ -178,9 +178,9 @@
178 178 </block>
179 179 <block wx:else>
180 180 <view class="price">￥{{item.shop_price}}</view>
181   - <view class="comment flex jc_sb">
182   - <view class="word-line xc-ash">￥{{item.market_price}}</view>
183   - </view>
  181 +<!-- <view class="comment flex jc_sb">-->
  182 +<!-- <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
  183 +<!-- </view>-->
184 184 <view class="fs24 c-a flex jc_sb">
185 185 <text class="money c-red">
186 186 分成金额：{{filter.toFix(item.commission,2)}}
... ... @@ -192,9 +192,9 @@
192 192 </block>
193 193 <block wx:else>
194 194 <view class="price">￥{{item.shop_price}}</view>
195   - <view class="comment flex jc_sb">
196   - <view class="word-line xc-ash">￥{{item.market_price}}</view>
197   - </view>
  195 +<!-- <view class="comment flex jc_sb">-->
  196 +<!-- <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
  197 +<!-- </view>-->
198 198 <view class="fs24 c-a flex jc_sb">
199 199 <text class="money c-red">分成金额：{{filter.toFix(item.commission,2)}}</text>
200 200 <text>评论{{item.comment_count}}</text>
... ...
packageC/pages/goods/goodsList/goodsList.wxml
  View file @c81cad6
... ... @@ -71,7 +71,7 @@
71 71 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
72 72 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
73 73 </view>
74   - <view class="word-line xc-ash mgl10 rmb fs24">{{item.market_price}}</view>
  74 +<!-- <view class="word-line xc-ash mgl10 rmb fs24">{{item.market_price}}</view>-->
75 75 </view>
76 76  
77 77  
... ... @@ -98,7 +98,7 @@
98 98 </view>
99 99 </view>
100 100 <view class="comment">
101   - <view class="word-line xc-ash">￥{{item.market_price}}</view>
  101 +<!-- <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
102 102 <view class="fs24 t-r">
103 103 <span>评论{{item.comment_count}}</span>
104 104 <span class="pdl30">已售{{item.sales_sum}}</span>
... ... @@ -108,7 +108,7 @@
108 108 <block wx:else>
109 109 <view class="price">￥{{item.shop_price}}</view>
110 110 <view class="comment">
111   - <view class="word-line xc-ash">￥{{item.market_price}}</view>
  111 +<!-- <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
112 112 <view class="fs24 t-r">
113 113 <span>评论{{item.comment_count}}</span>
114 114 <span class="pdl30">已售{{item.sales_sum}}</span>
... ... @@ -120,7 +120,7 @@
120 120 <view wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
121 121 <view class="flex ai-center">
122 122 <view class="price rmb">{{item.shop_price}}</view>
123   - <view class="word-line xc-ash mk_price rmb">{{item.market_price}}</view>
  123 +<!-- <view class="word-line xc-ash mk_price rmb">{{item.market_price}}</view>-->
124 124 </view>
125 125 <view class="comment">
126 126 <view class="flex ai-center">
... ... @@ -139,7 +139,7 @@
139 139 <block wx:else>
140 140 <view>
141 141 <view class="price">￥{{item.shop_price}}</view>
142   - <view class="word-line xc-ash">￥{{item.market_price}}</view>
  142 +<!-- <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
143 143 </view>
144 144 <!-- <view class="price">￥{{item.shop_price}}</view> -->
145 145 <view class="comment pdt10">
... ... @@ -154,7 +154,7 @@
154 154 <view wx:else>
155 155 <view class="flex ai-center">
156 156 <view class="price rmb">{{item.shop_price}}</view>
157   - <view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>
  157 +<!-- <view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>-->
158 158 </view>
159 159  
160 160 <view class="comment pdt10">
... ... @@ -186,7 +186,7 @@
186 186 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
187 187 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
188 188 </view>
189   - <view class="word-line xc-ash mgl10 rmb fs24">{{item.market_price}}</view>
  189 +<!-- <view class="word-line xc-ash mgl10 rmb fs24">{{item.market_price}}</view>-->
190 190 </view>
191 191  
192 192  
... ... @@ -213,7 +213,7 @@
213 213 </view>
214 214 </view>
215 215 <view class="comment">
216   - <view class="word-line xc-ash">￥{{item.market_price}}</view>
  216 +<!-- <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
217 217 <view class="fs24 t-r">
218 218 <span>评论{{item.comment_count}}</span>
219 219 <span class="pdl30">已售{{item.sales_sum}}</span>
... ... @@ -223,7 +223,7 @@
223 223 <block wx:else>
224 224 <view class="price">￥{{item.shop_price}}</view>
225 225 <view class="comment">
226   - <view class="word-line xc-ash">￥{{item.market_price}}</view>
  226 +<!-- <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
227 227 <view class="fs24 t-r">
228 228 <span>评论{{item.comment_count}}</span>
229 229 <span class="pdl30">已售{{item.sales_sum}}</span>
... ... @@ -235,7 +235,7 @@
235 235 <view wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
236 236 <view class="flex ai-center">
237 237 <view class="price rmb">{{item.shop_price}}</view>
238   - <view class="word-line xc-ash mk_price rmb">{{item.market_price}}</view>
  238 +<!-- <view class="word-line xc-ash mk_price rmb">{{item.market_price}}</view>-->
239 239 </view>
240 240 <view class="comment">
241 241 <view class="flex ai-center">
... ... @@ -254,7 +254,7 @@
254 254 <block wx:else>
255 255 <view>
256 256 <view class="price">￥{{item.shop_price}}</view>
257   - <view class="word-line xc-ash">￥{{item.market_price}}</view>
  257 +<!-- <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
258 258 </view>
259 259 <!-- <view class="price">￥{{item.shop_price}}</view> -->
260 260 <view class="comment pdt10">
... ... @@ -269,7 +269,7 @@
269 269 <view wx:else>
270 270 <view class="">
271 271 <view class="price rmb">{{item.shop_price}}</view>
272   - <view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>
  272 +<!-- <view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>-->
273 273 </view>
274 274  
275 275 <view class="comment pdt10">
... ...
packageC/pages/group_list/group_list.wxml
  View file @c81cad6
... ... @@ -16,7 +16,7 @@
16 16 <view class="rmb c-red fs30" wx:if="{{type == 1}}">{{item.price}}</view>
17 17 <view class="rmb c-red fs30" style="color:#059de5;" wx:else>{{item.price}}</view>
18 18  
19   - <view class="rmb del fs24 c-7b pdl10">{{item.market_price}}</view>
  19 +<!-- <view class="rmb del fs24 c-7b pdl10">{{item.market_price}}</view>-->
20 20 </view>
21 21 </view>
22 22 <view class="flex jc_sb ai-center c-7b">
... ...
packageC/pages/luckyGo/luckyGo_activityList/luckyGo_activityList.wxml
  View file @c81cad6
... ... @@ -22,7 +22,7 @@
22 22 <view>
23 23 <view class="flex ai-center">
24 24 <text class="rmb c-red">{{filters.price(item.group_price)}}</text>
25   - <view class="del fs22 c-a pdl10">零售价:<text class="rmb">{{item.market_price}}</text></view>
  25 +<!-- <view class="del fs22 c-a pdl10"><text class="rmb">{{item.shop_price}}</text></view>-->
26 26 </view>
27 27 <view class="flex jc_sb">
28 28 <progress class="pdr20 f1 progress" percent="{{filters.percent(item.num, item.group_num)}}" activeColor="#FF6768" backgroundColor="#d0d0d0" border-radius="12" stroke-width="12" data-content="{{item.num}}人已参团"></progress>
... ...
packageC/pages/luckyGo/luckyGo_cart/luckyGo_cart.js
  View file @c81cad6
... ... @@ -751,7 +751,29 @@ Page({
751 751  
752 752 t.data.data.original_img = oo.imghost + t.data.data.original_img;
753 753 t.data.data['buynum'] = gg.goods_num;
754   - var distr_t = 0, et = 0
  754 + var distr_t = 0, et = 0;
  755 +
  756 + if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){
  757 +
  758 + if(t.data.data.distr_type==1 || gg.pick_dis==1) {
  759 + wx.showToast({
  760 + title: "视频号仅支持物流",
  761 + icon: 'none',
  762 + duration: 2000
  763 + })
  764 +
  765 + setTimeout(function(){
  766 + wx.navigateBack({delta: 1})
  767 + },1000)
  768 +
  769 + return false
  770 + }
  771 +
  772 + t.data.data.distr_type=2;
  773 + th.setData({show_same_city:0})
  774 +
  775 + }
  776 +
755 777 if (t.data.data.distr_type == 0) {
756 778 distr_t = gg.pick_dis;
757 779 } else {
... ...
packageC/pages/luckyGo/luckyGo_cart_ct/luckyGo_cart_ct.js
  View file @c81cad6
... ... @@ -260,7 +260,27 @@ Page({
260 260 t.data.data['buynum'] = gg.goods_num;
261 261 // console.log(t.data.data);
262 262 var distr_t = 0,
263   - et = 0
  263 + et = 0;
  264 +
  265 + if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){
  266 +
  267 + if(t.data.data.distr_type==1 || gg.pick_dis==1) {
  268 + wx.showToast({
  269 + title: "视频号仅支持物流",
  270 + icon: 'none',
  271 + duration: 2000
  272 + })
  273 +
  274 + wx.navigateBack({delta: 1})
  275 +
  276 + return false
  277 + }
  278 +
  279 + t.data.data.distr_type=2;
  280 + th.setData({show_same_city:0})
  281 +
  282 + }
  283 +
264 284 if (t.data.data.distr_type == 0) {
265 285 distr_t = gg.pick_dis;
266 286 } else {
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxml
  View file @c81cad6
... ... @@ -114,7 +114,7 @@
114 114 <view class="fs50 val">{{filters.toFix(luckGoInfo.group_price/100,2)}}</view>
115 115 </view>
116 116 <view class="word-line fs20 xc-qtunit-price">
117   - 手店价
  117 +<!-- 手店价-->
118 118 <!-- ￥{{filters.toFix(data.shop_price,2)}} -->
119 119 <block wx:if="{{card_field && sele_g[card_field]>0}}"><text class="rmb lh1">{{sele_g[card_field]}}</text></block>
120 120 <block wx:else><text class="rmb lh1">{{sele_g.shop_price}}</text></block>
... ...
packageC/pages/luckyGo/luckyGo_goodsInfo/luckyGo_goodsInfo.wxss
  View file @c81cad6
... ... @@ -2319,8 +2319,7 @@ left:25rpx;
2319 2319 color: #fff;
2320 2320 }
2321 2321 .xc-qt-price .xc-qtunit-price{
2322   - margin-left:6rpx;
2323   -margin-top:-4rpx;
  2322 + margin-left:-96rpx;
2324 2323 }
2325 2324 .xc-nanber{
2326 2325 top:-25rpx;
... ...
packageC/pages/luckyGo/luckyGo_list/luckyGo_list.wxml
  View file @c81cad6
... ... @@ -23,7 +23,7 @@
23 23 <view class="title ellipsis-2">{{item.goods_name}}</view>
24 24 <view class="flex ai-center">
25 25 <text class="rmb fs40 c-red">{{filters.price(item.group_price)}}</text>
26   - <view class="fs24 del pdl10 c-c7">零售价<text class="rmb">{{item.market_price}}</text></view>
  26 +<!-- <view class="fs24 del pdl10 c-c7">零售价<text class="rmb">{{item.market_price}}</text></view>-->
27 27 </view>
28 28 <view class="c-red fs24" wx:if="{{item.team_status != 2}}">未团中可获得帮团奖励</view>
29 29 </view>
... ...
packageC/pages/payForAnother/payForAnother.js
  View file @c81cad6
... ... @@ -719,7 +719,29 @@ Page({
719 719  
720 720 t.data.data.original_img = oo.imghost + t.data.data.original_img;
721 721 t.data.data['buynum'] = gg.goods_num;
722   - var distr_t = 0, et = 0
  722 + var distr_t = 0, et = 0;
  723 +
  724 + if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){
  725 +
  726 + if(t.data.data.distr_type==1 || gg.pick_dis==1) {
  727 + wx.showToast({
  728 + title: "视频号仅支持物流",
  729 + icon: 'none',
  730 + duration: 2000
  731 + })
  732 +
  733 + setTimeout(function(){
  734 + wx.navigateBack({delta: 1})
  735 + },1000)
  736 +
  737 + return false
  738 + }
  739 +
  740 + t.data.data.distr_type=2;
  741 + th.setData({show_same_city:0})
  742 +
  743 + }
  744 +
723 745 if (t.data.data.distr_type == 0) {
724 746 distr_t = gg.pick_dis;
725 747 } else {
... ...
packageC/pages/presell/cart/cart.js
  View file @c81cad6
... ... @@ -586,6 +586,28 @@ Page({
586 586  
587 587 var price = presell.presell_price;
588 588 if (!goods) return false;
  589 +
  590 + if(goods.is_minishop==1 && getApp().is_sp_hao()){
  591 +
  592 + if(goods.distr_type==1 || pickup.distr_type==1) {
  593 + wx.showToast({
  594 + title: "视频号仅支持物流",
  595 + icon: 'none',
  596 + duration: 2000
  597 + })
  598 +
  599 + setTimeout(function(){
  600 + wx.navigateBack({delta: 1})
  601 + },1000)
  602 +
  603 + return false
  604 + }
  605 +
  606 + goods.distr_type=2;
  607 + th.setData({show_same_city:0})
  608 +
  609 + }
  610 +
589 611 //--判断物流--
590 612 if (goods.distr_type)
591 613 distr_type = goods.distr_type;
... ...
packageC/pages/presell/cart/cart2.js
  View file @c81cad6
... ... @@ -401,7 +401,29 @@ Page({
401 401  
402 402 t.data.data.original_img = oo.imghost + t.data.data.original_img;
403 403 t.data.data['buynum'] = th.data.gg.goods_num;
404   - var distr_t = 0, et = 0
  404 + var distr_t = 0, et = 0;
  405 +
  406 + if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){
  407 +
  408 + if(t.data.data.distr_type==1 || gg.pick_dis==1) {
  409 + wx.showToast({
  410 + title: "视频号仅支持物流",
  411 + icon: 'none',
  412 + duration: 2000
  413 + })
  414 +
  415 + setTimeout(function(){
  416 + wx.navigateBack({delta: 1})
  417 + },1000)
  418 +
  419 + return false
  420 + }
  421 +
  422 + t.data.data.distr_type=2;
  423 + th.setData({show_same_city:0})
  424 +
  425 + }
  426 +
405 427 if (t.data.data.distr_type == 0) {
406 428 distr_t = th.data.gg.pick_dis;
407 429 } else {
... ...
packageC/pages/presell/cart/cart2_pre.js
  View file @c81cad6
... ... @@ -186,6 +186,29 @@ Page({
186 186 t.data.data['buynum'] = gg.goods_num;
187 187  
188 188 var distr_t = 0, et = 0;
  189 +
  190 + if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){
  191 +
  192 + if(t.data.data.distr_type==1 || gg.pick_dis==1) {
  193 + wx.showToast({
  194 + title: "视频号仅支持物流",
  195 + icon: 'none',
  196 + duration: 2000
  197 + })
  198 +
  199 + setTimeout(function(){
  200 + wx.navigateBack({delta: 1})
  201 + },1000)
  202 +
  203 + return false
  204 + }
  205 +
  206 + t.data.data.distr_type=2;
  207 + th.setData({show_same_city:0})
  208 +
  209 + }
  210 +
  211 +
189 212 if (t.data.data.distr_type == 0) {
190 213 distr_t = gg.pick_dis;
191 214 } else {
... ...
packageC/pages/presell/goodsInfo/goodsInfo.js
  View file @c81cad6
... ... @@ -2858,12 +2858,12 @@ Page({
2858 2858 var wd2 = th.data.screenWidth - ut.measureText(pri0, 22 * unit) - 25;
2859 2859  
2860 2860 if(th.data.presellForm.presell_type==1){
2861   - context.setStrokeStyle('gray');
2862   - context.fillText(pri0, wd2, 213 * unit);
2863   - context.setLineWidth(1 * unit);
2864   - context.moveTo(wd2 - 5, 206 * unit);
2865   - context.lineTo(wd2 + ut.measureText(pri0, 22 * unit) + 5, 206 * unit);
2866   - context.stroke();
  2861 + // context.setStrokeStyle('gray');
  2862 + // context.fillText(pri0, wd2, 213 * unit);
  2863 + // context.setLineWidth(1 * unit);
  2864 + // context.moveTo(wd2 - 5, 206 * unit);
  2865 + // context.lineTo(wd2 + ut.measureText(pri0, 22 * unit) + 5, 206 * unit);
  2866 + // context.stroke();
2867 2867 }else{
2868 2868 context.fillText('定金', wd2, 213 * unit);
2869 2869 }
... ... @@ -3198,7 +3198,7 @@ Page({
3198 3198 data: req_data,
3199 3199 })
3200 3200 .then(res => {
3201   - if (t.ajax_ok(res)) {
  3201 + if (ut.ajax_ok(res)) {
3202 3202 _this.setData({
3203 3203 historyBuyInfo: res.data.data.pageData,
3204 3204 })
... ...
packageC/pages/presell/goodsInfo/goodsInfo.wxml
  View file @c81cad6
... ... @@ -80,9 +80,9 @@
80 80 <view class="abs xc-qt-price fs28 xc-qtsign">预售价</view>
81 81 <view class="abs flex presell_price">
82 82 <view class="fs28 val" style="margin-right:100rpx">￥{{presellList.presell_price}}</view>
83   - <view class="word-line fs26 xc-qtunit-price">
84   - 零售价￥{{filters.toFix(data.market_price,2)}}
85   - </view>
  83 +<!-- <view class="word-line fs26 xc-qtunit-price">-->
  84 +<!-- 零售价￥{{filters.toFix(data.market_price,2)}}-->
  85 +<!-- </view>-->
86 86 </view>
87 87  
88 88  
... ...
packageC/pages/presell/list/list.wxml
  View file @c81cad6
... ... @@ -59,7 +59,8 @@
59 59 <view class="fs40 flex xc-buttom-money {{type==1?'xc-wc':'blue_c'}}" >
60 60 <view class="fs28" style="line-height: 16px;">￥{{item.presell_price}}</view>
61 61 <text>{{item.price}}</text>
62   - <span class="underline fs20">零售价￥{{item.market_price}}</span></view>
  62 +<!-- <span class="underline fs20">零售价￥{{item.market_price}}</span>-->
  63 + </view>
63 64 </view>
64 65 <view class="kill-btn ">
65 66 <navigator wx:if="{{type==1}}" url="/packageC/pages/presell/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&pre_id={{item.id}}">去抢购</navigator>
... ...
pages/activity/pind_list/pind_list.wxml
  View file @c81cad6
... ... @@ -69,7 +69,7 @@
69 69 <view class="fs40 flex xc-top15 {{type==1?'red-co ai-bas':'blue_c xc-lihe42 ai-bas'}}">
70 70 <text class="fs28 {{type==0?'martop13':''}}">￥</text>
71 71 <text style="margin-left:-5rpx">{{item.price}}</text>
72   - <span class="underline {{type==0?'martop18':''}}">零售价￥{{item.market_price}}</span>
  72 +<!-- <span class="underline {{type==0?'martop18':''}}">￥{{item.shop_price}}</span>-->
73 73 </view>
74 74  
75 75 </view>
... ...
pages/activity/seckill_list/seckill_list.wxml
  View file @c81cad6
... ... @@ -69,8 +69,9 @@
69 69 <view class="fs40 flex xc-buttom-money {{type==1?'xc-wc':'blue_c'}}" >
70 70 <view class="fs28" style="line-height: 16px;">￥</view>
71 71 <text>{{item.price}}</text>
72   - <span class="underline fs20">零售价￥{{item.market_price}}</span></view>
73   -
  72 +<!-- <span class="underline fs20">零售价￥{{item.market_price}}</span>-->
  73 + </view>
  74 +
74 75 </view>
75 76 <view class="kill-btn ">
76 77 <!-- <navigator style="background-color: #059de5;" url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}&prom_id={{item.id}}&prom_type=1" wx:if="{{type==0}}" >即将开始</navigator>
... ...
pages/cart/cart2/cart2.js
  View file @c81cad6
... ... @@ -871,6 +871,30 @@ Page({
871 871 t.data.data.original_img = oo.imghost + t.data.data.original_img;
872 872 t.data.data['buynum'] = gg.goods_num;
873 873 var distr_t = 0, et = 0
  874 +
  875 + if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){
  876 +
  877 + if(t.data.data.distr_type==1 || gg.pick_dis==1) {
  878 + wx.showToast({
  879 + title: "视频号仅支持物流",
  880 + icon: 'none',
  881 + duration: 2000
  882 + })
  883 +
  884 + setTimeout(function(){
  885 + wx.navigateBack({delta: 1})
  886 + },1000)
  887 +
  888 +
  889 + return false
  890 + }
  891 +
  892 + t.data.data.distr_type=2;
  893 + th.setData({show_same_city:0})
  894 +
  895 + }
  896 +
  897 +
874 898 if (t.data.data.distr_type == 0) {
875 899 distr_t = gg.pick_dis;
876 900 } else {
... ...
pages/cart/cart2_inte/cart2_inte.js
  View file @c81cad6
... ... @@ -295,7 +295,7 @@ Page({
295 295 //-- 如果商品有同城配送的参数的时候,一件代发商品不能显示同城配送按钮 --
296 296 if(gd.is_same_city && th.data.is_same_city && gd.whsle_id<=0){
297 297  
298   - getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+gg.pick_id, {}).then(res=>{
  298 + await getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+gg.pick_id, {}).then(res=>{
299 299 if(res.data.code==0){
300 300 var pk=res.data.data;
301 301 if(pk && pk.is_same_city){
... ... @@ -311,6 +311,29 @@ Page({
311 311 t.data.data.original_img = oo.imghost + t.data.data.original_img;
312 312 t.data.data['buynum'] = gg.goods_num;
313 313 var distr_t = 0, et = 0
  314 +
  315 + if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){
  316 +
  317 + if(t.data.data.distr_type==1 || gg.pick_dis==1) {
  318 + wx.showToast({
  319 + title: "视频号仅支持物流",
  320 + icon: 'none',
  321 + duration: 2000
  322 + })
  323 +
  324 + setTimeout(function(){
  325 + wx.navigateBack({delta: 1})
  326 + },1000)
  327 +
  328 +
  329 + return false
  330 + }
  331 +
  332 + t.data.data.distr_type=2;
  333 + th.setData({show_same_city:0})
  334 +
  335 + }
  336 +
314 337 if (t.data.data.distr_type == 0) {
315 338 distr_t = gg.pick_dis;
316 339 } else {
... ...
pages/cart/cart2_pt/cart2_pt.js
  View file @c81cad6
... ... @@ -171,7 +171,7 @@ Page({
171 171 var gg = th.data.postdata;
172 172 //调用商品
173 173 a.get("/api/weshop/goods/get/" + oo.stoid + "/" + gg.goods_id, {
174   - success: function (t) {
  174 + success:async function (t) {
175 175 var gd = t.data.data;
176 176 if (!gd) return false;
177 177  
... ... @@ -179,7 +179,7 @@ Page({
179 179 //-- 如果商品有同城配送的参数的时候,一件代发商品不能显示同城配送按钮 --
180 180 if(gd.is_same_city && th.data.is_same_city && gd.whsle_id<=0){
181 181  
182   - getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+gg.pick_id, {}).then(res=>{
  182 + await getApp().request.promiseGet("/api/weshop/pickup/get/"+os.stoid+"/"+gg.pick_id, {}).then(res=>{
183 183 if(res.data.code==0){
184 184 var pk=res.data.data;
185 185 if(pk && pk.is_same_city){
... ... @@ -194,7 +194,30 @@ Page({
194 194 t.data.data.original_img = oo.imghost + t.data.data.original_img;
195 195 t.data.data['buynum'] = gg.goods_num;
196 196 console.log(t.data.data);
197   - var distr_t = 0, et = 0
  197 + var distr_t = 0, et = 0;
  198 +
  199 + if(t.data.data.is_minishop==1 && getApp().is_sp_hao()){
  200 +
  201 + if(t.data.data.distr_type==1 || gg.pick_dis==1) {
  202 + wx.showToast({
  203 + title: "视频号仅支持物流",
  204 + icon: 'none',
  205 + duration: 2000
  206 + })
  207 +
  208 + setTimeout(function(){
  209 + wx.navigateBack({delta: 1})
  210 + },1000)
  211 +
  212 +
  213 + return false
  214 + }
  215 +
  216 + t.data.data.distr_type=2;
  217 + th.setData({show_same_city:0})
  218 +
  219 + }
  220 +
198 221 if (t.data.data.distr_type == 0) {
199 222 distr_t = gg.pick_dis;
200 223 } else {
... ...
pages/cart/cart_wk/cart_wk.js
  View file @c81cad6
... ... @@ -266,6 +266,29 @@ Page({
266 266 order.tail_money = tail_money;
267 267  
268 268 if (!goods) return false;
  269 +
  270 + if(goods.is_minishop==1 && getApp().is_sp_hao()){
  271 +
  272 + if(goods.distr_type==1 || pickup.distr_type==1) {
  273 + wx.showToast({
  274 + title: "视频号仅支持物流",
  275 + icon: 'none',
  276 + duration: 2000
  277 + })
  278 +
  279 + setTimeout(function(){
  280 + wx.navigateBack({delta: 1})
  281 + },1000)
  282 +
  283 + return false
  284 + }
  285 +
  286 + goods.distr_type=2;
  287 + th.setData({show_same_city:0})
  288 +
  289 + }
  290 +
  291 +
269 292 //--判断物流--
270 293 if (goods.distr_type)
271 294 distr_type = goods.distr_type;
... ...
pages/distribution/distribution.js
  View file @c81cad6
... ... @@ -102,7 +102,7 @@ Page({
102 102 await getApp().promiseGet("/api/weshop/storeDistribut/get/"+os.stoid,{}).then(rs=>{
103 103 var dis=rs.data.data;
104 104 if( dis && dis.switch==0){
105   - self.setData({err_word:"商家暂时未开启分享，敬请期待"});
  105 + self.setData({err_word:"商家暂时未开启分销，敬请期待"});
106 106 isok=0;
107 107 }
108 108  
... ...
pages/giftpack/buygiftpack/giftpackbuy.js
  View file @c81cad6
... ... @@ -108,7 +108,7 @@ Page({
108 108 }
109 109 })
110 110 }
111   - getApp().request.promiseGet("/api/weshop/ad/page?pid=901&store_id=" + os.stoid, {
  111 + getApp().request.promiseGet("/api/weshop/ad/page?pid=902&store_id=" + os.stoid, {
112 112 data: {
113 113 enabled: 1
114 114 }
... ...
pages/giftpack/buygiftpack/giftpackbuy.wxml
  View file @c81cad6
... ... @@ -47,9 +47,9 @@
47 47 </view>
48 48 </block>
49 49 </view>
50   - <view class="content_ware_price">
51   - <text class="ellipsis-1">{{"零售价:￥"+items.giftPosPrice}}</text>
52   - </view>
  50 +<!-- <view class="content_ware_price">-->
  51 +<!-- <text class="ellipsis-1">{{"零售价:￥"+items.giftPosPrice}}</text>-->
  52 +<!-- </view>-->
53 53 <view wx:if="{{items.is_show && now < items.starTime1 }}" class="content_ware_time">
54 54 <text class="ellipsis-1">{{"活动开始时间："+items.starTime}}</text>
55 55 </view>
... ...
pages/giftpack/giftpacklist/giftpacklist.wxml
  View file @c81cad6
... ... @@ -48,9 +48,9 @@
48 48 </block>
49 49 </view>
50 50 <view class="top_foot data-v-3a5b7e36">
51   - <view class="top_foot_price data-v-3a5b7e36">
52   - <text class="data-v-3a5b7e36">{{"零售价:"+giftPosPrice+"元"}}</text>
53   - </view>
  51 +<!-- <view class="top_foot_price data-v-3a5b7e36">-->
  52 +<!-- <text class="data-v-3a5b7e36">{{"零售价:"+giftPosPrice+"元"}}</text>-->
  53 +<!-- </view>-->
54 54 <view class="top_foot_qty data-v-3a5b7e36">
55 55 <text class="data-v-3a5b7e36" wx:if="{{!flag}}">{{"已售:"+giftQty+"件"}}</text>
56 56 <text class="data-v-3a5b7e36" wx:elif="{{flag == 1 && giftQty > 0}}">{{"数量:"+giftQty+"件"}}</text>
... ...
pages/giftpack/mygiftpack/mygiftpack.js
  View file @c81cad6
... ... @@ -59,7 +59,7 @@ Page({
59 59 })
60 60 }
61 61  
62   - getApp().request.promiseGet("/api/weshop/ad/page?pid=901&store_id=" + os.stoid, {
  62 + getApp().request.promiseGet("/api/weshop/ad/page?pid=902&store_id=" + os.stoid, {
63 63 data: {
64 64 enabled: 1
65 65 }
... ...
pages/giftpack/mygiftpack/mygiftpack.wxml
  View file @c81cad6
1 1 <view class="top_img" style="background-color: {{ad_data?ad_data.bgcolor:'rgb(250, 120, 88)'}};">
2 2 <block wx:if="{{ad_data}}">
3 3 <view class="top_img">
4   - <image src="{{ad_data.ad_code}}" lazy-load="true" binderror="bind_bnerr2" data-errorimg="wareCard[{{index}}].lbUrl"></image>
  4 + <image mode="widthFix" src="{{ad_data.ad_code}}" lazy-load="true" binderror="bind_bnerr2" data-errorimg="wareCard[{{index}}].lbUrl"></image>
5 5 </view>
6 6 </block>
7 7 <block wx:else>
8 8 <view class="top_img">
9 9 <!-- <image src="{{$GetInfo.imgHttp+'/miniapp/images/giftbag/gift00.jpg'}}"></image> -->
10   - <image src="{{iurl+'/miniapp/images/giftbag/gift00.jpg?v=2019'}}" lazy-load="true"></image>
  10 + <image mode="widthFix" src="{{iurl+'/miniapp/images/giftbag/gift00.jpg?v=2019'}}" lazy-load="true"></image>
11 11 </view>
12 12 </block>
13 13  
... ... @@ -78,9 +78,9 @@
78 78 <text>{{item.actTitle}}</text>
79 79 </block>
80 80 </view>
81   - <view class="content_ware_price">
82   - <text>{{"零售价:￥"+item.giftPosPrice}}</text>
83   - </view>
  81 +<!-- <view class="content_ware_price">-->
  82 +<!-- <text>{{"零售价:￥"+item.giftPosPrice}}</text>-->
  83 +<!-- </view>-->
84 84  
85 85 <view class="content_ware_time" wx:if="{{item.iswarelbtype==1}}">
86 86 <block wx:if="{{getDate>item.endTime}}">
... ...
pages/goods/categoryList/categoryList.wxml
  View file @c81cad6
... ... @@ -546,7 +546,7 @@
546 546 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
547 547 <text wx:if="{{item.prom_price}}" class="rmb">{{item.prom_price}}</text>
548 548 </view>
549   - <view class="word-line xc-ash rmb mgl10 fs24">{{item.market_price}}</view>
  549 +<!-- <view class="word-line xc-ash rmb mgl10 fs24">{{item.market_price}}</view>-->
550 550 </view>
551 551  
552 552 <view class="comment">
... ... @@ -575,7 +575,7 @@
575 575 </view>
576 576 </view>
577 577 <view class="comment flex jc_sb">
578   - <view class="word-line xc-ash rmb fs24">{{item.market_price}}</view>
  578 +<!-- <view class="word-line xc-ash rmb fs24">{{item.market_price}}</view>-->
579 579 <view class="fs22 pdt10 t-r">
580 580 <span>评论{{item.comment_count}}</span>
581 581 <span class="pdl30">已售{{item.sales_sum}}</span>
... ... @@ -585,7 +585,7 @@
585 585 <block wx:else>
586 586 <view class="flex ai-center">
587 587 <view class="price rmb">{{item.shop_price}}</view>
588   - <view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>
  588 +<!-- <view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>-->
589 589 </view>
590 590  
591 591 <view class="comment">
... ... @@ -601,7 +601,7 @@
601 601 <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
602 602 <view class="flex ai-center">
603 603 <view class="price rmb">{{item.shop_price}}</view>
604   - <view class="word-line xc-ash mk_price rmb fs24 mgl10">{{item.market_price}}</view>
  604 +<!-- <view class="word-line xc-ash mk_price rmb fs24 mgl10">{{item.market_price}}</view>-->
605 605 </view>
606 606 <view class="comment">
607 607 <view class="flex ai-center">
... ... @@ -623,7 +623,7 @@
623 623 <block wx:else>
624 624 <view class="flex ai-center">
625 625 <view class="price rmb">{{item.shop_price}}</view>
626   - <view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>
  626 +<!-- <view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>-->
627 627 </view>
628 628 <!-- <view class="price">￥{{item.shop_price}}</view> -->
629 629 <view class="comment">
... ... @@ -639,7 +639,7 @@
639 639 <block wx:else>
640 640 <view class="flex ai-center">
641 641 <view class="price rmb">{{item.shop_price}}</view>
642   - <view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>
  642 +<!-- <view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>-->
643 643 </view>
644 644 <!-- <view class="price">￥{{item.shop_price}}</view> -->
645 645 <view class="comment">
... ...
pages/goods/goodsInfo/goodsInfo.js
  View file @c81cad6
... ... @@ -5014,6 +5014,7 @@ Page({
5014 5014 };
5015 5015  
5016 5016 //---市场价划掉---
  5017 + /*---
5017 5018 context.setFillStyle("gray")
5018 5019 context.setFontSize(22 * unit)
5019 5020 var pri0 = "￥" + this.data.data.market_price.toFixed(2);
... ... @@ -5024,7 +5025,7 @@ Page({
5024 5025 context.setLineWidth(1 * unit);
5025 5026 context.moveTo(54 * unit, 763 * unit);
5026 5027 context.lineTo(ut.measureText(pri0, 22 * unit) + 50, 763 * unit);
5027   - context.stroke();
  5028 + context.stroke();--*/
5028 5029  
5029 5030 // 8.商品标题
5030 5031 context.setFontSize(20 * unit);
... ... @@ -5205,6 +5206,7 @@ Page({
5205 5206 context.fillText(pri0, wd1, 185 * unit);
5206 5207  
5207 5208 //---市场价划掉---
  5209 + /*--
5208 5210 context.setFillStyle("gray")
5209 5211 context.setFontSize(22 * unit)
5210 5212 pri0 = "￥" + th.data.data.market_price.toFixed(2);
... ... @@ -5215,7 +5217,7 @@ Page({
5215 5217 context.setLineWidth(1 * unit);
5216 5218 context.moveTo(wd2 - 5, 206 * unit);
5217 5219 context.lineTo(wd2 + ut.measureText(pri0, 22 * unit) + 5, 206 * unit);
5218   - context.stroke();
  5220 + context.stroke();--*/
5219 5221  
5220 5222 } else if (type == 4 && type != 0 && type != 1 && type != 2 && type != 3) {
5221 5223 context.setFillStyle("black");
... ...
pages/goods/goodsInfo/goodsInfo.wxml
  View file @c81cad6
... ... @@ -98,7 +98,7 @@
98 98 <view class="prom_show rel" wx:if="{{prom_type==2}}">
99 99  
100 100 <view class="abs flex" style="align-items:flex-end;color: #fff; margin-top: 34rpx; margin-left: 10rpx; height: 60rpx">￥{{prom_price}}
101   - <view class="word-line fs24" style="position: relative;top: -6rpx">零售价￥{{filters.toFix(data.market_price,2)}}</view></view>
  101 + <view class="word-line fs24" style="position: relative;top: -6rpx">￥{{filters.toFix(data.shop_price,2)}}</view></view>
102 102  
103 103 <image class="abs" style="width: 120rpx;top: 32rpx; right: 220rpx;" mode="widthFix" src='{{iurl+"/miniapp/images/activity-time.png"}}'></image>
104 104  
... ... @@ -125,7 +125,7 @@
125 125 <view class="fs50 val">{{prom_price}}</view>
126 126 </view>
127 127 <view class="word-line fs20 xc-qtunit-price">
128   - 零售价￥{{filters.toFix(data.market_price,2)}}
  128 + ￥{{filters.toFix(data.shop_price,2)}}
129 129 </view>
130 130 </view>
131 131  
... ... @@ -261,7 +261,7 @@
261 261 <text class="rel_txt" wx:if="{{prom_price}}">{{filters.toFix(prom_price,2)}}元</text>
262 262 <text class="rel_txt" wx:if="{{!prom_integral && !prom_price}}">0积分</text>
263 263 <text class="rel_txt fs22" decode="{{true}}" space="{{true}}" style="color: #999; text-decoration: line-through;">
264   - &nbsp;&nbsp;&nbsp;零售价:￥{{filters.toFix(data.market_price,2)}}
  264 + &nbsp;&nbsp;&nbsp;￥{{filters.toFix(data.shop_price,2)}}
265 265 </text>
266 266 </view>
267 267 <!-- 这个是分享按钮 -->
... ... @@ -302,18 +302,18 @@
302 302 </view>
303 303 <text class="rel yuan">￥</text>
304 304 {{filters.toFix(data[card_field],2)}}
305   - <view class='yj' style="top:35rpx">
306   - <text>零售价:￥{{filters.toFix(data.market_price,2)}}</text>
307   - </view>
  305 +<!-- <view class='yj' style="top:35rpx">-->
  306 +<!-- <text>零售价:￥{{filters.toFix(data.market_price,2)}}</text>-->
  307 +<!-- </view>-->
308 308 </block>
309 309 <block wx:elif="{{prom_type!=2}}">
310 310  
311 311  
312 312 <text class="yuan">￥</text>
313 313 {{filters.toFix(data.shop_price,2)}}
314   - <view class='yj'>
315   - <text>零售价:￥{{filters.toFix(data.market_price,2)}}</text>
316   - </view>
  314 +<!-- <view class='yj'>-->
  315 +<!-- <text>零售价:￥{{filters.toFix(data.market_price,2)}}</text>-->
  316 +<!-- </view>-->
317 317 </block>
318 318 </view>
319 319 </view>
... ... @@ -410,7 +410,7 @@
410 410 <text class="fs30">￥</text>
411 411 {{prom_price}}
412 412 </view>
413   - <view class="word-line fs24">零售价￥{{filters.toFix(data.market_price,2)}}</view>
  413 + <view class="word-line fs24">￥{{filters.toFix(data.shop_price,2)}}</view>
414 414 </view>
415 415 <!-- 这个是分享按钮 -->
416 416 <view class="xc-share-frame t-c shrink0" bindtap="clickShare">
... ...
pages/goods/goodsList/goodsList.wxml
  View file @c81cad6
... ... @@ -74,7 +74,7 @@
74 74 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
75 75 <text wx:if="{{item.prom_price}}" class="rmb">{{item.prom_price}}</text>
76 76 </view>
77   - <view class="word-line xc-ash mgl10 rmb fs24">{{item.market_price}}</view>
  77 +<!-- <view class="word-line xc-ash mgl10 rmb fs24">{{item.market_price}}</view>-->
78 78 </view>
79 79  
80 80  
... ... @@ -101,7 +101,7 @@
101 101 </view>
102 102 </view>
103 103 <view class="comment">
104   - <view class="word-line xc-ash rmb">{{item.market_price}}</view>
  104 +<!-- <view class="word-line xc-ash rmb">{{item.market_price}}</view>-->
105 105 <view class="fs24 t-r">
106 106 <span>评论{{item.comment_count}}</span>
107 107 <span class="pdl30">已售{{item.sales_sum}}</span>
... ... @@ -111,7 +111,7 @@
111 111 <block wx:else>
112 112 <view class="price rmb">{{item.shop_price}}</view>
113 113 <view class="comment">
114   - <view class="word-line xc-ash rmb">{{item.market_price}}</view>
  114 +<!-- <view class="word-line xc-ash rmb">{{item.market_price}}</view>-->
115 115 <view class="fs24 t-r">
116 116 <span>评论{{item.comment_count}}</span>
117 117 <span class="pdl30">已售{{item.sales_sum}}</span>
... ... @@ -123,7 +123,7 @@
123 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   - <view class="word-line xc-ash mk_price rmb">{{item.market_price}}</view>
  126 +<!-- <view class="word-line xc-ash mk_price rmb">{{item.market_price}}</view>-->
127 127 </view>
128 128 <view class="comment">
129 129 <view class="flex ai-center">
... ... @@ -142,7 +142,7 @@
142 142 <block wx:else>
143 143 <view>
144 144 <view class="price rmb">{{item.shop_price}}</view>
145   - <view class="word-line xc-ash rmb">{{item.market_price}}</view>
  145 +<!-- <view class="word-line xc-ash rmb">{{item.market_price}}</view>-->
146 146 </view>
147 147 <!-- <view class="price">￥{{item.shop_price}}</view> -->
148 148 <view class="comment pdt10">
... ... @@ -157,7 +157,7 @@
157 157 <view wx:else>
158 158 <view class="flex ai-center">
159 159 <view class="price rmb">{{item.shop_price}}</view>
160   - <view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>
  160 +<!-- <view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>-->
161 161 </view>
162 162  
163 163 <view class="comment pdt10">
... ... @@ -189,7 +189,7 @@
189 189 <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
190 190 <text wx:if="{{item.prom_price}}" class="rmb">{{item.prom_price}}</text>
191 191 </view>
192   - <view class="word-line xc-ash mgl10 rmb fs24">{{item.market_price}}</view>
  192 +<!-- <view class="word-line xc-ash mgl10 rmb fs24">{{item.market_price}}</view>-->
193 193 </view>
194 194  
195 195  
... ... @@ -216,7 +216,7 @@
216 216 </view>
217 217 </view>
218 218 <view class="comment">
219   - <view class="word-line xc-ash rmb">{{item.market_price}}</view>
  219 +<!-- <view class="word-line xc-ash rmb">{{item.market_price}}</view>-->
220 220 <view class="fs24 t-r">
221 221 <span>评论{{item.comment_count}}</span>
222 222 <span class="pdl30">已售{{item.sales_sum}}</span>
... ... @@ -226,7 +226,7 @@
226 226 <block wx:else>
227 227 <view class="price rmb">{{item.shop_price}}</view>
228 228 <view class="comment">
229   - <view class="word-line xc-ash rmb">{{item.market_price}}</view>
  229 +<!-- <view class="word-line xc-ash rmb">{{item.market_price}}</view>-->
230 230 <view class="fs24 t-r">
231 231 <span>评论{{item.comment_count}}</span>
232 232 <span class="pdl30">已售{{item.sales_sum}}</span>
... ... @@ -238,7 +238,7 @@
238 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   - <view class="word-line xc-ash mk_price rmb">{{item.market_price}}</view>
  241 +<!-- <view class="word-line xc-ash mk_price rmb">{{item.market_price}}</view>-->
242 242 </view>
243 243 <view class="comment">
244 244 <view class="flex ai-center">
... ... @@ -257,7 +257,7 @@
257 257 <block wx:else>
258 258 <view>
259 259 <view class="price rmb">{{item.shop_price}}</view>
260   - <view class="word-line xc-ash rmb">{{item.market_price}}</view>
  260 +<!-- <view class="word-line xc-ash rmb">{{item.market_price}}</view>-->
261 261 </view>
262 262 <!-- <view class="price">￥{{item.shop_price}}</view> -->
263 263 <view class="comment pdt10">
... ... @@ -272,7 +272,7 @@
272 272 <view wx:else>
273 273 <view class="">
274 274 <view class="price rmb">{{item.shop_price}}</view>
275   - <view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>
  275 +<!-- <view class="word-line xc-ash rmb fs24 mgl10">{{item.market_price}}</view>-->
276 276 </view>
277 277  
278 278 <view class="comment pdt10">
... ...
pages/goods/search/search.wxml
  View file @c81cad6
... ... @@ -91,7 +91,7 @@
91 91 <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
92 92 </view>
93 93 <view class="comment flex jc_sb">
94   - <view class="word-line xc-ash">￥{{item.market_price}}</view>
  94 +<!-- <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
95 95 <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
96 96 </view>
97 97 </block>
... ... @@ -111,14 +111,14 @@
111 111 </view>
112 112 </view>
113 113 <view class="comment flex jc_sb">
114   - <view class="word-line xc-ash">￥{{item.market_price}}</view>
  114 +<!-- <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
115 115 <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
116 116 </view>
117 117 </block>
118 118 <block wx:else>
119 119 <view class="price">￥{{item.shop_price}}</view>
120 120 <view class="comment flex jc_sb">
121   - <view class="word-line xc-ash">￥{{item.market_price}}</view>
  121 +<!-- <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
122 122 <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
123 123 </view>
124 124 </block>
... ... @@ -127,7 +127,7 @@
127 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   - <view class="word-line xc-ash mk_price">￥{{item.market_price}}</view>
  130 +<!-- <view class="word-line xc-ash mk_price">￥{{item.market_price}}</view>-->
131 131 </view>
132 132 <view class="comment flex jc_sb">
133 133 <view class="flex ai_center">
... ... @@ -145,7 +145,7 @@
145 145 <block wx:else>
146 146 <view class="price">￥{{item.shop_price}}</view>
147 147 <view class="comment flex jc_sb">
148   - <view class="word-line xc-ash">￥{{item.market_price}}</view>
  148 +<!-- <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
149 149 <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
150 150 </view>
151 151 </block>
... ... @@ -154,7 +154,7 @@
154 154 <block wx:else>
155 155 <view class="price">￥{{item.shop_price}}</view>
156 156 <view class="comment flex jc_sb">
157   - <view class="word-line xc-ash">￥{{item.market_price}}</view>
  157 +<!-- <view class="word-line xc-ash">￥{{item.market_price}}</view>-->
158 158 <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
159 159 </view>
160 160 </block>
... ...
pages/index/index/index.wxml
  View file @c81cad6
... ... @@ -185,7 +185,7 @@
185 185 <!-- <view class="red-co mar-top10 is_seckill_height"> -->
186 186 <view class="co-red mar-top10">
187 187 <text class="fs20">￥</text>{{aitem.price}}
188   - <text class="un_line">￥{{aitem.market_price}}</text>
  188 +<!-- <text class="un_line">￥{{aitem.shop_price}}</text>-->
189 189 </view>
190 190 </navigator>
191 191  
... ... @@ -227,7 +227,7 @@
227 227 <view class="co-red mar-top10 flex jc_sb ali-c">
228 228 <view>
229 229 <text><text class="fs20">￥</text>{{aitem.presell_price}}</text>
230   - <text class="un_line">￥{{aitem.market_price}}</text>
  230 +<!-- <text class="un_line">￥{{aitem.shop_price}}</text>-->
231 231 </view>
232 232 <view class="btn-buy">去抢购</view>
233 233 </view>
... ... @@ -264,7 +264,7 @@
264 264 <view>
265 265 <view class="flex ai-center">
266 266 <text class="rmb c-red">{{filter.price(item.group_price)}}</text>
267   - <view class="del fs22 c-a pdl10">零售价:<text class="rmb">{{item.market_price}}</text></view>
  267 +<!-- <view class="del fs22 c-a pdl10"><text class="rmb">{{item.shop_price}}</text></view>-->
268 268 </view>
269 269 <view class="flex jc_sb">
270 270 <progress class="pdr20 f1 progress" percent="{{filter.percent(item.num, item.group_num)}}" activeColor="#FF6768" backgroundColor="#d0d0d0" border-radius="12" stroke-width="12" data-content="{{item.num}}人已参团"></progress>
... ... @@ -350,7 +350,7 @@
350 350 <view class="fs40 flex xc-top15 {{aitem.is_team_tepy==0?'blue_c ai-bas':' red-co ai-bas'}}">
351 351 <text class="fs28 {{aitem.is_team_tepy==0?'martop4':''}}">￥</text>
352 352 <text style="margin-left:-5rpx">{{aitem.price}}</text>
353   - <span class="underline {{type==0?'martop18':''}}">零售价￥{{aitem.market_price}}</span>
  353 +<!-- <span class="underline {{type==0?'martop18':''}}">￥{{aitem.shop_price}}</span>-->
354 354 </view>
355 355  
356 356 </view>
... ...
pages/index/index/index.wxss
  View file @c81cad6
... ... @@ -11,6 +11,7 @@ page {
11 11 width: 100%;
12 12 height: 100%;
13 13 overflow-y: auto;
  14 + overflow-x: hidden;
14 15 }
15 16  
16 17 .pink-b {
... ...
pages/user/address_list/address_list.wxml
  View file @c81cad6
1   -
2 1 <!-- 无收货地址提醒页面 -->
3 2 <view class="topbcolor"></view>
4 3 <view class="nothing" wx:if="{{is_address_read && addresses.length<=0}}">
5   - <view class="image flex-level">
6   - <image src="{{iurl}}/miniapp/images/nothingaddress.png"></image>
7   - </view>
  4 + <view class="image flex-level">
  5 + <image src="{{iurl}}/miniapp/images/nothingaddress.png"></image>
  6 + </view>
  7 +
  8 + <view class="nothingaddress flex-level">
  9 + <view>暂无收货地址</view>
  10 + </view>
  11 +
  12 + <view class="address flex jc_sb" style="width:76%; margin-left:12%">
8 13  
9   - <view class="nothingaddress flex-level">
10   - <view>暂无收货地址</view>
11   - </view>
  14 + <navigator bindtap="get_wx" class="ye">
  15 + <view class="add">+</view>
  16 + <view class="addAddress">获取微信地址</view>
  17 + </navigator>
12 18  
13   - <view class="address flex jc_sb" style="width:76%; margin-left:12%">
14   -
15   - <navigator bindtap="get_wx" class="ye">
16   - <view class="add">+</view>
17   - <view class="addAddress">获取微信地址</view>
18   - </navigator>
19   -
20   - <navigator bindtap="go_url" data-url="/pages/user/add_address/add_address">
21   - <view class="add">+</view>
22   - <view class="addAddress">新建收货地址</view>
23   - </navigator>
  19 + <navigator bindtap="go_url" data-url="/pages/user/add_address/add_address">
  20 + <view class="add">+</view>
  21 + <view class="addAddress">新建收货地址</view>
  22 + </navigator>
24 23  
25 24  
26   - </view>
  25 + </view>
27 26 </view>
28 27  
29   -<!-- 收货地址页面集合框架 -->
  28 + <!-- 收货地址页面集合框架 -->
30 29 <view class="container" wx:if="{{addresses.length>0}}">
31   - <!-- 所有的收货地址框架 -->
32   - <view class="address-box">
  30 + <!-- 所有的收货地址框架 -->
  31 + <view class="address-box">
33 32  
34   - <!-- 单个收货地址框架 -->
35   - <view class="address-user" wx:for="{{addresses}}" wx:key="index">
36   - <!-- 选择icon
37   - <view class="icon">
38   - <icon type="success" color="red" size="33rpx" wx:if="{{item.is_pickup==1}}" bindtap="add_is_pickup" data-icon="{{index}}"></icon>
39   - <icon class="no_xuanze" color="white" wx:if="{{item.is_pickup==0}}" bindtap="add_is_pickup" data-icon="{{index}}"></icon>
40   - </view>-->
41   -
42   - <!-- 收货地址全部信息 -->
43   - <view class="address" bindtap="add_is_pickup" data-ind="{{index}}" >
44   - <!-- 个人直接信息 -->
45   - <view class="user">
46   - <!-- 名字 -->
47   - <view class="userName">{{item.consignee}}</view>
48   - <!-- 电话 -->
49   - <view class="userPhone">{{item.mobile}}</view>
50   - <view class="default" wx:if="{{item.is_default}}">默认地址</view>
51   - </view>
  33 + <!-- 单个收货地址框架 -->
  34 + <view class="address-user" wx:for="{{addresses}}" wx:key="index">
  35 + <!-- 选择icon
  36 + <view class="icon">
  37 + <icon type="success" color="red" size="33rpx" wx:if="{{item.is_pickup==1}}" bindtap="add_is_pickup" data-icon="{{index}}"></icon>
  38 + <icon class="no_xuanze" color="white" wx:if="{{item.is_pickup==0}}" bindtap="add_is_pickup" data-icon="{{index}}"></icon>
  39 + </view>-->
52 40  
53   - <!-- 收货地址 -->
54   - <view class="ShippingAddress ellipsis-2 ">{{item.more_address}} {{item.address}}</view>
55   - </view>
  41 + <!-- 收货地址全部信息 -->
  42 + <view class="address" bindtap="add_is_pickup" data-ind="{{index}}">
  43 + <!-- 个人直接信息 -->
  44 + <view class="user">
  45 + <!-- 名字 -->
  46 + <view class="userName">{{item.consignee}}</view>
  47 + <!-- 电话 -->
  48 + <view class="userPhone">{{item.mobile}}</view>
  49 + <view class="default" wx:if="{{item.is_default}}">默认地址</view>
  50 + </view>
56 51  
57   - <!-- 编辑地址图片 -->
58   - <view class="edit" bindtap="editAddress" data-id="{{item.address_id}}">
59   - <image src="{{iurl}}/miniapp/images/dpr.png"></image>
60   - </view>
61   - </view>
  52 + <!-- 收货地址 -->
  53 + <view class="ShippingAddress ellipsis-2 ">{{item.more_address}} {{item.address}}</view>
  54 + </view>
  55 +
  56 + <!-- 编辑地址图片 -->
  57 + <view class="edit" bindtap="editAddress" data-id="{{item.address_id}}">
  58 + <image src="{{iurl}}/miniapp/images/dpr.png"></image>
  59 + </view>
  60 + </view>
62 61  
63   - </view>
  62 + </view>
  63 + <view style="height:210rpx"></view>
64 64  
65   - <!-- 新建收货地址 -->
  65 + <!-- 新建收货地址 -->
66 66 <view class="new flex jc_sb">
67   - <navigator bindtap="get_wx" class="ye">
68   - <view class="add">+</view>
69   - <view class="addAddress">获取微信地址</view>
70   - </navigator>
71   -
72   - <navigator bindtap="go_url" data-url="/pages/user/add_address/add_address">
73   - <view class="add">+</view>
74   - <view class="addAddress">新建收货地址</view>
75   - </navigator>
  67 + <navigator bindtap="get_wx" class="ye">
  68 + <view class="add">+</view>
  69 + <view class="addAddress">获取微信地址</view>
  70 + </navigator>
  71 +
  72 + <navigator bindtap="go_url" data-url="/pages/user/add_address/add_address">
  73 + <view class="add">+</view>
  74 + <view class="addAddress">新建收货地址</view>
  75 + </navigator>
76 76 </view>
77 77 </view>
78 78 <warn id="warn"></warn>
79 79 \ No newline at end of file
... ...