From bc41c234e8ea8530d3abb2d152033ed8f93aa840 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Thu, 7 Nov 2019 13:52:50 +0800
Subject: [PATCH] 分类页面，  卡的购买的修改

---
 pages/goods/categoryList/categoryList.wxml | 17 ++++++++---------
 pages/goods/categoryList/categoryList.wxss | 11 +++++------
 pages/user/cardinfo/cardinfo.js            | 72 ++++++++++++++++++++++++++++++++++++++----------------------------------
 pages/user/cardinfo/cardinfo.wxml          | 44 ++++++++++++++------------------------------
 4 files changed, 65 insertions(+), 79 deletions(-)

diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml
index 85bdab0..9e3345b 100644
--- a/pages/goods/categoryList/categoryList.wxml
+++ b/pages/goods/categoryList/categoryList.wxml
@@ -52,7 +52,7 @@
                 </view>             
             </scroll-view>    
       </swiper-item>
-      <!-------品牌------->
+      <!--  品牌  -->
       <swiper-item>
             <scroll-view scroll-y="true" class="fenlei-list" 
                 style="height: {{abc}}rpx;"  scroll-into-view="{{scrollIntoView}}">
@@ -111,7 +111,7 @@
                 </view>
         </view>
           <!-- 分类项目内容 -->
-          <view class="flex project_height">
+          <view class="flex project_height" style="margin-left:-10rpx">
                <!-- 分类项目的类型 -->
                <view class="project_type">
            <view class="project_type-frame">
@@ -138,7 +138,7 @@
                  </view>
 
                  </view>
-                 <view wx:else class="sort-name ellipsis-1">{{ittms.items.name}}
+                   <view wx:else class="sort-name ellipsis-1">{{ittms.items.name}}
                  </view>
                  </view>
 
@@ -152,7 +152,7 @@
                 <view class="classify_content">
         <!-- 国家的样式 -->
         <block wx:if="{{select_classify_on==223&&is_show_gb}}">
-        <view class="classify_name fs32 flex-space-between">
+        <view class="classify_name fs30 flex-space-between">
         <view>{{ishaf_three==1?good_list.name:classify_name}}</view>
 
         </view>
@@ -175,9 +175,8 @@
         <!-- 品牌 -->
         <block wx:if="{{select_classify_on==220&&is_show_pp}}">
 
-        <view class="classify_name fs32 flex-space-between">
-        <view>{{classify_name}}</view>
-
+        <view class="classify_name fs30 flex-space-between">
+           <view>{{classify_name}}</view>
         </view>
 
         <view class="classify_content-frame flex flex-wrap">
@@ -199,7 +198,7 @@
         <block  wx:if="{{is_show_pl}}">
         <block wx:if="{{select_classify_on!=220&&select_classify_on!=223&&is_level_three!=1}}">
              <view>
-                 <view class="classify_name fs32 flex-space-between"data-pid="0"data-cid="{{cat_id}}" bindtap='select_more'>
+                 <view class="classify_name fs30 flex-space-between"data-pid="0"data-cid="{{cat_id}}" bindtap='select_more'>
             <view class="classify_title ellipsis-1">{{classify_name}}</view>
               <view class="flex select_more" >
                 <view class="red-co fs24" >更多</view>
@@ -229,7 +228,7 @@
         <block wx:for="{{goodslist}}"wx:for-item="goods"wx:for-index="inds">
         <view>
 
-        <view class="classify_name fs32 flex-space-between"data-pid="{{goods.items.parent_id}}" data-cid="{{goods.items.id}}" bindtap='select_more'>
+        <view class="classify_name fs30 flex-space-between"data-pid="{{goods.items.parent_id}}" data-cid="{{goods.items.id}}" bindtap='select_more'>
         <view class="classify_title ellipsis-1">{{goods.items.name}}</view>
         <view class="flex select_more" >
           <view class="red-co fs24" >更多</view>
diff --git a/pages/goods/categoryList/categoryList.wxss b/pages/goods/categoryList/categoryList.wxss
index 03df8f2..7502669 100644
--- a/pages/goods/categoryList/categoryList.wxss
+++ b/pages/goods/categoryList/categoryList.wxss
@@ -200,7 +200,7 @@ margin-top: 8rpx;
 
 }
 .project_type{
-  width: 33%;
+  width: 26%;
   height: 100%;
   border-right: 1rpx solid #eee;
   white-space: nowrap;
@@ -212,15 +212,14 @@ overflow-y: scroll;
   margin: auto;
   width: 58%;
   margin-top: 40rpx;
-overflow: hidden;
-
 }
 .xc-letter-spacing{
-padding-left: 29rpx;
+padding-left: 20rpx;
 padding-right: 29rpx;
-width: 51%;
+width: 58%;
 margin: auto;
 margin-top: 40rpx;
+margin-left:28rpx; 
 
 
 }
