升级会员机构

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

@@ -92,15 +92,13 @@ var upgradePage = new Vue({
                         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{
+                    }else if(_self.clubUpgradeUser.firstClubType == 2){
                         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;
                         }
@@ -123,7 +121,6 @@ var upgradePage = new Vue({
                     }else {
                          _self.clubUpgradeUser.townId = 0
                     }
-
                 }else{
                     CAIMEI.Alert(response.msg,'确定',false);
                 }
@@ -160,61 +157,61 @@ var upgradePage = new Vue({
                     setTimeout(function () {
                     _self.secondtypeflag = false;
                 },2000)
-                return;
+                    return;
                 }
                 if(_self.userMainPros==''){
-                          _self.mproflag = true;
-                         setTimeout(function () {
-                            _self.mproflag = false;
-                        },2000)
-                         return;
-                    }
+                      _self.mproflag = true;
+                     setTimeout(function () {
+                        _self.mproflag = false;
+                    },2000)
+                    return;
+                }
             }
             if(_self.clubUpgradeUser.firstClubType==2){
                 if(_self.userMainPros ==''){
                     _self.userMainProflag = true;
                  setTimeout(function () {
                     _self.userMainProflag = false;
-                },2000)
-                  return;
+                },2000);
+                    return;
                 }
             }
-                if (_self.loginLoading) { return false; }
-                this.$nextTick(function() {
-                    _self.clubUpgradeUser.mainProduct = _self.userMainPros.join("/");
-                var  params= {
-                        userId:_self.clubUpgradeUser.userId,
-                        clubId:_self.clubUpgradeUser.clubId,				//会所Id
-                        name:_self.clubUpgradeUser.name,
-                        linkMan:_self.clubUpgradeUser.linkMan,
-                        shortName:_self.clubUpgradeUser.shortName,
-                        contractEmail:_self.clubUpgradeUser.contractEmail,
-                        provinceId:_self.clubUpgradeUser.provinceId,
-                        cityId:_self.clubUpgradeUser.cityId,
-                        townId:_self.clubUpgradeUser.townId,
-                        address:_self.clubUpgradeUser.address,
-                        socialCreditCode:_self.clubUpgradeUser.socialCreditCode,
-                        businessLicense:_self.clubUpgradeUser.businessLicense,
-                        shopPhoto:_self.clubUpgradeUser.shopPhoto,
-                        firstClubType:Number(_self.clubUpgradeUser.firstClubType), //机构类型分类 医美:0和生美:1
-                        secondClubType:Number(_self.clubUpgradeUser.secondClubType),	//机构类型二级分类 诊所:1,门诊:2,医院:3
-                        department:_self.clubUpgradeUser.department,				//科室
-                        medicalPracticeLicense:_self.clubUpgradeUser.medicalPracticeLicense,//资质图片
-                        mainProduct:_self.clubUpgradeUser.mainProduct,
-                    };
-                    _self.loginLoading = true;
-                    UserApi.ClubUpgrade(params,function (response) {
-                        if(response.code === 0){
-                            CAIMEI.Alert('您的升级申请已提交审核','确定',true,function () {
-                                _self.clubLoginIndex();
-                                _self.loginLoading = false;
-                            });
-                        } else {
-                            CAIMEI.Alert(response.msg,'确定',false);
+            _self.clubUpgradeUser.mainProduct = _self.userMainPros.join("/");
+            if (_self.loginLoading) { return false; }
+            this.$nextTick(function() {
+            var  params= {
+                    userId:_self.clubUpgradeUser.userId,
+                    clubId:_self.clubUpgradeUser.clubId,				//会所Id
+                    name:_self.clubUpgradeUser.name,
+                    linkMan:_self.clubUpgradeUser.linkMan,
+                    shortName:_self.clubUpgradeUser.shortName,
+                    contractEmail:_self.clubUpgradeUser.contractEmail,
+                    provinceId:_self.clubUpgradeUser.provinceId,
+                    cityId:_self.clubUpgradeUser.cityId,
+                    townId:_self.clubUpgradeUser.townId,
+                    address:_self.clubUpgradeUser.address,
+                    socialCreditCode:_self.clubUpgradeUser.socialCreditCode,
+                    businessLicense:_self.clubUpgradeUser.businessLicense,
+                    shopPhoto:_self.clubUpgradeUser.shopPhoto,
+                    firstClubType:Number(_self.clubUpgradeUser.firstClubType), //机构类型分类 医美:0和生美:1
+                    secondClubType:Number(_self.clubUpgradeUser.secondClubType),	//机构类型二级分类 诊所:1,门诊:2,医院:3
+                    department:_self.clubUpgradeUser.department,				//科室
+                    medicalPracticeLicense:_self.clubUpgradeUser.medicalPracticeLicense,//资质图片
+                    mainProduct:_self.clubUpgradeUser.mainProduct,
+                };
+                _self.loginLoading = true;
+                UserApi.ClubUpgrade(params,function (response) {
+                    if(response.code === 0){
+                        CAIMEI.Alert('您的升级申请已提交审核','确定',true,function () {
+                            _self.clubLoginIndex();
                             _self.loginLoading = false;
-                        }
-                    });
+                        });
+                    } else {
+                        CAIMEI.Alert(response.msg,'确定',false);
+                        _self.loginLoading = false;
+                    }
                 });
+            });
         },
         clubLoginIndex:function(){// 跳过升级直接去个人中心
             window.location.href = '/user/dashboard.html';