From 80914ccf6c6194cad200d382fe87f785f982c987 Mon Sep 17 00:00:00 2001
From: taiyuan <taiyuan@yolipai.com>
Date: Tue, 13 Apr 2021 11:06:35 +0800
Subject: [PATCH] 分销-上下架商品商品价格显示问题修改

---
 packageA/pages/distribution/goods/g_filter.wxs |  69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 packageA/pages/distribution/goods/goods.js     | 103 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 packageA/pages/distribution/goods/goods.wxml   | 131 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----------------------------------------------------------------
 packageA/pages/distribution/goods/goods.wxss   |  23 +++++++++++++++++++++++
 packageA/pages/distribution/shop/shop.js       |  23 ++++++++++++++++++++++-
 packageA/pages/distribution/shop/shop.wxml     |  58 +++++++++++++++++++++++++++++-----------------------------
 6 files changed, 311 insertions(+), 96 deletions(-)
 create mode 100644 packageA/pages/distribution/goods/g_filter.wxs

diff --git a/packageA/pages/distribution/goods/g_filter.wxs b/packageA/pages/distribution/goods/g_filter.wxs
new file mode 100644
index 0000000..608fb4d
--- /dev/null
+++ b/packageA/pages/distribution/goods/g_filter.wxs
@@ -0,0 +1,69 @@
+var g_filters = {
+	    //-- 判断是不是有等级价 --
+	    is_has_rank:function(rank_switch,item){
+	    	 if(!rank_switch) return false;
+	    	 if(item.cardprice1 || item.cardprice2 || item.cardprice3) {return true}
+	    	 return false;	 
+	    },
+       	
+	    //-- 判断,不是等级会员时候，要显示的最低等级价和名称 --
+		get_card_price:function(goods,all_card,type){		
+			     var price1=parseFloat(goods['cardprice1']);
+           var price2 = parseFloat(goods['cardprice2']);
+           var price3 = parseFloat(goods['cardprice3']);					   
+			     if(!all_card){
+			         if(type==0) return 0;
+			         return "";
+			     }	  
+				 
+			     var min_price=null;
+				 var min_name=null;	   
+			     //---设置对应的价格名字----	   
+				 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) {
+						     min_price=price1;min_name=vl['CardName'];
+					   }
+					   else if(price1<min_price) {
+							min_price=price1;min_name=vl['CardName'];					  
+					   }
+					}
+					if(vl['CorrPrice']=="Price2" && price2>0)
+					{
+						if(min_price==null) {
+							min_price=price2;min_name=vl['CardName'];
+						}
+						else if(price2<min_price) {
+							min_price=price2;min_name=vl['CardName'];					  
+						}					
+					}
+											
+					if(vl['CorrPrice']=="Price3" && price3>0)
+					{						
+						if(min_price==null) {
+							min_price=price3;min_name=vl['CardName'];
+						}
+						else if(price3<min_price) {
+							min_price=price3;min_name=vl['CardName'];					  
+						}
+					}
+														
+				 } 
+				 if(min_price==null){
+					 if(type==0) return 0;
+					 return "";
+				 }	
+				 			   
+			     if(type==0) return min_price;	
+				 if(min_name.length>4 )	min_name=min_name.substring(0, 8);	 
+			     return min_name;
+		},
+}
+module.exports = {
+	  is_has_rank:g_filters.is_has_rank,
+	  get_card_price:g_filters.get_card_price,   
+}
\ No newline at end of file
diff --git a/packageA/pages/distribution/goods/goods.js b/packageA/pages/distribution/goods/goods.js
index 776cee7..02b424c 100644
--- a/packageA/pages/distribution/goods/goods.js
+++ b/packageA/pages/distribution/goods/goods.js
@@ -1,6 +1,8 @@
 // packageA//pages/distribution/commision/commision.js
 const app =  getApp();
 let self = null;
