Commit ffba0e2077dd0decc26f163baf881c11e80ffc8e

Authored by taiyuan
2 parents 2a3fb66b 6e7ea1c7

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

pages/distribution/distribution.js
... ... @@ -154,9 +154,7 @@ Page({
154 154 if(res.data.code==0){
155 155 var user= res.data.data;
156 156 if(user.is_distribut==1){
157   - data.fenxiao[i].inviter=user.mobile;
158   -
159   - self.setData(data);
  157 + data.fenxiao[i].inviter=user.mobile;
160 158 }
161 159 }
162 160 })
... ... @@ -256,7 +254,9 @@ Page({
256 254 let index = e.target.dataset.index;
257 255 let mobile = 0;
258 256 var th=this;
259   - var inv=e.currentTarget.dataset.inv;
  257 + var item=this.data.fenxiao[index];
  258 +
  259 + var inv=item.inviter;
260 260 if(!this.data.inputValue) this.data.inputValue=inv;
261 261 if(this.data.inputValue) {
262 262 mobile = this.data.inputValue;
... ...
pages/distribution/distribution.wxml
... ... @@ -107,7 +107,7 @@
107 107 <view class="flex ali-c">
108 108 <text wx:if="{{item.inviter}}">{{item.inviter}}</text>
109 109 <input wx:else class="bg-f0 pdh10 input" type="number" value="{{item.inviter ? item.inviter:''}}" placeholder="请输入推荐人手机号码" disabled="{{item.pass}}" bindinput="getInput"/>
110   - <view class="verify" wx:if="{{!item.pass}}" inv="{{item.inviter}}" bindtap="verify" data-index="{{index}}" data-pass="{{item.pass}}">验证</view>
  110 + <view class="verify" wx:if="{{!item.pass}}" bindtap="verify" data-index="{{index}}" data-pass="{{item.pass}}">验证</view>
111 111 </view>
112 112 </view>
113 113 <text class="iconfont {{item.pass ? 'icon-yes c-red':'icon-yuanquan c-c7'}}"></text>
... ...
pages/index/index/index.wxss
... ... @@ -966,5 +966,4 @@ page {
966 966 /* transform: translateY(-50%); */
967 967 z-index: 10000;
968 968 }
969   -
970   -.dis_top{position: fixed; top: 0; left: 0; width: 100%;}
971 969 \ No newline at end of file
  970 +.dis_top{position: fixed; top: 0; left: 0; width: 100%; z-index: 100000;}
972 971 \ No newline at end of file
... ...
utils/filter.wxs
1 1 var filters = {
2 2 toFix: function (val, count) {
  3 + if(!val){
  4 + return parseFloat(0).toFixed(count);
  5 + }
3 6 val = parseFloat(val);
4 7 return val.toFixed(count)
5 8 },
... ...