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

taiyuan
2 parents 9f9035a5 89ffb03d
Showing 4 changed files with 20 additions and 9 deletions
app.js
packageA/pages/distribution/goods/goods.json
pages/distribution/distribution.js
pages/distribution/distribution.wxml
@@ -94,10 +94,17 @@ App({
             if (user && user.user_id){
 				//--生成会员 --
 				app.promiseGet("/api/weshop/users/get/" + user.store_id + "/" + user.user_id,{}).then(res=>{
-					  if(res.data.code==0){
+					  if(res.data.code==0){			  					  
 							user=res.data.data;  
-							app.globalData.userInfo=user;
-							app.globalData.user_id= user.user_id;
+	                        //-- 小程序会员被解绑了,就要清空会员 --
+							if(user['is_weappuser']==0){
+								user=null;
+								app.globalData.userInfo=null;
+								app.globalData.user_id= 0;
+							}else{
+								app.globalData.userInfo=user;
+								app.globalData.user_id= user.user_id;
+							}							
 							wx.setStorageSync("userinfo",user);
 					  }
 				})
@@ -2,6 +2,6 @@
   "usingComponents": {
 		"nodata": "/components/nodata/nodata"
 	},
-	"navigationBarTitleText": "上下架商品",
+	"navigationBarTitleText": "",
 	"enablePullDownRefresh": false
 }
 \ No newline at end of file
@@ -256,6 +256,8 @@ Page({
 		let index = e.target.dataset.index;
 		let mobile = 0;
 		var th=this;
+		var inv=e.currentTarget.dataset.inv;
+		if(!this.data.inputValue) this.data.inputValue=inv;
 		if(this.data.inputValue) {
 			mobile = this.data.inputValue;
 			if(!pass) {
@@ -75,10 +75,12 @@
 	<!-- 如果分销没有开启或者过期 -->
 	<block wx:if="{{err_word}}">
-		<view class="t-c pd20 title">提示<text class="iconfont icon-close" bindtap="goto" data-url="/pages/user/index/index"></text></view>
-		<view class="t-c pd20">
-			<image src="{{imghost + 'miniapp/images/user/nodistribut.png'}}" class="img"/>
-			<view class="fs28 pdt40">{{err_word}}</view>
+		<view class="popup">	
+			<view class="t-c pd20 title">提示<text class="iconfont icon-close" bindtap="goto" data-url="/pages/user/index/index"></text></view>
+			<view class="t-c pd20">
+				<image src="{{imghost + 'miniapp/images/user/nodistribut.png'}}" class="img"/>
+				<view class="fs28 pdt40">{{err_word}}</view>
+			</view>
 		</view>
 		<!-- 遮罩 -->
 		<view class="mask"></view>
@@ -105,7 +107,7 @@
 							<view class="flex ali-c">		
 								<text wx:if="{{item.inviter}}">{{item.inviter}}</text>
 								<input wx:else class="bg-f0 pdh10 input" type="number" value="{{item.inviter ? item.inviter:''}}" placeholder="请输入推荐人手机号码" disabled="{{item.pass}}" bindinput="getInput"/>
-								<view class="verify" wx:if="{{!item.pass}}" bindtap="verify" data-index="{{index}}" data-pass="{{item.pass}}">验证</view>
+								<view class="verify" wx:if="{{!item.pass}}" inv="{{item.inviter}}"  bindtap="verify" data-index="{{index}}" data-pass="{{item.pass}}">验证</view>
 							</view>
 						</view>
 						<text class="iconfont {{item.pass ? 'icon-yes c-red':'icon-yuanquan c-c7'}}"></text>