wxd / MShopWeApp

Commit 1fe944912b2ac6e627807842898e8d9dd0c66f23

Authored by 后端研发-倪永富
2 parents 7b88d81d 92468b80

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

Inline Side-by-side
Showing 11 changed files with 116 additions and 54 deletions
components/diy_goodsGroup/diy_goodsGroup.js
  View file @1fe9449
... ... @@ -316,13 +316,24 @@ Component({
316 316 var arr = [1219, 2089, 3031];
317 317 var new_arr = new Array();
318 318 var card_name_map = new Map();
319   - for (var i = 0; i < plusCard.length; i++) {
320   - var name = "card" + plusCard[i].CorrPrice.toLowerCase();
321   - card_name_map.set(name, plusCard[i].CardName);
322   - }
  319 +
  320 + var user = getApp().globalData.userInfo;
  321 +
  322 + if(plusCard) {
  323 +
  324 + for (var i = 0; i < plusCard.length; i++) {
  325 + if ((!user || user.card_field == null || user.card_field == "") && (plusCard[i].IsStopBuy == true)) {
  326 + continue;
  327 + }
  328 +
  329 + var name = "card" + plusCard[i].CorrPrice.toLowerCase();
  330 + card_name_map.set(name, plusCard[i].CardName);
  331 + new_arr.push(plusCard[i]);
  332 + }
  333 + }
323 334  
324 335 var ob = {
325   - "card_list": plusCard,
  336 + "card_list": new_arr,
326 337 "name_map": card_name_map
327 338 };
328 339 func(ob);
... ...
components/diy_goodsGroup/g_filter.wxs
  View file @1fe9449
... ... @@ -47,6 +47,7 @@ var g_filters = {
47 47 //---设置对应的价格名字----
48 48 for(var i=0;i<3;i++) {
49 49 var vl=all_card[i];
  50 + if(!vl) continue;
50 51 if(vl['CorrPrice']=="Price1" && price1>0)
51 52 {
52 53 if(min_price==null) {
... ...
components/goods_list/goods_list.js
  View file @1fe9449
... ... @@ -159,7 +159,7 @@ Component({
159 159 var user = getApp().globalData.userInfo;
160 160 if(plusCard) {
161 161 for (var i = 0; i < plusCard.length; i++) {
162   - if (user && (user.card_field == null || user.card_field == "") && (plusCard[i].IsStopBuy == true)) {
  162 + if ((!user || user.card_field == null || user.card_field == "") && (plusCard[i].IsStopBuy == true)) {
163 163 continue;
164 164 }
165 165 var name = "card" + plusCard[i].CorrPrice.toLowerCase();
... ...
packageA/pages/activity_share/activity_share.js
  View file @1fe9449
... ... @@ -225,7 +225,7 @@ Page({
225 225 clickTab2(e) {
226 226 if(this.data.currentIndex2!=e.target.dataset.index){
227 227 this.setData({
228   - currentIndex2: e.target.dataset.index,is_no_data:0,is_no_more:0,list:[],
  228 + currentIndex2: e.target.dataset.index,is_no_data:0,is_no_more:0,list:[],list2:[]
229 229 });
230 230 this.data.is_load=0;
231 231 this.data.currentPage=1;
... ...
packageA/pages/activity_share/activity_share.wxml
  View file @1fe9449
... ... @@ -53,7 +53,7 @@
53 53 <!-- 点击拼单时显示 -->
54 54 <view class="flex pdtb6" wx:if="{{currentIndex == 1}}">
55 55 <view class="group-num">已拼{{item.buy_num}}份</view>
56   - <view class="group-type">1人团</view>
  56 + <view class="group-type">{{item.ct_num}}人团</view>
57 57 </view>
58 58 <!-- 公共项 -->
59 59 <view class="fs22 red">剩余:
... ... @@ -153,9 +153,9 @@
153 153 <block wx:if="{{currentIndex2 == 1}}">
154 154 <view class="pdv20 dash-b fs28" bindtap="go_coll_good" data-gid="{{hui_active.main_goods_id}}">
155 155 <view class="popup-title2">必买商品</view>
156   - <view class="popup-title3">商品编号：{{hui_active.goods_sn}}</view>
157   - <view class="popup-title3">{{hui_active.main_goods_name}}</view>
158   - <view class="popup-title3 red">手店价：￥{{g_filter.toFix(hui_active.ginfo.shop_price,2)}}</view>
  156 + <view class="popup-title3">商品编号：{{hui_active.ginfo.goods_sn}}</view>
  157 + <view class="popup-title3">商品名称：{{hui_active.main_goods_name}}</view>
  158 + <view class="popup-title3">手店价：<text class="red">￥{{g_filter.toFix(hui_active.ginfo.shop_price,2)}}</text></view>
159 159 </view>
160 160 <view class="pdv20">
161 161 <view class="popup-title2 fs28">搭配商品</view>
... ...
packageA/pages/goods_share/goods_share.js
  View file @1fe9449
... ... @@ -96,28 +96,32 @@ Page({
96 96 var sw_arr=JSON.parse(swithc_list);
97 97 //---如果后台又开等级卡的开关---
98 98 if(sw_arr.rank_switch && sw_arr.rank_switch=="2"){
99   - th.setData({rank_switch:true});
100   - var user=getApp().globalData.userInfo;
101   - var ti=setInterval(function(){
102   - if(!user) return false;
103   - clearInterval(ti);
  99 + th.setData({rank_switch:true});
  100 + var user=getApp().globalData.userInfo;
  101 +
104 102 //---回调卡的列表---
105 103 th.getPlusCardType(function(ob){
106   - th.setData({card_list:ob.card_list});
107   - if(user.card_field ){
108   - var str = user['card_expiredate'].replace(/-/g, '/');
109   - var end = new Date(str);
110   - end = Date.parse(end) / 1000;
111   - var now = ut.gettimestamp();
112   - //--- 判断是等级会员，且在有效期范围内 ---
113   - if(user.card_field && now<end){
114   - var card_name=ob.name_map.get(user.card_field);
115   - // if(card_name.length>4) card_name=card_name.substring(0,4);
116   - th.setData({card_field:user.card_field,card_name:card_name,card_list:ob.card_list});
117   - }
118   - }
119   - })
120   - },500)
  104 + th.setData({card_list:ob.card_list});
  105 +
  106 + var ti=setInterval(function(){
  107 + if(!user) return false;
  108 + clearInterval(ti);
  109 +
  110 + if(user.card_field ){
  111 + var str = user['card_expiredate'].replace(/-/g, '/');
  112 + var end = new Date(str);
  113 + end = Date.parse(end) / 1000;
  114 + var now = ut.gettimestamp();
  115 + //--- 判断是等级会员，且在有效期范围内 ---
  116 + if(user.card_field && now<end){
  117 + var card_name=ob.name_map.get(user.card_field);
  118 + // if(card_name.length>4) card_name=card_name.substring(0,4);
  119 + th.setData({card_field:user.card_field,card_name:card_name,card_list:ob.card_list});
  120 + }
  121 + }
  122 + },1000)
  123 + })
  124 +
121 125 }
122 126 });
123 127 },
... ... @@ -277,7 +281,7 @@ Page({
277 281 var card_name_map=new Map();
278 282 var user = getApp().globalData.userInfo;
279 283 for (var i = 0; i < plusCard.length; i++) {
280   - if ((user.card_field==null || user.card_field=="") && (plusCard[i].IsStopBuy==true)) {
  284 + if ((!user || user.card_field==null || user.card_field=="") && (plusCard[i].IsStopBuy==true)) {
281 285 continue;
282 286 }
283 287 var name="card"+plusCard[i].CorrPrice.toLowerCase();
... ...
packageA/pages/goods_share/goods_share.wxml
  View file @1fe9449
... ... @@ -42,20 +42,37 @@
42 42 data-errorimg="list[{{index}}].original_img"></image>
43 43 </view>
44 44 <view class="details">
45   - <view class="ellipsis-2 fs28 name">{{item.goods_name}}</view>
46   - <view class="red pdt14">￥{{item.shop_price}}
47   - <!-- 如果有等级卡的话 -->
48   - <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
49   - <!-- 当会员是等级卡的时候,且卡有钱的时候 -->
50   - <block wx:if="{{card_field && item[card_field]>0}}">
51   - <text class="plus_show">PLUS</text>￥{{item[card_field]}}
52   - </block>
53   - <!-- 当会员不是等级卡的时候,且卡有钱的时候 -->
54   - <block wx:if="{{!card_field && g_filter.get_card_price(item,card_list,0)>0}}">
55   - <text class="plus_show">PLUS</text>￥{{g_filter.get_card_price(item,card_list,0)}}
56   - </block>
57   - </block>
58   - </view>
  45 + <view class="ellipsis-2 fs28 name">{{item.goods_name}}</view>
  46 +
  47 + <view class="flex">
  48 + <view class="red pdt14">￥{{item.shop_price}}</view>
  49 + <view class="txt_line">￥{{item.market_price}}</view>
  50 + </view>
  51 +
  52 + <view class="flex ai-center">
  53 + <!-- 如果有等级卡的话 -->
  54 + <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
  55 + <!-- 当会员是等级卡的时候,且卡有钱的时候 -->
  56 + <block wx:if="{{card_field && item[card_field]>0}}">
  57 + <!-- <text class="plus_show">card_name</text>￥{{item[card_field]}} -->
  58 + <view class="card_bg ellipsis-1 flex ai-center">
  59 + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
  60 + <text class="card_name">{{card_name}}</text>
  61 + </view>
  62 + <view class="fs28">￥{{filter.toFix(item[card_field],2)}}</view>
  63 +
  64 + </block>
  65 + <!-- 当会员不是等级卡的时候,且卡有钱的时候 -->
  66 + <block wx:if="{{!card_field && g_filter.get_card_price(item,card_list,0)>0}}">
  67 + <view class="card_bg ellipsis-1 flex ai-center">
  68 + <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
  69 + <text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text>
  70 + </view>
  71 + <view class="fs28">￥{{g_filter.get_card_price(item,card_list,0)}}</view>
  72 +
  73 + </block>
  74 + </block>
  75 + </view>
59 76  
60 77 <view class="flex jc_sb fs24 pdt14">
61 78 <view class="gray">已售：<text class="red">{{item.sales_sum}}</text></view>
... ...
packageA/pages/goods_share/goods_share.wxss
  View file @1fe9449
... ... @@ -116,3 +116,28 @@ page {
116 116 margin-left: 10rpx;
117 117 margin-right: 5rpx;
118 118 }
  119 +
  120 +.card_bg {
  121 + box-sizing: border-box;
  122 + padding: 2rpx 10rpx;
  123 + height: 28rpx;
  124 + border-radius: 26rpx;
  125 + font-size: 18rpx;
  126 + line-height: 28rpx;
  127 + max-width: 210rpx;
  128 + background: #333;
  129 + color: #fff;
  130 + margin-left: 8rpx;
  131 +}
  132 +
  133 +.card_bg image {
  134 + width: 19rpx;
  135 + height: 19rpx;
  136 + margin-right: 8rpx;
  137 +}
  138 +
  139 +.txt_line{
  140 + text-decoration: line-through; position: relative;
  141 + top: 23rpx;color: #adadad;
  142 + font-size: 24rpx; margin-left: 10rpx;
  143 + }
... ...
pages/goods/categoryList/categoryList.wxml
  View file @1fe9449
... ... @@ -411,9 +411,13 @@
411 411 <view class="item-cont">
412 412 <view class="title">{{item.goods_name}}</view>
413 413 <!-- 判断是否有活动价 -->
414   - <block wx:if="{{item.prom_price>0}}">
  414 + <block wx:if="{{item.prom_price>0 || item.prom_integral}}">
415 415 <!-- 活动价 -->
416   - <view class="price">￥{{item.prom_price}}</view>
  416 + <view class="price">
  417 + <text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text>
  418 + <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>
  419 + <text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text>
  420 + </view>
417 421 <view class="comment flex jc_sb">
418 422 <view class="word-line xc-ash">￥{{item.market_price}}</view>
419 423 <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
... ...
pages/goods/goodsList/goodsList.js
  View file @1fe9449
... ... @@ -16,8 +16,8 @@ Page({
16 16 openFilterModal: !1,
17 17 baseUrl: "/api/weshop/goods/page?1=1",
18 18 requestUrl: "",
19   - tabname:"goods_id", //排序的字段
20   - adname:"desc", //升降的字段
  19 + tabname:"sort", //排序的字段
  20 + adname:"asc", //升降的字段
21 21 is_new:0,
22 22 is_hot:0,
23 23 prom_goods_list:null,
... ... @@ -257,7 +257,7 @@ Page({
257 257 var card_name_map=new Map();
258 258 var user = getApp().globalData.userInfo;
259 259 for (var i = 0; i < plusCard.length; i++) {
260   - if ((user.card_field==null || user.card_field=="") && (plusCard[i].IsStopBuy==true)) {
  260 + if ((!user || user.card_field==null || user.card_field=="") && (plusCard[i].IsStopBuy==true)) {
261 261 continue;
262 262 }
263 263 var name="card"+plusCard[i].CorrPrice.toLowerCase();
... ...
pages/goods/search/search.js
  View file @1fe9449
... ... @@ -19,8 +19,8 @@ Page({
19 19 //hotWords: [ [ "手机", "小米", "iphone" ], [ "三星", "华为", "冰箱" ] ]
20 20 hotWords: null,
21 21  
22   - tabname: "goods_id", //排序的字段
23   - adname: "desc", //升降的字段
  22 + tabname: "sort", //排序的字段
  23 + adname: "asc", //升降的字段
24 24 rq_data:null,
25 25 },
26 26 onLoad: function(t) {
... ... @@ -240,7 +240,7 @@ Page({
240 240 var user = getApp().globalData.userInfo;
241 241  
242 242 for (var i = 0; i < plusCard.length; i++) {
243   - if ((user.card_field==null || user.card_field=="") && (plusCard[i].IsStopBuy==true)) {
  243 + if ((!user || user.card_field==null || user.card_field=="") && (plusCard[i].IsStopBuy==true)) {
244 244 continue;
245 245 }
246 246 var name="card"+plusCard[i].CorrPrice.toLowerCase();
... ...