用户地址页完善

496_dongfengqichen/pages/guessSecond/guessSecond.wxml

@@ -2,7 +2,7 @@
 <view class="main">
     <image class="pageBg" src="{{imgUrl+'/versions/20.png?v=002'}}"></image>
     <view class="topGroup">
-      <image class="newImages5-2" src="{{imgUrl+'/newImages5/2.png'}}"></image>
+      <image class="newImages5-2" src="{{imgUrl+'/newImages5/68.png'}}"></image>
       <image class="newImages5-1" bindtap="lookConfigure" src="{{imgUrl+'/newImages5/1.png'}}"></image>
     </view>
     <image class="newImages5-3" src="{{imgUrl+'/newImages5/'+(guessResult?drawState?'36':'38':'37')+'.png'}}"></image>

496_dongfengqichen/pages/guessSecond/guessSecond.wxss

@@ -34,8 +34,8 @@ view{
 }
 .topGroup{
   position: relative;
-  width: 678rpx;
-  height: 388rpx;
+  width: 677rpx;
+  height: 405rpx;
   margin: 0 auto;
   margin-top: 100rpx;
 }

496_dongfengqichen/pages/guessSecondPrize/guessSecondPrize.wxml

@@ -2,7 +2,7 @@
 <view class="main">
     <image class="pageBg" src="{{imgUrl+'/versions/20.png?v=002'}}"></image>
     <view class="topGroup">
-      <image class="newImages5-2" src="{{imgUrl+'/newImages5/2.png'}}"></image>
+      <image class="newImages5-2" src="{{imgUrl+'/newImages5/68.png'}}"></image>
       <image class="newImages5-1" src="{{imgUrl+'/newImages5/1.png'}}"></image>
     </view>
     <view wx:if="{{!isGuess}}">

496_dongfengqichen/pages/guessSecondPrize/guessSecondPrize.wxss

@@ -85,8 +85,8 @@ view{
 }
 .topGroup{
   position: relative;
-  width: 678rpx;
-  height: 388rpx;
+  width: 677rpx;
+  height: 405rpx;
   margin: 0 auto;
   margin-top: 100rpx;
 }

496_dongfengqichen/pages/myCenter/myCenter.js

