wxd / MShopWeApp

Commit 0f421fa1fefb78f3fd8efd67e8a4ed2777b921ff

Authored by yvan.ni
1 parent 8846d73d

购卡不能是自己， 转入余额的显示bug， 图片组合的自定义模板

Inline Side-by-side
Showing 5 changed files with 17 additions and 8 deletions
components/diy_picMax/diy_picMax.js
  View file @0f421fa
... ... @@ -14,13 +14,14 @@ Component({
14 14 ready: function () {
15 15 //console.log(this.data.object.data)
16 16 //--计算图片组合占用的高度--
  17 + /*--
17 18 var height=0;
18 19 this.properties.object.data.forEach(function (val,ind) {
19 20 if(val.fir.x==0){
20 21 height+=val.y_span*187;
21 22 }
22 23 })
23   - this.setData({pic_height:height})
  24 + this.setData({pic_height:height})--*/
24 25  
25 26 },
26 27 methods: {
... ...
components/diy_picMax/diy_picMax.wxml
  View file @0f421fa
1 1 <!--图片组合-->
2   -<view class="picMax" style="height: {{pic_height}}rpx">
  2 +<!-- <view class="picMax" style="height: {{pic_height}}rpx"> -->
  3 +<view class="picMax" >
3 4 <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}}">
4   - <image bindtap='gopage' data-url="{{item.wxapp_url}}" src="{{item.src}}" mode="widthFix"></image>
  5 + <image bindtap='gopage' data-url="{{item.wxapp_url}}" src="{{item.src}}" mode="widthFix" style="display: block;" ></image>
5 6 </view>
6 7 </view>
... ...
components/diy_picMax/diy_picMax.wxss
  View file @0f421fa
1 1 .picMax{width: 100%;position: relative;}
2   -.pic_item{position: absolute; top:0;left:0;}
  2 +.pic_item{display: inline-block; top:0;left:0;vertical-align: middle}
3 3 .pic_item image{width: 100%; height: 100%}
4 4 .width_1{width: 187.5rpx}.width_2{width: 375rpx;}.width_3{width: 562.5rpx}.width_4{width:748rpx;}
5   -.height_1{height: 187.5rpx;}.height_2{height: 375rpx;}.height_3{height: 562.5rpx}.height_4{height: 748rpx;}
6   -.mar_x1{margin-left:187.5rpx;}.mar_x2{margin-left:375rpx;}.mar_x3{margin-left:562.5rpx}.mar_x4{margin-left: 748rpx;}
7   -.mar_y1{margin-top: 187.5rpx;}.mar_y2{margin-top: 375rpx;}.mar_y3{margin-top: 562.5rpx}.mar_y4{margin-top: 748rpx;}
  5 +/* .height_1{height: 187.5rpx;}.height_2{height: 375rpx;}.height_3{height: 562.5rpx}.height_4{height: 748rpx;} */
  6 +/* .mar_x1{margin-left:187.5rpx;}.mar_x2{margin-left:375rpx;}.mar_x3{margin-left:562.5rpx}.mar_x4{margin-left: 748rpx;}
  7 +.mar_y1{margin-top: 187.5rpx;}.mar_y2{margin-top: 375rpx;}.mar_y3{margin-top: 562.5rpx}.mar_y4{margin-top: 748rpx;} */
8 8 .picMax-clear{clear: both;}
9 9 \ No newline at end of file
... ...
pages/user/cardinfo/cardinfo.js
  View file @0f421fa
... ... @@ -675,7 +675,7 @@ Page({
675 675 success:function(res){
676 676 if(res.data.code==0){
677 677 getApp().my_warnning("转入成功",0,th);
678   - free.RefereeMoney=0;
  678 + free.VIPRebate=0;
679 679 th.setData({free:free});
680 680 }else{
681 681 getApp().my_warnning(res.data.msg ,0,th);
... ...
pages/user/plus/plus.js
  View file @0f421fa
... ... @@ -233,6 +233,13 @@ Page({
233 233 getApp().my_warnning("请输入邀请码", 0, th);
234 234 return false;
235 235 }
  236 +
  237 + //--邀请人不能是自己的手机号--
  238 + if(th.data.inp_recommon==getApp().globalData.userInfo.mobile){
  239 + getApp().my_warnning("邀请人不能填自已", 0, th);
  240 + return false;
  241 + }
  242 +
236 243 req.recommon = th.data.inp_recommon
237 244 }
238 245 //--后台要求要输入营业员--
... ...