wxd / MShopWeApp

Commit 9bc21183aab30b6491b9a47a9d55ae69fe9bc00a

Authored by yvan.ni
1 parent 686e1217

OA单的优化

Inline Side-by-side
Showing 12 changed files with 81 additions and 42 deletions
packageA/pages/myGift/myGift.js
  View file @9bc2118
... ... @@ -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 @9bc2118
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 @9bc2118
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 @9bc2118
... ... @@ -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>
... ...
packageB/pages/user/collect_list/collect_list.wxml
  View file @9bc2118
... ... @@ -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 @9bc2118
... ... @@ -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;
... ...
pages/giftpack/buygiftpack/giftpackbuy.wxml
  View file @9bc2118
... ... @@ -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 @9bc2118
... ... @@ -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.wxml
  View file @9bc2118
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 @9bc2118
... ... @@ -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/goodsList/goodsList.wxml
  View file @9bc2118
... ... @@ -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 @9bc2118
... ... @@ -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>
... ...