@@ -281,15 +281,16 @@ Page({
     // if (!app.globalData.isRegister) {
       // this.getOrderInfo();
     // }
-    console.log(app.globalData.userInfoData);
     if (app.globalData.userInfoData) {
-      this.data.userData.avatarUrl = app.globalData.userInfoData.avatarUrl;
-      this.data.userData.nickName = app.globalData.userInfoData.nickName;
-      this.data.userData.userLevel = app.globalData.userInfoData.userLevel;
-      this.setData({
-        isLogin: true,
-        userData: this.data.userData
-      })
+      if(app.globalData.userInfoData.avatarUrl){
+        this.data.userData.avatarUrl = app.globalData.userInfoData.avatarUrl;
+        this.data.userData.nickName = app.globalData.userInfoData.nickName;
+        this.data.userData.userLevel = app.globalData.userInfoData.userLevel;
+        this.setData({
+          isLogin: true,
+          userData: this.data.userData
+        })
+      }
     }
   },
   /**
@@ -599,7 +600,7 @@ Page({
     app.wxRequest(app.globalData.urlRoot + 'userInfo/getUserInfo', {}, res => {
       if (res.code == 200) {
         if (res.data && res.data.avatarUrl) {
-          if (!app.globalData.userInfoData) {
+          if (!app.globalData.userInfoData.nickName) {
             this.data.userData.avatarUrl = res.data.avatarUrl;
             this.data.userData.nickName = res.data.nickName;
             this.data.userData.userLevel = res.data.userLevel;
@@ -612,7 +613,7 @@ Page({
               nickName: res.data.nickName,
               userLevel: res.data.userLevel,
             })
-          } else if (app.globalData.userInfoData){
+          } else if (app.globalData.userInfoData.nickName){
             if (app.globalData.userInfoData.userLevel != res.data.userLevel) {
               this.data.userData.userLevel = res.data.userLevel;
               app.globalData.userInfoData.userLevel = res.data.userLevel;
@@ -632,7 +633,7 @@ Page({
           this.setData({
             userData: this.data.userData
           })
-          if (!app.globalData.userInfoData){
+          if (app.globalData.userInfoData.nickName){
             this.setData({
               isLogin: true
             })
@@ -746,7 +747,6 @@ Page({
     }
   },
   scrolltolower2:function(){
-    console.log(this.data.noData2);
     if(!this.data.noData2){
       this.data.parames2.page+=1;
       this.getMyAwardList();
@@ -821,7 +821,7 @@ Page({
     }
   },
   addressControl: function () {//跳转到地址管理
-    if (app.globalData.userInfoData) {
+    if (app.globalData.nickName) {
       this.data.userData.avatarUrl = app.globalData.userInfoData.avatarUrl;
       this.data.userData.nickName = app.globalData.userInfoData.nickName;
       this.setData({

496_dongfengqichen/pages/userMsg/userMsg.js

@@ -68,7 +68,7 @@ Component({
           submitData: this.data.submitData
         })
       }
-      if (app.globalData.userInfoData) {
+      if (app.globalData.userInfoData.nickName) {
         this.data.userData.avatarUrl = app.globalData.userInfoData.avatarUrl;
         this.data.userData.nickName = app.globalData.userInfoData.nickName;
         this.setData({
@@ -88,13 +88,19 @@ Component({
             this.data.submitData.mobile = res.data.mobile;
             this.data.submitData.province = res.data.province;
             this.data.submitData.city = res.data.city;
+            this.data.submitData.agentDetail = res.data.agentDetail;
+            this.data.submitData.agent_code = res.data.agent_code;
             this.data.submitData.addressDetail = res.data.addressDetail;
             this.setData({
-              submitData: this.data.submitData
+              submitData: this.data.submitData,
+              mobile2:res.data.mobile
             })
-            if(!res.data.agentDetail){
-              this.getUserLocation();//获取用户当前位置
-            }
+            // if(!res.data.agentDetail){
+              this.getDistributorList("","");
+              // this.getUserLocation();//获取用户当前位置
+            // }
+          }else{
+            this.getUserLocation();//获取用户当前位置
           }
         } else {
           wx.showToast({
@@ -105,7 +111,11 @@ Component({
       }, this);
     },
     addAddress: function () {//添加地址
-      app.wxRequest(app.globalData.urlRoot + "address/addAddress", this.data.submitData, res => {
+      var mobile = this.data.submitData.mobile;
+      if(this.data.selectType==2){
+        this.data.submitData.mobile = this.data.mobile2;
+      }
+      app.wxRequest(app.globalData.urlRoot + "address/addAddressV2", this.data.submitData, res => {
         wx.showToast({
           title: res.msg,
         })
@@ -122,7 +132,11 @@ Component({
       }, this, "POST")
     },
     updateAddress: function () {//更新地址
-      app.wxRequest(app.globalData.urlRoot + "address/updateAddress", this.data.submitData, res => {
+      var mobile = this.data.submitData.mobile;
+      if(this.data.selectType==2){
+        this.data.submitData.mobile = this.data.mobile2;
+      }
+      app.wxRequest(app.globalData.urlRoot + "address/updateAddressV2", this.data.submitData, res => {
         wx.showToast({
           title: res.msg,
         })
@@ -157,7 +171,9 @@ Component({
       })
     },
     getMobile2: function (e) {//获取用户输入的电话---无验证码
-      this.data.mobile2 = e.detail.value;
+      this.setData({
+        mobile2:e.detail.value
+      })
     },
     getAddressDetail: function (e) {//获取详细地址
       this.data.submitData.addressDetail = e.detail.value;
@@ -168,32 +184,27 @@ Component({
     saveUserMsg:function(){
       if (!this.data.submitData.realName) {
         wx.showToast({
-          title: '请输入收货人',
+          title: '请输入姓名',
           icon: "none"
         })
         return;
       }
-      if (!app.mobileVerify(this.data.submitData.mobile)) {
-        if (this.data.submitData.mobile) {
-          wx.showToast({
-            title: '请输入正确的电话',
-            icon: 'none'
-          })
-        } else {
-          wx.showToast({
-            title: '请输入电话',
-            icon: 'none'
-          })
-        }
-        return;
-      }
-      if (!this.data.submitData.province) {
+      if (!this.data.mobile2 && this.data.selectType==2) {
         wx.showToast({
-          title: '请选择所在地区',
-          icon: 'none'
+          title: '请输入电话',
+          icon: "none"
         })
         return;
       }
+      if (this.data.selectType == 2) {
+        if (!this.data.submitData.captcha) {
+          wx.showToast({
+            title: '请输入验证码',
+            icon: "none"
+          })
+          return;
+        }
+      }
       if (!this.data.submitData.addressDetail) {
         wx.showToast({
           title: '请输入详细地址',
@@ -201,6 +212,14 @@ Component({
         })
         return;
       }
+      this.data.submitData.province = this.data.provinceDataArr[0][this.data.provinceDataValue[0]];
+      this.data.submitData.city = this.data.provinceDataArr[1][this.data.provinceDataValue[1]];
+      this.data.submitData.agent_code = this.data.storeArr[this.data.storeValue].agent_code;
+      this.data.submitData.agentDetail = this.data.storeArr[this.data.storeValue].agent_detail;
+      this.data.submitData.scene = app.globalData.sceneSource;
+      // console.log(this.data.submitData);
+
+      // return;
       wx.showLoading({
         title: '保存中',
         mask: true
@@ -288,6 +307,9 @@ Component({
     },
     getCaptcha: function (e) {//获取用户输入的验证码
       this.data.submitData.captcha = e.detail.value;
+      this.setData({
+        submitData:this.data.submitData
+      })
     },
     getCode: function (e) {//获取验证码
       if (!app.mobileVerify(this.data.mobile2)) {
@@ -386,9 +408,28 @@ Component({
           for (let i = 0; i < res.data.list.length; i++) {
             province.push(res.data.list[i].province);
           }
+          for(let i=0;i<province.length;i++){
+            if(province[i]==this.data.submitData.province){
+              res.data.nearData.provinceIndex = i;
+            }
+          }
           for (let j = 0; j < res.data.list[res.data.nearData.provinceIndex].children.length; j++) {
             city.push(res.data.list[res.data.nearData.provinceIndex].children[j].city)
           }
+          for(let i=0;i<city.length;i++){
+            if(city[i]==this.data.submitData.city){
+              res.data.nearData.cityIndex = i;
+            }
+          }
+          if(this.data.submitData.agentDetail){
+            for(let i=0;i<res.data.list[res.data.nearData.provinceIndex].children[res.data.nearData.cityIndex].children.length;i++){
+              if(res.data.list[res.data.nearData.provinceIndex].children[res.data.nearData.cityIndex].children[i]==this.data.submitData.agentDetail){
+                res.data.nearData.agentIndex = i;
+              }
+            }
+          }else{
+            res.data.nearData.agentIndex = 0;
+          }
           //将数据赋值给变量
           this.setData({
             provinceDataAll: res.data.list,