@@ -260,7 +259,7 @@ width: 60%;
 
  }
  .classify_content{
-   width: 67%
+   width: 72%
    
  }
  .classify_content-frame{
diff --git a/pages/user/cardinfo/cardinfo.js b/pages/user/cardinfo/cardinfo.js
index 254216a..32e15d4 100644
--- a/pages/user/cardinfo/cardinfo.js
+++ b/pages/user/cardinfo/cardinfo.js
@@ -42,7 +42,8 @@ Page({
     free:null,//分佣的数据
     expiryDate:"",//卡到期时间
 	is_guoqi:0,  //卡是不是过期
-      
+	
+	yu_e_show:0,//装入余额的弹窗    
   },
  
 
@@ -78,8 +79,8 @@ Page({
           big_card = plusCard[i]
         }
       }
-      console.log(big_cards, "是什么东西", big_card);
-
+      
+	  console.log(big_cards, "是什么东西", big_card);
       ee.setData({
         is_plusCard: plusCard,
         big_card: big_card
@@ -651,42 +652,45 @@ Page({
   onReachBottom: function () {
     var goods_list = this.selectComponent("#goods_list"); //组件的id
     goods_list.get_list();
-    this.setData({
-      j: true
-    })
+   
   },
 
   
-  
   //--转到用户余额--
   to_user_money:function(){
-	  var th=this,free=th.data.free;
-	  if(!th.data.free.RefereeMoney){
-		  getApp().my_warnning("您没有转入余额",0,th); return false;
-	  }
-	  
-	  wx.showModal({
-	    title: '提示',
-	    content: '您确定要转入余额吗？',
-	    success(res) {
-	      if (res.confirm) {
-	           getApp().request.post("/api/weshop/plus/withdrawal/referee/money",{
-				    data:{storeId:os.stoid,userId:getApp().globalData.user_id},
-					success:function(res){
-						 if(res.data.code==0){
-							 getApp().my_warnning("转入成功",0,th);
-							 free.VIPRebate=0;
-							 th.setData({free:free});							 						 
-						 }else{
-							 getApp().my_warnning(res.data.msg ,0,th);
-						 }
-					}
-			   })
-	      } 
-	    }
-	  })
+	  this.setData({yu_e_show:1})
   },
-  
+  close_yu_e:function(){
+  	  this.setData({yu_e_show:0})
+  },
+  go_yu_e:function(){
+  	   var th=this,free=th.data.free;
+  	   if(!th.data.free.VIPRebate){
+  	   		getApp().my_warnning("您没有转入余额",0,th); return false;
+  	   }	   
+  	   wx.showModal({
+  	     title: '提示',
+  	     content: '您确定要转入余额吗？',
+  	     success(res) {
+  	       if (res.confirm) {
+  	            getApp().request.post("/api/weshop/plus/withdrawal/referee/money",{
+  	   				    data:{storeId:os.stoid,userId:getApp().globalData.user_id},
+  	   					success:function(res){
+  	   						 if(res.data.code==0){
+  	   							 getApp().my_warnning("转入成功",0,th);
+  	   							 free.VIPRebate=0;
+  	   							 th.setData({free:free});							 						 
+  	   						 }else{
+  	   							 getApp().my_warnning(res.data.msg ,0,th);
+  	   						 }
+  	   					}
+  	   			   })
+  	       } 
+  	     }
+  	   })
+  },
+   
+   
   //-----立即续费的功能------
   xufei:function(){  
 	    var th = this;
@@ -708,5 +712,5 @@ Page({
   success:function () {
       getApp().my_warnning("支付成功",0,this);
   },
-
+  
 })
\ No newline at end of file
diff --git a/pages/user/cardinfo/cardinfo.wxml b/pages/user/cardinfo/cardinfo.wxml
index 330408f..2ada240 100644
--- a/pages/user/cardinfo/cardinfo.wxml
+++ b/pages/user/cardinfo/cardinfo.wxml
@@ -122,40 +122,24 @@
   </view>
   
 
-
-<view class="xc-pop-up"  wx:if="{{q_show}}">
-
-  <view class="xc-obscuration" bindtap='close' catchtouchmove="ture"></view>
-  <view>
-   
-  <view class="xc-qr-frame">
-   <view class="shut" bindtap="close">ⅹ</view>
-    <view class="fs36 xc-black3 flex jc-center ai-center" style="width:100%;height:200rpx;">确定把所有奖励金转入余额</view> 
-    <view class="flex jc-center ai_center" style="width: 100%;height: 75rpx;">
-  <view class="fs36 white flex jc-center ai-center"style="width:40%;height:60rpx;line-height:60rpx;background:#f35e73;border-radius:10rpx;margin-right: 20rpx;">是的</view>
-    <view class="fs36 xc-ash flex jc-center ai-center"style="width:40%;height:60rpx;line-height:60rpx;border-radius:10rpx;background:#ececea;">再看看</view>
-  </view>
+<!-- 转入余额提示  -->
+<view class="xc-pop-up"  wx:if="{{yu_e_show}}">
+   <!--  -->
+  <view class="xc-obscuration" bindtap='close_yu_e' catchtouchmove="ture"></view>
+  <view> 
+		<view class="xc-qr-frame">
+		<view class="shut" bindtap="close_yu_e">ⅹ</view>
+		 <view class="fs36 xc-black3 flex jc-center ai-center" style="width:100%;height:200rpx;">确定把所有奖励金转入余额</view> 
+		 <view class="flex jc-center ai_center" style="width: 100%;height: 75rpx;">
+			 <view bindtap="go_yu_e" class="fs36 white flex jc-center ai-center"
+			    style="width:40%;height:60rpx;line-height:60rpx;background:#f35e73;border-radius:10rpx;margin-right: 20rpx;">是的</view>
+			 <view  bindtap='close_yu_e' class="fs36 xc-ash flex jc-center ai-center"style="width:40%;height:60rpx;line-height:60rpx;border-radius:10rpx;background:#ececea;">再看看</view>
+		  </view>
+		</view>
   </view>
-  
-
-</view>
-
 </view>
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
   <!-- 商品列表组件 -->
     <goods_recommend id="goods_list"></goods_recommend>
     <!-- 商品列表 -->
--
libgit2 0.21.4