等级价显示的过滤器，购物车价格变化的修复，购买等级卡，首页的等级价显示，我的收藏的等级价的显示

yvan.ni
1 parent 54e017d3
Showing 19 changed files with 138 additions and 151 deletions
components/goods_list/g_filter.wxs
components/goods_list/goods_list.js
pages/cart/cart/cart.js
pages/cart/cart2/cart2.js
pages/goods/goodsInfo/g_filter.wxs
pages/goods/goodsInfo/goodsInfo.js
pages/goods/goodsInfo/goodsInfo.json
pages/goods/goodsInfo/goodsInfo.wxml
pages/goods/goodsList/g_filter.wxs
pages/goods/goodsList/goodsList.wxml
pages/goods/goodsList/goodsList.wxss
pages/goods/search/g_filter.wxs
pages/goods/search/search.wxml
pages/goods/search/search.wxss
pages/index/index/index.js
pages/user/collect_list/collect_list.js
pages/user/index/index.js
pages/user/index/index.json
pages/user/plus/plus.wxml
@@ -8,9 +8,9 @@ var g_filters = {
 	    //-- 判断,不是等级会员时候，要显示的最低等级价和名称 --
 		get_card_price:function(goods,all_card,type){		
-			     var price1=parseInt(goods['cardprice1']);
-			     var price2=parseInt(goods['cardprice2']);
-			     var price3=parseInt(goods['cardprice3']);					   
+			     var price1=parseFloat(goods['cardprice1']);
+           var price2 = parseFloat(goods['cardprice2']);
+           var price3 = parseFloat(goods['cardprice3']);					   
 			     if(!all_card){
 			         if(type==0) return 0;
 			         return "";
@@ -18,77 +18,87 @@ Component({
     // 这里定义了innerText属性，属性值可以在组件使用时指定
   },
   ready: function () {
-	   var th=this;
-	   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"){
-				    th.setData({rank_switch:true});	
-			    	var user=getApp().globalData.userInfo;	
-				    var ti=setInterval(function(){
-						  if(!user) return false;
-						  clearInterval(ti);
-						  //---回调卡的列表---
-						  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)				
-			}
-	   })
-	   	    	 
+   	 
   },
+  methods: { 
+       init:function(){
+         var th = this;   
+         getApp().request.get("/api/weshop/users/get/" + os.stoid + "/" + getApp().globalData.user_id, {
+           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") {
+                 th.setData({ rank_switch: true });
+                 var user = getApp().globalData.userInfo;
+                 var ti = setInterval(function () {
+                   if (!user) return false;
+                   clearInterval(ti);
+                   //---回调卡的列表---
+                   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();
-  methods: {
-    
-       get_list:function(){        
+                       //--- 判断是等级会员，且在有效期范围内 ---
+                       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)
+               }
+             })
+           }
+         })
+
+       },
+
+
+       get_list:function(){      
          var that = this;
-         if(that.data.is_no_more==0) return false;
+         if (that.data.is_no_more == 0) return false;
          var curPage = that.data.curPage;
-         getApp().request.get('/api/weshop/goods/page?page',{
-           data: { is_mainshow: 1, isonsale: 1,
-            is_recommend: 1, is_on_sale: 1,
+         getApp().request.get('/api/weshop/goods/page?page', {
+           data: {
+             is_mainshow: 1, isonsale: 1,
+             is_recommend: 1, is_on_sale: 1,
              store_id: o.stoid,
              page: curPage,
-             pageSize:6,
-             },
-           success: function (res){
-             var data=res.data;
-             var total=data.data.total;
-             if (total <= curPage*6){
-               that.setData({ is_no_more: 0 }); 
-             }else{
-                that.data.curPage++;
+             pageSize: 6,
+           },
+           success: function (res) {
+             var data = res.data;
+             var total = data.data.total;
+             if (total <= curPage * 6) {
+               that.setData({ is_no_more: 0 });
+             } else {
+               that.data.curPage++;
              }
-      
+
              //加载完成
              if (data.data.pageData) {
-               that.setData({load_complete:1});
+               that.setData({ load_complete: 1 });
              }
-             if(that.data.recommend!=null){
-              var ra=that.data.recommend.concat(data.data.pageData);
+             if (that.data.recommend != null) {
+               var ra = that.data.recommend.concat(data.data.pageData);
                that.setData({ recommend: ra });
-             }else{
-             that.setData({recommend:data.data.pageData});
+             } else {
+               that.setData({ recommend: data.data.pageData });
              }
-              }
-           })
+           }
+         })      
        },
-	   
+
+          
     bind_bnerr_xc: function (e) {
         var _errImg = e.target.dataset.errorimg;
         var _errurl = e.target.dataset.url;    
@@ -114,7 +124,7 @@ Component({
 	   			var name="card"+plusCard[i].CorrPrice.toLowerCase();
 	   			card_name_map.set(name,plusCard[i].CardName);				       
 	        }
-	       			  
+	     			  
 	   		  var ob={"card_list":plusCard,"name_map":card_name_map};
 	   		  func(ob);	
 	      })
@@ -705,10 +705,14 @@ Page({
                 if (g_arr[i].goods_id == val.goods_id) {
 				  //如果会员是等级会员,商品有等级价,且不是活动商品
-				  if(card_field && val[card_field]>0 && val.prom_type==0 ){
-					   
+				  if(card_field && val[card_field]>0 && (val.prom_type==0 || val.prom_type==3 || val.prom_type==4 || val.prom_type==5) ){
+					    if (g_arr[i].goods_price != val[card_field]){
+							  isok = 0;
+					          gname = val.goods_name;
+					          throw "商品价格已经变化";
+						}   
 				  }else{
-					  if (g_arr[i].goods_price != val.shop_price && g_arr[i].goods_price != val.prom_price) {
+            if (g_arr[i].goods_price != val.shop_price && g_arr[i].goods_price != val.prom_price) {
 					    isok = 0;
 					    gname = val.goods_name;
 					    throw "商品价格已经变化";
@@ -414,6 +414,7 @@ Page({
             case 2:
             case 3:
             case 4:
+            case 5:
             case 6:
              //--此时开始计算商品的使用券相关,如果有等级价还要计算和等级价相关的,             
 			 // 如果有优惠促销，还要把促销的部分计算在内，因为促销还有不能使用优惠券--		  
@@ -8,9 +8,9 @@ var g_filters = {
 	    //-- 判断,不是等级会员时候，要显示的最低等级价和名称 --
 		get_card_price:function(goods,all_card,type){		
-			     var price1=parseInt(goods['cardprice1']);
-			     var price2=parseInt(goods['cardprice2']);
-			     var price3=parseInt(goods['cardprice3']);					   
+			     var price1=parseFloat(goods['cardprice1']);
+			     var price2=parseFloat(goods['cardprice2']);
+			     var price3=parseFloat(goods['cardprice3']);					   
 			     if(!all_card){
 			         if(type==0) return 0;
 			         return "";
@@ -202,7 +202,6 @@ Page({
     canvasHidden: 1,
     //--推荐--
-    recommend_list: [],
     store_config: null,
     is_show_pl: 0, //是否品类
     is_show_pp: 0, //是否品牌
@@ -319,9 +318,7 @@ Page({
 	  			  })	
 	  		},500)				
 	  }
-	  
-	  
-
+	
     });
     //获取用户设备信息，屏幕宽度
@@ -496,12 +493,21 @@ Page({
       mapurl: mapurl,
     });
-    ee.requestRecommend();
   },
   //---展示---
   onShow: function() {
+    var goods_list = null,th = this;
+    var ui = setInterval(function () {
+      goods_list = th.selectComponent("#goods_list");
+      if (goods_list) {
+        clearInterval(ui); 
+        goods_list.init();
+        return false
+      }
+    }, 300)
+
     this.data.is_timer = 1;
     var ee = this,
@@ -569,7 +575,7 @@ Page({
           //获取门店
           ee.get_sto();
           //获取统一条形码,普通商品和优惠促销的商品
-          if (ee.data.data.prom_type == 0 || ee.data.data.prom_type == 3)
+          if (ee.data.data.prom_type == 0 || ee.data.data.prom_type == 3 || ee.data.data.prom_type == 5)
             ee.get_sku(o.stoid, t.data.data.sku, gid);
           else {
             var gg = "",
@@ -638,6 +644,9 @@ Page({
     this.data.enterAddressPage && (this.data.enterAddressPage = !1);
+   
+   
+
   },
   enterAddress: function() {
@@ -1555,13 +1564,16 @@ Page({
     if (this.data.activeCategoryId == 2){
       if(!this.data.comments_no_more)   this.requestComments_new();
     }
+
+    var goods_list = this.selectComponent("#goods_list"); //组件的id
+    goods_list.get_list();
   },
   //--------检查是否活动，活动是否开始，或者是否结束-------
   async check_prom(gid, prom_type, prom_id) {
     var ee = this,
       th = ee;
-    if (prom_type == 3 || prom_type == 0 ||  prom_type == 2 ||  prom_type == 4) {
+    if (prom_type == 3 || prom_type == 0 || prom_type == 2 || prom_type == 4 || prom_type == 5) {
       this.setData({
         prom_type: 0,
         isshow: 1,
@@ -2889,37 +2901,6 @@ Page({
   },
-  //--加载更多商品--
-  requestRecommend: function() {
-    var e = this,
-      t = '/api/weshop/goods/page?page=1';
-    var th_recommend_list = e.data.recommend_list;
-    getApp().request.get(t, {
-      data: {
-        is_mainshow: 1,
-        isonsale: 1,
-        is_recommend: 1,
-        is_on_sale: 1,
-        store_id: os.stoid,
-        pageSize: 6
-      },
-      success: function(ee) {
-        var recommend_list = ee.data.data.pageData;
-        if (recommend_list && recommend_list.length > 0) {
-          var dd = [...th_recommend_list, ...recommend_list];
-          e.setData({
-            recommend_list,
-            dd
-          });
-          e.data.currentPage++;
-        } else {
-          e.setData({
-            nomore: 1
-          });
-        }
-      }
-    })
-  },
   //--获取头像的本地缓存,回调写法--
   get_head_temp: function(tt, func) {
@@ -3,6 +3,7 @@
     "enablePullDownRefresh": false,
     "usingComponents": {
         "nav_box": "/components/nav_box/nav_box",
-        "warn": "/components/long_warn/long_warn"
+        "warn": "/components/long_warn/long_warn",
+        "goods_recommend": "/components/goods_list/goods_list"
     }
 }
 \ No newline at end of file
@@ -229,7 +229,7 @@
           <view class="goods-price rel">
             <view class="co-red" style="overflow: hidden" wx:if="{{prom_type==0 || prom_type==3}}">
               <view class="market-price" style="overflow: hidden">
-				  <block wx:if="{{card_field}}">
+				  <block wx:if="{{card_field && data[card_field]>0}}">
 				     <view class="flex ai-center  grade-card-frame" style="margin-left:12rpx;"> 
 					  <image class="img" src="{{iurl}}/miniapp/images/userinfo/userinfo/privilege_t.png"></image>
 				      <view class="fs24 white view card-name ellipsis-1">{{card_name}}</view>
@@ -287,7 +287,7 @@
                </view>
             </view>
 		    <!-- 立即续费的显示 -->	
-			<view wx:elif="{{is_near_date}}">
+			<view wx:elif="{{is_near_date && data[card_field]>0}}">
 				    <view class="beauty-makeup-frame flex ai-center">
 				 				   <view class="left flex ai-center">
 				 					   <view class="flex ai-center  grade-card-frame card-frame advert-card"style="max-width:32%;width:auto" >
@@ -532,23 +532,7 @@
         </view>
         <!-- 显示商品 -->
-        <view class="xc-goods ">
-          <view>
-            <view bindtap="go_goods" data-gid="{{item.goods_id}}" class="rel xc-goods-recommend {{index%2==0?'':'ml'}}" wx:for="{{recommend_list}}">
-              <image class="xc-goods-imgs" src="{{iurl+item.original_img}}"></image>
-              <view class='xc-goods-bottom abs'>
-                <view class="flex  monry-frame">
-                  <view class="flex">
-                    <view class="three-level-word money-color-val rmb-symbol">￥</view>
-                    <view class="two-level-word money-color-val" style='margin-top:8rpx;'>{{item.shop_price}}</view>
-                  </view>
-                  <view class="word-lines xc-original-price"> 原价￥{{item.market_price}}</view>
-                </view>
-                <view class="xc-good-explain ellipsis-2">{{item.goods_name}}</view>
-              </view>
-            </view>
-          </view>
-        </view>
+        <goods_recommend id="goods_list"></goods_recommend>
       </view>
@@ -813,7 +797,7 @@
           <!--<view class="spec-goods-name">{{data.goods_name}}</view>-->
           <view class="spec-goods-price" wx:if="{{prom_price==null}}">
 			 <!-- 如果是等级会员，且有等级价 --> 
-			 <block wx:if="card_field && sele_g[card_field]>0">
+			 <block wx:if="{{card_field && sele_g[card_field]>0}}">
 			   ￥ {{sele_g[card_field]}}
 			 </block> 		 
 			 <block wx:else>
@@ -908,7 +892,7 @@
           <!--<view class="spec-goods-name">{{data.goods_name}}</view>-->
           <view class="spec-goods-price" wx:if="{{is_normal==1}}">
 			  <!-- 如果是等级会员，且有等级价 -->
-			  <block wx:if="card_field && sele_g[card_field]>0">
+			  <block wx:if="{{card_field && sele_g[card_field]>0}}">
 			    ￥ {{sele_g[card_field]}}
 			  </block> 		 
 			  <block wx:else>
@@ -8,9 +8,9 @@ var g_filters = {
 	    //-- 判断,不是等级会员时候，要显示的最低等级价和名称 --
 		get_card_price:function(goods,all_card,type){		
-			     var price1=parseInt(goods['cardprice1']);
-			     var price2=parseInt(goods['cardprice2']);
-			     var price3=parseInt(goods['cardprice3']);					   
+			     var price1=parseFloat(goods['cardprice1']);
+			     var price2=parseFloat(goods['cardprice2']);
+			     var price3=parseFloat(goods['cardprice3']);					   
 				 if(!all_card){
 			         if(type==0) return 0;
@@ -70,7 +70,7 @@
                 					 </view> 
                 					 <view class="comment flex jc_sb">
                 						<view class="flex">
-                					       <view class="word-line xc-ash">￥{{g_filter.get_card_price(item,card_list,0)}}</view>	
+                					       <view class="">￥{{g_filter.get_card_price(item,card_list,0)}}</view>	
                 						   <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
                 						      {{g_filter.get_card_price(item,card_list,1)}}
                 						   </view>
@@ -155,6 +155,6 @@
     width: 300rpx;
 }
-.card_bg {display: flex; width: 108rpx;height: 28rpx; align-items: center; border-radius: 26rpx; font-size: 19rpx;
-background: #333; color: #fff; justify-content: center; margin-left: 4rpx;margin-top:8rpx }
-.card_bg image{ width: 19rpx; height: 19rpx; margin-right: 1rpx;}
+.card_bg {display: flex; width: 110rpx;height: 28rpx; align-items: center; border-radius: 26rpx; font-size: 19rpx;
+background: #333; color: #fff; justify-content: center; margin-left: 2rpx; margin-top:8rpx; line-height: 28rpx;}
+.card_bg image{ width: 19rpx; height: 19rpx; margin-right: 1rpx; vertical-align: middle}
@@ -8,9 +8,9 @@ var g_filters = {
 	    //-- 判断,不是等级会员时候，要显示的最低等级价和名称 --
 		get_card_price:function(goods,all_card,type){		
-			     var price1=parseInt(goods['cardprice1']);
-			     var price2=parseInt(goods['cardprice2']);
-			     var price3=parseInt(goods['cardprice3']);					   
+      var price1 = parseFloat(goods['cardprice1']);
+      var price2 = parseFloat(goods['cardprice2']);
+      var price3 = parseFloat(goods['cardprice3']);					   
 				 if(!all_card){
 			         if(type==0) return 0;
@@ -66,7 +66,7 @@
 									 </view> 
 									 <view class="comment flex jc_sb">
 										<view class="flex">
-									       <view class="word-line xc-ash">￥{{g_filter.get_card_price(item,card_list,0)}}</view>	
+									       <view class="">￥{{g_filter.get_card_price(item,card_list,0)}}</view>	
 										   <view class="card_bg"><image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
 										      {{g_filter.get_card_price(item,card_list,1)}}
 										   </view>
@@ -92,6 +92,8 @@
 .price {
     display: inline-block;
     color: #f23030;
+    height: 20rpx;
+    line-height: 20rpx;
     /* padding-bottom: 20rpx; */
 }
@@ -226,6 +228,6 @@
     margin-left: 15rpx;
 }
-.card_bg {display: flex; width: 108rpx;height: 28rpx; align-items: center; border-radius: 26rpx; font-size: 19rpx;
-background: #333; color: #fff; justify-content: center; margin-left: 2rpx; margin-top:8rpx }
-.card_bg image{ width: 19rpx; height: 19rpx; margin-right: 1rpx;}
+.card_bg {display: flex; width: 110rpx;height: 28rpx; align-items: center; border-radius: 26rpx; font-size: 19rpx;
+background: #333; color: #fff; justify-content: center; margin-left: 2rpx; margin-top:8rpx; line-height: 28rpx;}
+.card_bg image{ width: 19rpx; height: 19rpx; margin-right: 1rpx; vertical-align: middle}
@@ -314,7 +314,8 @@ Page({
     });
     var goods_list = this.selectComponent("#goods_list"); //组件的id
-        goods_list.get_list();
+    goods_list.init();
+    setTimeOut(function () { goods_list.get_list();},300)  
   },
   //--判断小程序是否过期--
@@ -49,9 +49,8 @@ Page({
           is_goods: 1
         })
         var goods_list = th.selectComponent("#goods_recommend"); //组件的id
-        goods_list.get_list();
-
-
+        goods_list.init();
+        setTimeOut(function () { goods_list.get_list(); }, 300)  
       }
     });
   },
@@ -38,8 +38,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function (options) { 	  
-	  var goods_list = this.selectComponent("#goods_recommend"); //组件的id
-	  goods_list.get_list();
+	  
   },
   /**
    * 生命周期函数--监听页面显示
@@ -217,6 +216,10 @@ Page({
       }
     });
+    var goods_list = this.selectComponent("#goods_recommend"); //组件的id
+    goods_list.init();
+    goods_list.get_list();
+
   },
   //判断会员是后有改服务项目
@@ -252,8 +255,9 @@ Page({
    */
   onReachBottom: function () {
     //!this.nomore && this.requestRecommend();
-	var goods_list = this.selectComponent("#goods_recommend"); //组件的id
-	goods_list.get_list();
+	  var goods_list = this.selectComponent("#goods_recommend"); //组件的id
+    goods_list.init();
+    setTimeOut(function () { goods_list.get_list(); }, 300)  
   },
   /**
 {
   "usingComponents": {
     "pop_txt": "/components/userqy_pop_up/userqy_pop_up",
-	"goods_recommend": "/components/goods_list/goods_list"
+  	"goods_recommend": "/components/goods_list/goods_list"
   },
   "navigationBarTitleText": "会员中心"
 }
 \ No newline at end of file
@@ -18,7 +18,7 @@
               <view class="flex-space-between Membership_go">
                 <view>
                   <view class="fs36">{{item.CardName}}</view>
-                  <view class="fs24 Membership_remarks">开通会员年卡仅{{item.CardFee}}元</view>
+                  <view class="fs24 Membership_remarks">开通会员卡仅{{item.CardFee}}元</view>
                 </view>
                 <view class="Opening fs28 xc-black" data-ind="{{index}}" style="background:{{item.CardColor}}" bindtap="Opening">立即购买
                 </view>