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

src/main/resources/static/js/account/bind.js

@@ -91,6 +91,10 @@ var bindPage = new Vue({
         },
         getMobileCodeFn:function(){//机构注册获取注册短信验证码
             var _self = this;
+            if(_self.imageCode == ''){
+                CAIMEI.dialog('请输入图形验证码',false,function () {});
+                return
+            }
             var params = {
                     mobile: _self.user.mobile,
                     bindMobile: _self.user.mobileOrEmail,

src/main/resources/static/js/account/register-club.js

@@ -141,6 +141,10 @@ var registerPage = new Vue({
         },
         getMobileCodeFn:function(){//机构注册获取注册短信验证码
             var _self = this;
+            if(_self.imageCode == ''){
+                CAIMEI.dialog('请输入图形验证码',false,function () {});
+                return
+            }
             var params = {
                     mobile:_self.clubUser.phone,
                     isCheckCaptcha:0,

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

@@ -116,7 +116,23 @@ var informationPage = 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;
+                        }
+                    }
                     _self.GetProvinceFn();
                     if( _self.addressfrom.townId){
                         _self.GetCtiyFn();
@@ -229,6 +245,18 @@ var informationPage = new Vue({
                 });
             });
         },
+        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 = [];
             if(arr){

src/main/resources/templates/user-center/setting/information.html

@@ -155,7 +155,7 @@
                                     </label>
                                 </p>
                                 <p class="business">
-                                    <input type="text" placeholder="请输入其他自定义品项目" v-model.trim="mainProEdit">
+                                    <input type="text" placeholder="请输入其他自定义品项目" v-model.trim="mainProEdit" maxlength="6">
                                     <a href="javascript:void(0);" @click="mainProAdd()">确认添加</a>
                                 </p>
                                 <span class="errTips icon mIcon" tips="" :class="mproflag?'show':''">请选择或添加主营产品</span>
@@ -169,7 +169,7 @@
                                     </label>
                                 </p>
                                 <p class="business">
-                                    <input type="text" placeholder="请输入其他自定义品项目" v-model.trim="mainProEdit">
+                                    <input type="text" placeholder="请输入其他自定义品项目" v-model.trim="mainProEdit" maxlength="6">
                                     <a href="javascript:void(0);" @click="mainProAdd()">确认添加</a>
                                 </p>
                                 <span class="errTips icon mIcon" tips="" :class="userMainProflag?'show':''">请选择或添加主营产品</span>