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

src/main/resources/static/js/account/supplier-information.js

@@ -8,9 +8,9 @@ var registerPage = new Vue({
             userId:0,
             shopId:0,
             linkMan:'',
-            email:'',
+            contractEmail:'',
             name:'',
-            sname:'',
+            shortName:'',
             socialCreditCode:'',
             businessLicense:'',
             provinceId :'',
@@ -63,8 +63,8 @@ var registerPage = new Vue({
                     var user = res.data.user;
                     _this.supplierUser.name = shop.name;
                     _this.supplierUser.linkMan = shop.linkMan;
-                    _this.supplierUser.email = user.email;
-                    _this.supplierUser.sname = shop.sname;
+                    _this.supplierUser.contractEmail = user.contractEmail;
+                    _this.supplierUser.shortName = shop.shortName;
                     _this.supplierUser.provinceId = shop.provinceId;
                     _this.supplierUser.cityId = shop.cityId;
                     _this.supplierUser.townId= shop.townId;

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

@@ -88,7 +88,23 @@ var upgradePage = new Vue({
                     _self.clubUpgradeUser.firstClubType = data.club.firstClubType;
                     _self.clubUpgradeUser.secondClubType = data.club.secondClubType;
                     _self.clubUpgradeUser.address = data.club.address;
-                     _self.userMainPros = _self.setNewMainpro(data.club.mainProduct);
+                    if( _self.clubUpgradeUser.firstClubType == 1){
+                        if(data.club.mainProduct){
+                            _self.userMainPros = _self.setNewMainpro(data.club.mainProduct);
+                            _self.medicaCampNullList = _self.setNewMainProduct(_self.userMainPros);
+                            console.log(_self.userMainPros)
+                        }else{
+                            _self.userMainPros = _self.medicaCampNullList;
+                        }
+                    }else{
+                        if(data.club.mainProduct){
+                            _self.userMainPros = _self.setNewMainpro(data.club.mainProduct);
+                            _self.mentuzCampNullList = _self.setNewMainProduct(_self.userMainPros);
+                            console.log(_self.userMainPros)
+                        }else{
+                            _self.userMainPros = _self.mentuzCampNullList;
+                        }
+                    }
                     if( _self.clubUpgradeUser.contractEmail){
                         _self.clubUpgradeUser.name = data.club.name;
                     }else{
@@ -107,6 +123,7 @@ var upgradePage = new Vue({
                     }else {
                          _self.clubUpgradeUser.townId = 0
                     }
+
                 }else{
                     CAIMEI.Alert(response.msg,'确定',false);
                 }
@@ -202,15 +219,25 @@ var upgradePage = new Vue({
         clubLoginIndex:function(){// 跳过升级直接去个人中心
             window.location.href = '/user/dashboard.html';
         },
+        setNewMainProduct:function(arr){
+            var Array = [];
+            if(arr){
+                arr.forEach(function(item){
+                    var obj ={
+                        name:item,
+                    };
+                    Array.push(obj);
+                });
+            }
+            return Array
+        },
         setNewMainpro:function(arr){//回显处理主营内容
             var newArr = [];
-            console.log(arr);
-            if (arr!=null){
-                 arr.split('/').forEach(function(item){
-                newArr.push(item);
-            });
+                if (arr!=null){
+                     arr.split('/').forEach(function(item){
+                    newArr.push(item);
+                });
             }
-
             return newArr
         },
         mainProAdd: function(){

src/main/resources/templates/account/supplier-information.html

@@ -39,7 +39,7 @@
                     <h6 class="tit">详细信息</h6>
                     <div class="formLine">
                         <p>公司简称：</p>
-                        <input type="text" v-model.trim="supplierUser.sname" placeholder="请输入公司简称" maxlength="10">
+                        <input type="text" v-model.trim="supplierUser.shortName" placeholder="请输入公司简称" maxlength="10">
                         <span class="errTips"></span>
                     </div>
                     <div class="formLine">