From 0f421fa1fefb78f3fd8efd67e8a4ed2777b921ff Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Thu, 7 Nov 2019 07:53:45 +0800
Subject: [PATCH] 购卡不能是自己，  转入余额的显示bug，  图片组合的自定义模板

---
 components/diy_picMax/diy_picMax.js   | 3 ++-
 components/diy_picMax/diy_picMax.wxml | 5 +++--
 components/diy_picMax/diy_picMax.wxss | 8 ++++----
 pages/user/cardinfo/cardinfo.js       | 2 +-
 pages/user/plus/plus.js               | 7 +++++++
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/components/diy_picMax/diy_picMax.js b/components/diy_picMax/diy_picMax.js
index f7ad03a..ad9af0e 100644
--- a/components/diy_picMax/diy_picMax.js
+++ b/components/diy_picMax/diy_picMax.js
@@ -14,13 +14,14 @@ Component({
   ready: function () {
      //console.log(this.data.object.data)
      //--计算图片组合占用的高度--
+	 /*--
      var height=0;
      this.properties.object.data.forEach(function (val,ind) {
          if(val.fir.x==0){
            height+=val.y_span*187;
          }
      })
-     this.setData({pic_height:height})
+     this.setData({pic_height:height})--*/
 
   },
   methods: {
diff --git a/components/diy_picMax/diy_picMax.wxml b/components/diy_picMax/diy_picMax.wxml
index b518cc8..8a645cd 100644
--- a/components/diy_picMax/diy_picMax.wxml
+++ b/components/diy_picMax/diy_picMax.wxml
@@ -1,6 +1,7 @@
 <!--图片组合-->
-<view class="picMax" style="height: {{pic_height}}rpx">
+<!-- <view class="picMax" style="height: {{pic_height}}rpx"> -->
+<view class="picMax" >
     <view wx:for="{{object.data}}"  class="pic_item width_{{item.x_span}} height_{{item.y_span}} mar_x{{item.fir.x}} mar_y{{item.fir.y}}">
-        <image bindtap='gopage' data-url="{{item.wxapp_url}}" src="{{item.src}}" mode="widthFix"></image>
+        <image bindtap='gopage' data-url="{{item.wxapp_url}}" src="{{item.src}}" mode="widthFix" style="display: block;" ></image>
     </view>
 </view>
diff --git a/components/diy_picMax/diy_picMax.wxss b/components/diy_picMax/diy_picMax.wxss
index e5d053a..170aa45 100644
--- a/components/diy_picMax/diy_picMax.wxss
+++ b/components/diy_picMax/diy_picMax.wxss
@@ -1,8 +1,8 @@
 .picMax{width: 100%;position: relative;}
-.pic_item{position: absolute; top:0;left:0;}
+.pic_item{display: inline-block; top:0;left:0;vertical-align: middle}
 .pic_item image{width: 100%; height: 100%}
 .width_1{width: 187.5rpx}.width_2{width: 375rpx;}.width_3{width: 562.5rpx}.width_4{width:748rpx;}
-.height_1{height: 187.5rpx;}.height_2{height: 375rpx;}.height_3{height: 562.5rpx}.height_4{height: 748rpx;}
-.mar_x1{margin-left:187.5rpx;}.mar_x2{margin-left:375rpx;}.mar_x3{margin-left:562.5rpx}.mar_x4{margin-left: 748rpx;}
-.mar_y1{margin-top: 187.5rpx;}.mar_y2{margin-top: 375rpx;}.mar_y3{margin-top:  562.5rpx}.mar_y4{margin-top: 748rpx;}
+/* .height_1{height: 187.5rpx;}.height_2{height: 375rpx;}.height_3{height: 562.5rpx}.height_4{height: 748rpx;} */
+/* .mar_x1{margin-left:187.5rpx;}.mar_x2{margin-left:375rpx;}.mar_x3{margin-left:562.5rpx}.mar_x4{margin-left: 748rpx;}
+.mar_y1{margin-top: 187.5rpx;}.mar_y2{margin-top: 375rpx;}.mar_y3{margin-top:  562.5rpx}.mar_y4{margin-top: 748rpx;} */
 .picMax-clear{clear: both;}
\ No newline at end of file
diff --git a/pages/user/cardinfo/cardinfo.js b/pages/user/cardinfo/cardinfo.js
index 89e5628..254216a 100644
--- a/pages/user/cardinfo/cardinfo.js
+++ b/pages/user/cardinfo/cardinfo.js
@@ -675,7 +675,7 @@ Page({
 					success:function(res){
 						 if(res.data.code==0){
 							 getApp().my_warnning("转入成功",0,th);
-							 free.RefereeMoney=0;
+							 free.VIPRebate=0;
 							 th.setData({free:free});							 						 
 						 }else{
 							 getApp().my_warnning(res.data.msg ,0,th);
diff --git a/pages/user/plus/plus.js b/pages/user/plus/plus.js
index 123b095..5cc019f 100644
--- a/pages/user/plus/plus.js
+++ b/pages/user/plus/plus.js
@@ -233,6 +233,13 @@ Page({
           getApp().my_warnning("请输入邀请码", 0, th);
           return false;
         }
+		
+		//--邀请人不能是自己的手机号--
+		if(th.data.inp_recommon==getApp().globalData.userInfo.mobile){
+			getApp().my_warnning("邀请人不能填自已", 0, th);
+			return false;
+		}
+		
         req.recommon = th.data.inp_recommon
       }
       //--后台要求要输入营业员--
--
libgit2 0.21.4