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

后端研发-倪永富
2 parents 7b88d81d 92468b80
Showing 11 changed files with 116 additions and 54 deletions
components/diy_goodsGroup/diy_goodsGroup.js
components/diy_goodsGroup/g_filter.wxs
components/goods_list/goods_list.js
packageA/pages/activity_share/activity_share.js
packageA/pages/activity_share/activity_share.wxml
packageA/pages/goods_share/goods_share.js
packageA/pages/goods_share/goods_share.wxml
packageA/pages/goods_share/goods_share.wxss
pages/goods/categoryList/categoryList.wxml
pages/goods/goodsList/goodsList.js
pages/goods/search/search.js
@@ -316,13 +316,24 @@ Component({
 	    var arr = [1219, 2089, 3031];
 	    var new_arr = new Array();
 	    var card_name_map = new Map();
-	    for (var i = 0; i < plusCard.length; i++) {
-	      var name = "card" + plusCard[i].CorrPrice.toLowerCase();
-	      card_name_map.set(name, plusCard[i].CardName);
-	    }
+		
+		  var user = getApp().globalData.userInfo;
+		  
+		  if(plusCard) {
+		
+			for (var i = 0; i < plusCard.length; i++) {
+			  if ((!user || user.card_field == null || user.card_field == "") && (plusCard[i].IsStopBuy == true)) {
+				continue;
+			  }
+				
+			  var name = "card" + plusCard[i].CorrPrice.toLowerCase();
+			  card_name_map.set(name, plusCard[i].CardName);
+			  new_arr.push(plusCard[i]);
+			}
+		  }
 	    var ob = {
-	      "card_list": plusCard,
+	      "card_list": new_arr,
 	      "name_map": card_name_map
 	    };
 	    func(ob);
@@ -47,6 +47,7 @@ var g_filters = {
 			     //---设置对应的价格名字----
 				 for(var i=0;i<3;i++) {
 					var vl=all_card[i];
+					if(!vl) continue;			
 					if(vl['CorrPrice']=="Price1" && price1>0)
 					{
 					   if(min_price==null) {
@@ -159,7 +159,7 @@ Component({
           var user = getApp().globalData.userInfo;
           if(plusCard) {
             for (var i = 0; i < plusCard.length; i++) {
-              if (user && (user.card_field == null || user.card_field == "") && (plusCard[i].IsStopBuy == true)) {
+              if ((!user || user.card_field == null || user.card_field == "") && (plusCard[i].IsStopBuy == true)) {
                 continue;
               }
               var name = "card" + plusCard[i].CorrPrice.toLowerCase();
@@ -225,7 +225,7 @@ Page({
 	clickTab2(e) {
 		if(this.data.currentIndex2!=e.target.dataset.index){
 			this.setData({
-				currentIndex2: e.target.dataset.index,is_no_data:0,is_no_more:0,list:[],
+				currentIndex2: e.target.dataset.index,is_no_data:0,is_no_more:0,list:[],list2:[]
 			});
 			this.data.is_load=0;
 			this.data.currentPage=1;	
@@ -53,7 +53,7 @@
 							<!-- 点击拼单时显示 -->
 							<view class="flex pdtb6" wx:if="{{currentIndex == 1}}">
 								<view class="group-num">已拼{{item.buy_num}}份</view>
-								<view class="group-type">1人团</view>
+								<view class="group-type">{{item.ct_num}}人团</view>
 							</view>
 							<!-- 公共项 -->
 							<view class="fs22 red">剩余:
@@ -153,9 +153,9 @@
 				<block wx:if="{{currentIndex2 == 1}}">
 					<view class="pdv20 dash-b fs28" bindtap="go_coll_good" data-gid="{{hui_active.main_goods_id}}">
 						<view class="popup-title2">必买商品</view>
-						<view class="popup-title3">商品编号：{{hui_active.goods_sn}}</view>
-						<view class="popup-title3">{{hui_active.main_goods_name}}</view>
-						<view class="popup-title3 red">手店价：￥{{g_filter.toFix(hui_active.ginfo.shop_price,2)}}</view>
+						<view class="popup-title3">商品编号：{{hui_active.ginfo.goods_sn}}</view>
+						<view class="popup-title3">商品名称：{{hui_active.main_goods_name}}</view>
+						<view class="popup-title3">手店价：<text class="red">￥{{g_filter.toFix(hui_active.ginfo.shop_price,2)}}</text></view>
 					</view>
 					<view class="pdv20">
 						<view class="popup-title2 fs28">搭配商品</view>
@@ -96,28 +96,32 @@ Page({
      			  var sw_arr=JSON.parse(swithc_list);
      			  //---如果后台又开等级卡的开关---
      			  if(sw_arr.rank_switch && sw_arr.rank_switch=="2"){
-     					th.setData({rank_switch:true});	
-     					var user=getApp().globalData.userInfo;	
-     					var ti=setInterval(function(){
-     						  if(!user) return false;
-     						  clearInterval(ti);
+     				    	  th.setData({rank_switch:true});	
+     					      var user=getApp().globalData.userInfo;	
+    					
      						  //---回调卡的列表---
      						  th.getPlusCardType(function(ob){
-     							   th.setData({card_list:ob.card_list});				   
-     							   if(user.card_field ){
-     								  var str = user['card_expiredate'].replace(/-/g, '/');
-     								  var end = new Date(str);
-     								  end = Date.parse(end) / 1000;
-     								  var now = ut.gettimestamp();		  							  
-     								  //--- 判断是等级会员，且在有效期范围内 ---
-     								  if(user.card_field && now<end){
-     									var card_name=ob.name_map.get(user.card_field);									
-     									// if(card_name.length>4) card_name=card_name.substring(0,4);
-     									th.setData({card_field:user.card_field,card_name:card_name,card_list:ob.card_list});				 
-     								  }		
-     								}
-     						  })	
-     					},500)				
+     							   th.setData({card_list:ob.card_list});	
+												  
+									var ti=setInterval(function(){
+										        if(!user) return false;
+										        clearInterval(ti);			  
+												  
+											   if(user.card_field ){
+												  var str = user['card_expiredate'].replace(/-/g, '/');
+												  var end = new Date(str);
+												  end = Date.parse(end) / 1000;
+												  var now = ut.gettimestamp();		  							  
+												  //--- 判断是等级会员，且在有效期范围内 ---
+												  if(user.card_field && now<end){
+													var card_name=ob.name_map.get(user.card_field);									
+													// if(card_name.length>4) card_name=card_name.substring(0,4);
+													th.setData({card_field:user.card_field,card_name:card_name,card_list:ob.card_list});				 
+												  }		
+												}
+     						         },1000)	
+					         })		  
+     								
      			  }
      });
   },
@@ -277,7 +281,7 @@ Page({
 	     var card_name_map=new Map();
 	     var user = getApp().globalData.userInfo;
 	     for (var i = 0; i < plusCard.length; i++) {	   
-	      if ((user.card_field==null || user.card_field=="") && (plusCard[i].IsStopBuy==true)) {
+	      if ((!user || user.card_field==null || user.card_field=="") && (plusCard[i].IsStopBuy==true)) {
 	        continue;
 	      }   
 		  var name="card"+plusCard[i].CorrPrice.toLowerCase();
@@ -42,20 +42,37 @@
 					   data-errorimg="list[{{index}}].original_img"></image>					
 				</view>
 				<view class="details">
-					<view class="ellipsis-2 fs28 name">{{item.goods_name}}</view>					
-					<view class="red pdt14">￥{{item.shop_price}}
-					   <!-- 如果有等级卡的话 -->
-					   <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
-						     <!-- 当会员是等级卡的时候,且卡有钱的时候 -->
-						     <block wx:if="{{card_field  && item[card_field]>0}}">
-							     <text class="plus_show">PLUS</text>￥{{item[card_field]}}
-							 </block>
-							 <!-- 当会员不是等级卡的时候,且卡有钱的时候 -->
-							 <block wx:if="{{!card_field && g_filter.get_card_price(item,card_list,0)>0}}">
-								 <text class="plus_show">PLUS</text>￥{{g_filter.get_card_price(item,card_list,0)}}
-							 </block>							 
-					   </block>	   					 
-					 </view>
+					<view class="ellipsis-2 fs28 name">{{item.goods_name}}</view>	
+									
+					<view class="flex">												
+					   <view class="red pdt14">￥{{item.shop_price}}</view>
+					   <view class="txt_line">￥{{item.market_price}}</view>
+					</view>	
+										
+					<view class="flex ai-center">
+					<!-- 如果有等级卡的话 -->
+					<block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">											   
+						 <!-- 当会员是等级卡的时候,且卡有钱的时候 -->
+						 <block wx:if="{{card_field  && item[card_field]>0}}">
+							 <!-- <text class="plus_show">card_name</text>￥{{item[card_field]}} -->							
+							 <view class="card_bg ellipsis-1 flex ai-center">
+							   <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+							   <text class="card_name">{{card_name}}</text>
+							 </view>
+							 <view class="fs28">￥{{filter.toFix(item[card_field],2)}}</view>							 
+							 
+						 </block>
+						 <!-- 当会员不是等级卡的时候,且卡有钱的时候 -->
+						 <block wx:if="{{!card_field && g_filter.get_card_price(item,card_list,0)>0}}">						    
+							 <view class="card_bg ellipsis-1 flex ai-center">
+						       <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+						       <text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text>
+						     </view>
+							 <view class="fs28">￥{{g_filter.get_card_price(item,card_list,0)}}</view>	
+						 							
+						 </block>							 
+					</block>	   	
+					</view>
 					<view class="flex jc_sb fs24 pdt14">
 						<view class="gray">已售：<text class="red">{{item.sales_sum}}</text></view>
@@ -116,3 +116,28 @@ page {
 	margin-left: 10rpx;
 	margin-right: 5rpx;	
 }
+
+.card_bg {
+	box-sizing: border-box;
+  padding: 2rpx 10rpx;
+  height: 28rpx;
+  border-radius: 26rpx;
+  font-size: 18rpx;
+  line-height: 28rpx;
+	max-width: 210rpx;
+  background: #333;
+  color: #fff;
+  margin-left: 8rpx;
+}
+
+.card_bg image {
+  width: 19rpx;
+  height: 19rpx;
+  margin-right: 8rpx;
+}
+
+.txt_line{
+	    text-decoration: line-through; position: relative;
+	    top: 23rpx;color: #adadad;
+	    font-size: 24rpx; margin-left: 10rpx;
+	}
@@ -411,9 +411,13 @@
                         <view class="item-cont">
                           <view class="title">{{item.goods_name}}</view>
                             <!-- 判断是否有活动价 -->
-                            <block wx:if="{{item.prom_price>0}}">
+                            <block wx:if="{{item.prom_price>0 || item.prom_integral}}">
                                 <!-- 活动价 -->
-                                <view class="price">￥{{item.prom_price}}</view>
+                                <view class="price">
+									<text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text>
+									<text wx:if="{{item.prom_integral && item.prom_price}}">+</text> 
+									<text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text> 							
+								</view>
                                 <view class="comment flex jc_sb">
                                   <view class="word-line xc-ash">￥{{item.market_price}}</view>
                                   <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
@@ -16,8 +16,8 @@ Page({
         openFilterModal: !1,
         baseUrl: "/api/weshop/goods/page?1=1",
         requestUrl: "",
-        tabname:"goods_id",   //排序的字段
-        adname:"desc",        //升降的字段
+        tabname:"sort",   //排序的字段
+        adname:"asc",        //升降的字段
 		is_new:0,
 		is_hot:0,
         prom_goods_list:null,
@@ -257,7 +257,7 @@ Page({
         var card_name_map=new Map();
         var user = getApp().globalData.userInfo;
        for (var i = 0; i < plusCard.length; i++) {	   
-        if ((user.card_field==null || user.card_field=="") && (plusCard[i].IsStopBuy==true)) {
+        if ((!user || user.card_field==null || user.card_field=="") && (plusCard[i].IsStopBuy==true)) {
           continue;
         }   
   			var name="card"+plusCard[i].CorrPrice.toLowerCase();
@@ -19,8 +19,8 @@ Page({
         //hotWords: [ [ "手机", "小米", "iphone" ], [ "三星", "华为", "冰箱" ] ]
         hotWords: null,
-        tabname: "goods_id",   //排序的字段
-        adname: "desc",    //升降的字段
+        tabname: "sort",   //排序的字段
+        adname: "asc",    //升降的字段
         rq_data:null,
     },
     onLoad: function(t) {
@@ -240,7 +240,7 @@ Page({
         var user = getApp().globalData.userInfo;
         for (var i = 0; i < plusCard.length; i++) {
-          if ((user.card_field==null || user.card_field=="") && (plusCard[i].IsStopBuy==true)) {
+          if ((!user || user.card_field==null || user.card_field=="") && (plusCard[i].IsStopBuy==true)) {
             continue;
           }    
           var name="card"+plusCard[i].CorrPrice.toLowerCase();