微服务联调,修改注册登录， 机构资料修改

src/main/resources/static/js/supplier-center/dashboard.js

@@ -7,6 +7,7 @@
         formData:new FormData(),
         goodImage:'',
         shopinfo:{},
+        userInfo:{},
         promotions:{},
         rankingList:[],
         titleSshow:false,
@@ -24,6 +25,7 @@
                      _this.homeData = res.data;
                      _this.goodImage = _this.homeData.user.image;
                      _this.shopinfo = res.data.shop;
+                     _this.userInfo = res.data.user;
                      _this.promotions = res.data.promotions;
                      _this.rankingList = res.data.salesRankingList;
                      if (res.data.unReadMessageCount>99){

src/main/resources/static/js/supplier-center/setting/information.js

@@ -118,7 +118,8 @@
     },
          shopInfo:function(){
             var _this = this;
-             SupplierApi.shopInfo({userId:_this.params.userID},function(res){
+            console.log()
+             SupplierApi.shopInfo({userId:_this.params.userId},function(res){
                 if(res.code==0){
                     _this.isRequset=false;
                     var shop = res.data.shop;

src/main/resources/static/js/user-center/setting/information.js

@@ -100,22 +100,23 @@ var informationPage = new Vue({
                     var data = response.data;
                     _self.isRequset = false;
                     _self.clubUpgradeUser = data.club;
-                    _self.bindMobile = data.user.bindMobile;
-                    _self.userIdentity = data.user.userIdentity;
+                    _self.bindMobile = data.user.bindMobile ? data.user.bindMobile : '';
+                    _self.userIdentity = data.user.userIdentity ? data.user.userIdentity : '';
                     _self.addressfrom.clubId = data.user.clubId;
                     _self.addressfrom.userId = data.user.userId;
-                    _self.addressfrom.contractEmail = data.user.contractEmail;
-                    _self.addressfrom.provinceId = data.club.provinceId;
-                    _self.addressfrom.cityId = data.club.cityId;
-                    _self.addressfrom.townId = data.club.townId;
-                    _self.clubUpgradeUser.provinceId = data.club.provinceId;
-                    _self.clubUpgradeUser.cityId = data.club.cityId;
-                    _self.clubUpgradeUser.townId= data.club.townId;
-                    _self.clubUpgradeUser.shopPhoto = data.club.shopPhoto;
-                    _self.clubUpgradeUser.businessLicense = data.club.businessLicense;
-                    _self.clubUpgradeUser.firstClubType = data.club.firstClubType;
-                    _self.clubUpgradeUser.secondClubType = data.club.secondClubType;
-                    _self.clubUpgradeUser.address = data.club.address;
+                    _self.addressfrom.contractEmail = data.user.contractEmail ? data.user.contractEmail : '';
+                    _self.addressfrom.provinceId = data.club.provinceId ? data.club.provinceId : 0;
+                    _self.addressfrom.cityId = data.club.cityId ? data.club.cityId : null;
+                    _self.addressfrom.townId = data.club.townId ? data.club.townId : null;
+                    _self.clubUpgradeUser.provinceId = data.club.provinceId ? data.club.provinceId : null;
+                    _self.clubUpgradeUser.cityId = data.club.cityId ? data.club.cityId : null;
+                    _self.clubUpgradeUser.townId= data.club.townId ? data.club.townId : null;
+                    _self.clubUpgradeUser.shopPhoto = data.club.shopPhoto ? data.club.shopPhoto : null;
+                    _self.clubUpgradeUser.businessLicense = data.club.businessLicense ? data.club.businessLicense : null;
+                    _self.clubUpgradeUser.firstClubType = data.club.firstClubType ? data.club.firstClubType : null;
+                    _self.clubUpgradeUser.secondClubType = data.club.secondClubType ? data.club.secondClubType :null;
+                    _self.clubUpgradeUser.address = data.club.address ? data.club.address : null;
+                    console.log('1111111111111111111');
                     if( _self.clubUpgradeUser.firstClubType == 1){
                         if(data.club.mainProduct){
                             _self.userMainPros = _self.setNewMainpro(data.club.mainProduct);
@@ -271,7 +272,8 @@ var informationPage = new Vue({
             if (_self.mainProEdit.length>0) {
                 if (_self.mainPros.indexOf(_self.mainProEdit)<0){
                     var obj = {name:_self.mainProEdit};
-                    if(_self.clubUpgradeUser.firstClubType === '0'){
+                    console.log(obj);
+                    if(_self.clubUpgradeUser.firstClubType === 2){
                         if(_self.checkedArray(_self.mainProEdit,_self.mentuzCampNullList)){
                             CAIMEI.dialog('主营内容已存在!',false);
                         }else {

src/main/resources/static/js/user-center/setting/upgrade.js

@@ -24,7 +24,6 @@ var upgradePage = new Vue({
             address:''
         },
         userMainPros:[],
-
         formData:new FormData(),
         mentuzCampNullList:[
             {value:'1',name:'整形'},
@@ -90,7 +89,11 @@ var upgradePage = new Vue({
                     _self.clubUpgradeUser.secondClubType = data.club.secondClubType;
                     _self.clubUpgradeUser.address = data.club.address;
                      _self.userMainPros = _self.setNewMainpro(data.club.mainProduct);
-                    console.log(_self.userMainPros);
+                    if( _self.clubUpgradeUser.contractEmail){
+                        _self.clubUpgradeUser.name = data.club.name;
+                    }else{
+                        _self.clubUpgradeUser.name = '';
+                    }
                     if(data.club.provinceId ==null){
                          _self.clubUpgradeUser.provinceId = 0;
                      }
@@ -216,17 +219,17 @@ var upgradePage = new Vue({
             if (_self.mainProEdit.length>0) {
                 if (_self.mainPros.indexOf(_self.mainProEdit)<0){
                     var obj = {name:_self.mainProEdit};
-                    if(_self.clubUpgradeUser.firstClubType === '0'){
-                        if(_self.checkedArray(_self.mainProEdit,_self.mentuzCampNullList)){
+                    if(_self.clubUpgradeUser.firstClubType === 2){
+                        if(_self.checkedArray(_self.mainProEdit,_self.medicaCampNullList)){
                             CAIMEI.dialog('主营内容已存在!',false);
                         }else {
-                            _self.mentuzCampNullList.push(obj);
+                            _self.medicaCampNullList.push(obj);
                         }
                     }else{
-                        if(_self.checkedArray(_self.mainProEdit,_self.medicaCampNullList)){
+                        if(_self.checkedArray(_self.mainProEdit,_self.mentuzCampNullList)){
                             CAIMEI.dialog('主营内容已存在!',false);
                         }else {
-                            _self.medicaCampNullList.push(obj);
+                            _self.mentuzCampNullList.push(obj);
                         }
                     }
                 }

src/main/resources/templates/supplier-center/dashboard.html

@@ -58,7 +58,7 @@
                                     </div>
                               </span>
                         </div>
-                        <p class="username">用户名：{{shopinfo.name}}</p>
+                        <p class="username">用户名：{{userInfo.name}}</p>
                         <span class="perfect" v-if="homeData.dataIntegrity!='100%'" @click="perfect">立即完善</span>
                         <span class="ziliao">资料完整度：<span>{{homeData.dataIntegrity}}</span></span>
                     </div>