+var  os = app.globalData.setting,
+ut = require("../../../../utils/util.js");
 
 Page({
 
@@ -28,6 +30,7 @@ Page({
 		currentQuery: {
 			store_id: app.globalData.setting.stoid,
 		},
+		default_img: '/miniapp/images/default_g_img.gif',
   },
 
   /**
@@ -121,6 +124,61 @@ Page({
 						brandList: res.data.data,
 					});
 				});
+				
+				
+				
+				//更新一下会员的信息
+				if(getApp().globalData.user_id) {
+					 // if(!getApp().globalData.userInfo['is_distribut']){
+						//  this.setData({ishidden_comise:1})
+					 // }			
+					 getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, {
+					   isShowLoading:false,  
+					   success: function (e) {
+						 getApp().globalData.userInfo = e.data.data;
+						 getApp().getConfig2(function (e) {
+						   var swithc_list = e.switch_list;
+						   var sw_arr = JSON.parse(swithc_list);
+						   //---如果后台有开等级卡的开关---
+						   if (sw_arr.rank_switch && sw_arr.rank_switch == "2") {
+							 self.setData({
+							   rank_switch: true
+							 });
+							 //---回调卡的列表---
+							 self.getPlusCardType(function (ob) {
+							   self.setData({
+								 card_list: ob.card_list
+							   });
+							   var ti = setInterval(function () {
+								 var user = getApp().globalData.userInfo;
+								 if (!user) return false;
+								 clearInterval(ti);
+								 if (user.card_field && user['card_expiredate']) {
+								   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, 8);
+									 self.setData({
+									   card_field: user.card_field,
+									   card_name: card_name,
+									   card_list: ob.card_list
+									 });
+								   }
+								 }
+							   }, 500)
+							 })
+						   }
+						 })
+					   }
+					 })
+				 }
+				 
+				 
+				 
 			};
 		};
   },
@@ -584,6 +642,7 @@ Page({
 				storeId: app.globalData.setting.stoid,
 				userId: app.globalData.user_id,
 				goods: checkedList,
+				searchtype: 2,
 			},
 		}).then(function(res) {
 			if(res.data.code == 0) {
@@ -772,5 +831,47 @@ Page({
 			price: null,
 			inputVal: null,
 		});
-	}
+	},
+	
+	
+	//--- 获取卡类列表 ---
+	getPlusCardType: function (func) {
+	  var storid = os.stoid;
+	  var th = this;
+	  getApp().request.promiseGet("/api/weshop/plus/vip/mem/bership/list?" + "storeId=" + storid,
+	    {}).then(res => {
+	
+	      if(res.data.code!=0 || !res.data.data){
+	        var ob = {
+	            "card_list": [],
+	            "name_map": ""
+	        };
+	        func(ob);
+	        return false;
+	      }
+	
+	      var plusCard = res.data.data;
+	      var arr = [1219, 2089, 3031];
+	      var new_arr = new Array();
+	      var card_name_map = new Map();
+	
+	      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": new_arr,
+	        "name_map": card_name_map
+	      };
+	      func(ob);
+	    })
+	},
 })
\ No newline at end of file
diff --git a/packageA/pages/distribution/goods/goods.wxml b/packageA/pages/distribution/goods/goods.wxml
index 4d6b65b..40f9a57 100644
--- a/packageA/pages/distribution/goods/goods.wxml
+++ b/packageA/pages/distribution/goods/goods.wxml
@@ -1,4 +1,5 @@
 <wxs src="../../../../utils/filter.wxs" module="filter"></wxs>
+<wxs module="g_filter" src="g_filter.wxs"></wxs>
 <view>
 	<view class="head pr">
 		<!-- 搜索 -->
@@ -69,32 +70,32 @@
 	
 	<view class="content">
 		<checkbox-group class="fs26" wx:if="{{isShowRow}}" bindchange="checkboxChange">
-			<view class="item bg-white flex ai-center pd20" wx:for="{{list.pageData}}">
+			<view class="item bg-white flex ai-center pd16" wx:for="{{list.pageData}}">
 				<!-- <label>
 					
 				</label> -->
 				<checkbox value="{{item.goods_id}}" checked="{{item.checked}}"/>
 				<view class="flex pdl10" bindtap="goto" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
-					<view class="pdr20"><image class="img" src="{{imghost + item.original_img}}" lazy-load/></view>
+					<view class="pdr20"><image class="img" src="{{imghost + (item.original_img ? item.original_img : default_img)}}" lazy-load/></view>
 					<view class="flex fdc jc_sb">
 						<view class="ellipsis-2">{{item.goods_name}}</view>
 						<view>
 							<!-- 判断是否有活动价 -->
 							<block wx:if="{{item.prom_price>0 || item.prom_integral>0}}">
 							  <view class="flex xc-wc ai-center" >
-										  <text wx:if="{{item.prom_integral}}"><text class="fs35" style="font-weight: bold;">{{item.prom_integral}}</text>积分</text>	
+										  <text wx:if="{{item.prom_integral}}"><text class="fs30">{{item.prom_integral}}</text>积分</text>	
 										  <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>	
 							    <!-- 活动价 -->
 							    <view class="flex xc-wc ai-center" wx:if="{{item.prom_price}}">
-							      <view class="fs24">￥</view>
-							      <view class="fs35">{{item.prom_price}}</view>
+							      <!-- <view class="fs24">￥</view> -->
+							      <view class="fs30 money">{{item.prom_price}}</view>
 							    </view>
 							  </view>
 							  <view class="flex" style="line-height: 28rpx;">
 							    <!-- 原价 -->
 							    <view class="price flex xc-ash line_th">
-							      <view class="fs22">￥</view>
-							      <view class="fs22">{{item.market_price}}</view>
+							      <!-- <view class="fs22">￥</view> -->
+							      <view class="fs22 money">{{item.market_price}}</view>
 							    </view>
 							  </view>
 							</block>
@@ -108,10 +109,10 @@
 							        <view class="flex">
 							          <!-- 办卡价 -->
 							          <view class="flex xc-wc ai-center">
-							            <view class="fs24">￥</view>
-							            <view class="fs35">{{filter.toFix(item[card_field],2)}}</view>
+							            <!-- <view class="fs24">￥</view> -->
+							            <view class="fs30 money">{{filter.toFix(item[card_field],2)}}</view>
 							            <view class="card_bg ellipsis-1">
-							              <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+							              <image src="{{url + 'miniapp/images/plus/dj_icon.png'}}"></image>
 							              <text class="card_name">{{card_name}}</text>
 							            </view>
 							          </view>
@@ -119,8 +120,8 @@
 							        <view class="flex" style="line-height: 28rpx;">
 							          <!-- 原价 -->
 							          <view class="price flex xc-ash line_th">
-							            <view class="fs22">￥</view>
-							            <view class="fs22">{{item.market_price}}</view>
+							            <!-- <view class="fs22">￥</view> -->
+							            <view class="fs22 money">{{item.market_price}}</view>
 							          </view>
 							        </view>
 							      </block>
@@ -128,15 +129,15 @@
 							        <view class="flex">
 							          <!-- 办卡价 -->
 							          <view class="flex xc-wc ai-center">
-							            <view class="fs24">￥</view>
-							            <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
+							            <!-- <view class="fs24">￥</view> -->
+							            <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
 							          </view>
 							        </view>
 							        <view class="flex" style="line-height: 28rpx;">
 							          <!-- 原价 -->
 							          <view class="price flex xc-ash line_th">
-							            <view class="fs22">￥</view>
-							            <view class="fs22">{{item.market_price}}</view>
+							            <!-- <view class="fs22">￥</view> -->
+							            <view class="fs22 money">{{item.market_price}}</view>
 							          </view>
 							        </view>
 							      </blocK>
@@ -147,22 +148,22 @@
 							        <view class="flex">
 							          <!-- 办卡价 -->
 							          <view class="flex xc-wc ai-center">
-							            <view class="fs24">￥</view>
-							            <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
+							            <!-- <view class="fs24">￥</view> -->
+							            <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
 							          </view>
 							          <!-- 原价 -->
 							          <view class="price flex xc-ash line_th">
-							            <view class="fs22">￥</view>
-							            <view class="fs22">{{item.market_price}}</view>
+							            <!-- <view class="fs22">￥</view> -->
+							            <view class="fs22 money">{{item.market_price}}</view>
 							          </view>
 							        </view>
-							        <view class="flexr" style="">
+							        <view class="flexr">
 							          <!-- 等级价 -->
 																	<view class="price flex ai-center">
-																	  <view class="fs22">￥</view>
-																	  <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
+																	  <!-- <view class="fs22">￥</view> -->
+																	  <view class="fs28 money">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
 																	  <view class="card_bg ellipsis-1">
-																	    <image src="{{url}}/miniapp/images/plus/dj_icon.png"></ image>
+																	    <image src="{{url + 'miniapp/images/plus/dj_icon.png'}}" class="badge"></ image>
 																			<text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text>
 																		</view>
 																	</view>
@@ -172,15 +173,15 @@
 							        <view class="flex">
 							          <!-- 办卡价 -->
 							          <view class="flex xc-wc ai-center">
-							            <view class="fs24">￥</view>
-							            <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
+							            <!-- <view class="fs24">￥</view> -->
+							            <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
 							          </view>
 							        </view>
 							        <view class="flex" style="line-height: 28rpx;">
 							          <!-- 原价 -->
 							          <view class="price flex xc-ash line_th">
-							            <view class="fs22">￥</view>
-							            <view class="fs22">{{item.market_price}}</view>
+							            <!-- <view class="fs22">￥</view> -->
+							            <view class="fs22 money">{{item.market_price}}</view>
 							          </view>
 							        </view>
 							      </block>
@@ -191,15 +192,15 @@
 							    <view class="flex">
 							      <!-- 办卡价 -->
 							      <view class="flex xc-wc ai-center">
-							        <view class="fs24">￥</view>
-							        <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
+							        <!-- <view class="fs24">￥</view> -->
+							        <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
 							      </view>
 							    </view>
 							    <view class="flex" style="line-height: 28rpx;">
 							      <!-- 原价 -->
 							      <view class="price flex xc-ash line_th">
-							        <view class="fs22">￥</view>
-							        <view class="fs22">{{item.market_price}}</view>
+							        <!-- <view class="fs22">￥</view> -->
+							        <view class="fs22 money">{{item.market_price}}</view>
 							      </view>
 							    </view>
 							  </block>
@@ -212,30 +213,30 @@
 			</view>			
 		</checkbox-group>
 		
-		<checkbox-group class="fs26 flex pd20 wrap"  catchchange="checkboxChange" wx:else>
+		<checkbox-group class="fs26 flex pd16 wrap"  catchchange="checkboxChange" wx:else>
 			<view class="item2 bg-white" wx:for="{{list.pageData}}" bindtap="goto" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
-				<image class="img2" src="{{imghost + item.original_img}}" mode="aspectFit" lazy-load/>
+				<image class="img2" src="{{imghost + (item.original_img ? item.original_img : default_img)}}" mode="aspectFit" lazy-load/>
 				<view class="pd20 fs26 flex jc_sb fdc f1">
 					<view class="ellipsis-2">{{item.goods_name}}</view>
 					<view class="flex ai-center jc_sb pdt20">
 						<checkbox value="{{item.goods_id}}" checked="{{item.checked}}" data-name="checkbox"/>
-						<view class="t-r">
+						<view>
 							<!-- 判断是否有活动价 -->
 							<block wx:if="{{item.prom_price>0 || item.prom_integral>0}}">
 							  <view class="flex xc-wc ai-center" >
-										  <text wx:if="{{item.prom_integral}}"><text class="fs35" style="font-weight: bold;">{{item.prom_integral}}</text>积分</text>	
+										  <text wx:if="{{item.prom_integral}}"><text class="fs30">{{item.prom_integral}}</text>积分</text>	
 										  <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>	
 							    <!-- 活动价 -->
 							    <view class="flex xc-wc ai-center" wx:if="{{item.prom_price}}">
-							      <view class="fs24">￥</view>
-							      <view class="fs35">{{item.prom_price}}</view>
+							      <!-- <view class="fs24">￥</view> -->
+							      <view class="fs30 money">{{item.prom_price}}</view>
 							    </view>
 							  </view>
 							  <view class="flex" style="line-height: 28rpx;">
 							    <!-- 原价 -->
 							    <view class="price flex xc-ash line_th">
-							      <view class="fs22">￥</view>
-							      <view class="fs22">{{item.market_price}}</view>
+							      <!-- <view class="fs22">￥</view> -->
+							      <view class="fs22 money">{{item.market_price}}</view>
 							    </view>
 							  </view>
 							</block>
@@ -249,10 +250,10 @@
 							        <view class="flex">
 							          <!-- 办卡价 -->
 							          <view class="flex xc-wc ai-center">
-							            <view class="fs24">￥</view>
-							            <view class="fs35">{{filter.toFix(item[card_field],2)}}</view>
+							            <!-- <view class="fs24">￥</view> -->
+							            <view class="fs30 money">{{filter.toFix(item[card_field],2)}}</view>
 							            <view class="card_bg ellipsis-1">
-							              <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+							              <image src="{{imghost + 'miniapp/images/plus/dj_icon.png'}}" class="badge"></image>
 							              <text class="card_name">{{card_name}}</text>
 							            </view>
 							          </view>
@@ -260,8 +261,8 @@
 							        <view class="flex" style="line-height: 28rpx;">
 							          <!-- 原价 -->
 							          <view class="price flex xc-ash line_th">
-							            <view class="fs22">￥</view>
-							            <view class="fs22">{{item.market_price}}</view>
+							            <!-- <view class="fs22">￥</view> -->
+							            <view class="fs22 money">{{item.market_price}}</view>
 							          </view>
 							        </view>
 							      </block>
@@ -269,15 +270,15 @@
 							        <view class="flex">
 							          <!-- 办卡价 -->
 							          <view class="flex xc-wc ai-center">
-							            <view class="fs24">￥</view>
-							            <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
+							            <!-- <view class="fs24">￥</view> -->
+							            <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
 							          </view>
 							        </view>
 							        <view class="flex" style="line-height: 28rpx;">
 							          <!-- 原价 -->
 							          <view class="price flex xc-ash line_th">
-							            <view class="fs22">￥</view>
-							            <view class="fs22">{{item.market_price}}</view>
+							            <!-- <view class="fs22">￥</view> -->
+							            <view class="fs22 money">{{item.market_price}}</view>
 							          </view>
 							        </view>
 							      </blocK>
@@ -288,22 +289,22 @@
 							        <view class="flex">
 							          <!-- 办卡价 -->
 							          <view class="flex xc-wc ai-center">
-							            <view class="fs24">￥</view>
-							            <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
+							            <!-- <view class="fs24">￥</view> -->
+							            <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
 							          </view>
 							          <!-- 原价 -->
 							          <view class="price flex xc-ash line_th">
-							            <view class="fs22">￥</view>
-							            <view class="fs22">{{item.market_price}}</view>
+							            <!-- <view class="fs22">￥</view> -->
+							            <view class="fs22 money">{{item.market_price}}</view>
 							          </view>
 							        </view>
 							        <view class="flexr" style="">
 							          <!-- 等级价 -->
 													<view class="price flex ai-center">
-														<view class="fs22">￥</view>
-														<view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
+														<!-- <view class="fs22">￥</view> -->
+														<view class="fs28 money">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
 														<view class="card_bg ellipsis-1">
-															<image src="{{url}}/miniapp/images/plus/dj_icon.png"></ image>
+															<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>
@@ -313,15 +314,15 @@
 							        <view class="flex">
 							          <!-- 办卡价 -->
 							          <view class="flex xc-wc ai-center">
-							            <view class="fs24">￥</view>
-							            <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
+							            <!-- <view class="fs24">￥</view> -->
+							            <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
 							          </view>
 							        </view>
 							        <view class="flex" style="line-height: 28rpx;">
 							          <!-- 原价 -->
 							          <view class="price flex xc-ash line_th">
-							            <view class="fs22">￥</view>
-							            <view class="fs22">{{item.market_price}}</view>
+							            <!-- <view class="fs22">￥</view> -->
+							            <view class="fs22 money">{{item.market_price}}</view>
 							          </view>
 							        </view>
 							      </block>
@@ -332,21 +333,21 @@
 							    <view class="flex">
 							      <!-- 办卡价 -->
 							      <view class="flex xc-wc ai-center">
-							        <view class="fs24">￥</view>
-							        <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
+							        <!-- <view class="fs24">￥</view> -->
+							        <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
 							      </view>
 							    </view>
 							    <view class="flex" style="line-height: 28rpx;">
 							      <!-- 原价 -->
 							      <view class="price flex xc-ash line_th">
-							        <view class="fs22">￥</view>
-							        <view class="fs22">{{item.market_price}}</view>
+							        <!-- <view class="fs22">￥</view> -->
+							        <view class="fs22 money">{{item.market_price}}</view>
 							      </view>
 							    </view>
 							  </block>
 							</block>
 							<!-- <view class="money c-red fs32">{{item.market_price}}</view> -->
-							<view class="c-a">分成金额：<text class="money c-red">{{item.commission}}</text></view>
+							<view class="c-a fs24">分成金额：<text class="money c-red">{{filter.toFix(item.commission, 2)}}</text></view>
 						</view>
 					</view>
 				</view>
diff --git a/packageA/pages/distribution/goods/goods.wxss b/packageA/pages/distribution/goods/goods.wxss
index ca41eec..d13808e 100644
--- a/packageA/pages/distribution/goods/goods.wxss
+++ b/packageA/pages/distribution/goods/goods.wxss
@@ -328,5 +328,28 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
   text-decoration: line-through;
 }
 
+.badge {
+	display: block;
+	width: 19rpx;
+	height: 19rpx;
+}
+
+.card_bg {
+	box-sizing: border-box;
+  padding: 2rpx 10rpx;
+  /* height: 28rpx; */
+  border-radius: 26rpx;
+  font-size: 20rpx;
+  /* line-height: 28rpx; */
+	max-width: 200rpx;
+  background: #333;
+  color: #fff;
+	margin-left: 8rpx;
+	display: flex;
+	align-items: center;
+	/* position: relative;
+	top: -4rpx; */
+}
+
 
 
diff --git a/packageA/pages/distribution/shop/shop.js b/packageA/pages/distribution/shop/shop.js
index 696d252..d8db295 100644
--- a/packageA/pages/distribution/shop/shop.js
+++ b/packageA/pages/distribution/shop/shop.js
@@ -36,7 +36,8 @@ Page({
 		card_list: null,
 
 		isAll: true,
-
+		
+		default_img: '/miniapp/images/default_g_img.gif',
   },
 
   /**
@@ -696,5 +697,25 @@ Page({
 	},
 	
 	
+	/**
+	 * 点击新品
+	 */
+	// imgError(e) {
+	// 	this.setData({
+	// 		noImg: true,
+	// 	});
+	// },
+	
+	
+	bind_bnerr2: function (e) {
+		var _errImg = e.target.dataset.errorimg;
+		var _errurl = e.target.dataset.url;
+		var ii = _errurl.indexOf(oo.imghost);
+		if (ii != -1) {
+			var _errObj = {};
+			_errObj[_errImg] = this.data.iurl+"/miniapp/images/default_g_img.gif";
+			this.setData(_errObj) //注意这里的赋值方式,只是将数据列表中的此项图片路径值替换掉 ; 
+		}
+	},
 
 })
\ No newline at end of file
diff --git a/packageA/pages/distribution/shop/shop.wxml b/packageA/pages/distribution/shop/shop.wxml
index 4d738d5..b1a4555 100644
--- a/packageA/pages/distribution/shop/shop.wxml
+++ b/packageA/pages/distribution/shop/shop.wxml
@@ -67,19 +67,19 @@
 		<view class="fs26" wx:if="{{isShowRow}}">
 			<view class="item bg-white flex ai-center pd20" wx:for="{{list.pageData}}">
 				<view class="flex pdl10" bindtap="goto" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
-					<view class="img-container pdr20" data-txt="已售:{{item.sales_sum}}"><image class="img" src="{{imghost + item.original_img}}" lazy-load mode="aspectFit"/></view>
+					<view class="img-container pdr20" data-txt="已售:{{item.sales_sum}}"><image class="img" src="{{imghost + (item.original_img ? item.original_img : default_img)}}" lazy-load mode="aspectFit"/></view>
 					<view class="flex fdc jc_sb">
-						<view class="ellipsis-2 h68">{{item.goods_name}}</view>
+						<view class="ellipsis-2 h68 mgb20">{{item.goods_name}}</view>
 						
 						<!-- 判断是否有活动价 -->
 						<block wx:if="{{item.prom_price>0 || item.prom_integral>0}}">
-						  <view class="flex xc-wc" >
-									  <text wx:if="{{item.prom_integral}}"><text class="fs35" style="font-weight: bold;">{{item.prom_integral}}</text>积分</text>	
+						  <view class="flex xc-wc pdt20" >
+									  <text wx:if="{{item.prom_integral}}"><text class="fs30">{{item.prom_integral}}</text>积分</text>	
 									  <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>	
 						    <!-- 活动价 -->
 						    <view class="flex xc-wc ai_and" wx:if="{{item.prom_price}}">
 						      <!-- <view class="fs24">￥</view> -->
-						      <view class="fs35 money">{{item.prom_price}}</view>
+						      <view class="fs30 money">{{item.prom_price}}</view>
 						    </view>
 						  </view>
 						  <view class="flex" style="line-height: 28rpx;">
@@ -101,9 +101,9 @@
 						          <!-- 办卡价 -->
 						          <view class="flex xc-wc ai_and">
 						            <!-- <view class="fs24">￥</view> -->
-						            <view class="fs35 money">{{filter.toFix(item[card_field],2)}}</view>
+						            <view class="fs30 money">{{filter.toFix(item[card_field],2)}}</view>
 						            <view class="card_bg">
-						              <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+						              <image src="{{url + 'miniapp/images/plus/dj_icon.png'}}"></image>
 						              <text class="card_name ellipsis-1">{{card_name}}</text>
 						            </view>
 						          </view>
@@ -121,7 +121,7 @@
 						          <!-- 办卡价 -->
 						          <view class="flex xc-wc">
 						            <!-- <view class="fs24">￥</view> -->
-						            <view class="fs35 money">{{filter.toFix(item.shop_price,2)}}</view>
+						            <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
 						          </view>
 						        </view>
 						        <view class="flex" style="line-height: 28rpx;">
@@ -140,7 +140,7 @@
 						          <!-- 办卡价 -->
 						          <view class="flex xc-wc">
 						            <!-- <view class="fs24">￥</view> -->
-						            <view class="fs35 money">{{filter.toFix(item.shop_price,2)}}</view>
+						            <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
 						          </view>
 						          <!-- 原价 -->
 						          <view class="price flex xc-ash line_th">
@@ -150,14 +150,14 @@
 						        </view>
 						        <view class="flexr" style="">
 						          <!-- 等级价 -->
-																<view class="price flex ai-center">
-																  <!-- <view class="fs22">￥</view> -->
-																  <view class="fs28 money">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
-																  <view class="card_bg">
-																    <image src="{{url}}/miniapp/images/plus/dj_icon.png"></ image>
-																		<text class="card_name ellipsis-1">{{g_filter.get_card_price(item,card_list,1)}}</text>
-																	</view>
-																</view>
+												<view class="price flex ai-center">
+													<!-- <view class="fs22">￥</view> -->
+													<view class="fs28 money">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
+													<view class="card_bg">
+														<image src="{{url}}/miniapp/images/plus/dj_icon.png"></ image>
+														<text class="card_name ellipsis-1">{{g_filter.get_card_price(item,card_list,1)}}</text>
+													</view>
+												</view>
 						        </view>
 						      </block>
 						      <block wx:else>
@@ -165,7 +165,7 @@
 						          <!-- 办卡价 -->
 						          <view class="flex xc-wc">
 						            <!-- <view class="fs24">￥</view> -->
-						            <view class="fs35 money">{{filter.toFix(item.shop_price,2)}}</view>
+						            <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
 						          </view>
 						        </view>
 						        <view class="flex" style="line-height: 28rpx;">
@@ -184,7 +184,7 @@
 						      <!-- 办卡价 -->
 						      <view class="flex xc-wc">
 						        <!-- <view class="fs24">￥</view> -->
-						        <view class="fs35 money">{{filter.toFix(item.shop_price,2)}}</view>
+						        <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
 						      </view>
 						    </view>
 						    <view class="flex" style="line-height: 28rpx;">
@@ -209,18 +209,18 @@
 	
 		<view class="fs26 flex pd20 wrap" wx:else>
 			<view class="item2 bg-white" wx:for="{{list.pageData}}" bindtap="goto" data-url="/pages/goods/goodsInfo/goodsInfo?goods_id={{item.goods_id}}">
-				<view class="img-container" data-txt="已售:{{item.sales_sum}}"><image class="img2" src="{{imghost + item.original_img}}"  mode="aspectFit" lazy-load/></view>
+				<view class="img-container" data-txt="已售:{{item.sales_sum}}"><image class="img2" src="{{imghost + (item.original_img ? item.original_img : default_img)}}" lazy-load="true"/></view>
 				<view class="pd20 fs26">
-					<view class="ellipsis-2 h68">{{item.goods_name}}</view>
+					<view class="ellipsis-2 h68 mgb20">{{item.goods_name}}</view>
 					<!-- 判断是否有活动价 -->
 					<block wx:if="{{item.prom_price>0 || item.prom_integral>0}}">
-					  <view class="flex xc-wc" >
-								  <text wx:if="{{item.prom_integral}}"><text class="fs35" style="font-weight: bold;">{{item.prom_integral}}</text>积分</text>	
+					  <view class="flex xc-wc">
+								  <text wx:if="{{item.prom_integral}}"><text class="fs30" style="font-weight: bold;">{{item.prom_integral}}</text>积分</text>	
 								  <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>	
 					    <!-- 活动价 -->
 					    <view class="flex xc-wc" wx:if="{{item.prom_price}}">
 					      <!-- <view class="fs24">￥</view> -->
-					      <view class="fs35 money">{{item.prom_price}}</view>
+					      <view class="fs30 money">{{item.prom_price}}</view>
 					    </view>
 					  </view>
 					  <view class="flex" style="line-height: 28rpx;">
@@ -242,7 +242,7 @@
 					          <!-- 办卡价 -->
 					          <view class="flex xc-wc ai_and">
 					            <!-- <view class="fs24">￥</view> -->
-					            <view class="fs35 money">{{filter.toFix(item[card_field],2)}}</view>
+					            <view class="fs30 money">{{filter.toFix(item[card_field],2)}}</view>
 					            <view class="card_bg">
 					              <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
 					              <text class="card_name ellipsis-1">{{card_name}}</text>
@@ -262,7 +262,7 @@
 					          <!-- 办卡价 -->
 					          <view class="flex xc-wc ai_and">
 					            <!-- <view class="fs24">￥</view> -->
-					            <view class="fs35 money">{{filter.toFix(item.shop_price,2)}}</view>
+					            <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
 					          </view>
 					        </view>
 					        <view class="flex" style="line-height: 28rpx;">
@@ -281,7 +281,7 @@
 					          <!-- 办卡价 -->
 					          <view class="flex xc-wc ai_and">
 					            <!-- <view class="fs24">￥</view> -->
-					            <view class="fs35 money">{{filter.toFix(item.shop_price,2)}}</view>
+					            <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
 					          </view>
 					          <!-- 原价 -->
 					          <view class="price flex xc-ash line_th">
@@ -306,7 +306,7 @@
 					          <!-- 办卡价 -->
 					          <view class="flex xc-wc ai_and">
 					            <!-- <view class="fs24">￥</view> -->
-					            <view class="fs35 money">{{filter.toFix(item.shop_price,2)}}</view>
+					            <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
 					          </view>
 					        </view>
 					        <view class="flex" style="line-height: 28rpx;">
@@ -325,7 +325,7 @@
 					      <!-- 办卡价 -->
 					      <view class="flex xc-wc ai_and">
 					        <!-- <view class="fs24">￥</view> -->
-					        <view class="fs35 money">{{filter.toFix(item.shop_price,2)}}</view>
+					        <view class="fs30 money">{{filter.toFix(item.shop_price,2)}}</view>
 					      </view>
 					    </view>
 					    <view class="flex" style="line-height: 28rpx;">
--
libgit2 0.21.4