Merge branch 'developerA' into developerD

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

@@ -52,6 +52,7 @@ var informationPage = new Vue({
             {value:'1',name:'整形'},
             {value:'2',name:'轻医美'},
             {value:'3',name:'皮肤科'},
+            {value:'3',name:'产后修复'},
         ],
         medicaCampNullList: [
             {name:'美容'},

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

@@ -29,6 +29,7 @@ var upgradePage = new Vue({
             {value:'1',name:'整形'},
             {value:'2',name:'轻医美'},
             {value:'3',name:'皮肤科'},
+            {value:'4',name:'产后修复'},
         ],
         medicaCampNullList: [
             {name:'美容'},

src/main/resources/templates/account/register-club.html

@@ -67,8 +67,8 @@
         </div>
     </div>
     <div class="signAccount upgrade clear" v-show="showTabContentIndex == 2">
-        <div class="title">升级会员机构</div>
-        <div class="title-tips"><p>补充以下详细信息即可升级为会员机构，享受更多更好的服务</p></div>
+        <div class="title">升级资质机构</div>
+        <div class="title-tips"><p>补充以下详细信息即可升级为资质机构，享受更多更好的服务</p></div>
         <div class="registerClub clear">
             <!--机构注册表单-->
             <form>

src/main/resources/templates/components/header.html

@@ -34,6 +34,7 @@
                         </div>
                     </div>
                 </li>
+                <li><a href="">超级会员</a></li>
                 <li v-if="loginStatus" id="mGlobalMenu" @click="hideGlobalMenu()">
                     <a class="cTab" href="javascript:void(0);" v-if="userIdentity == 3" v-text="userData.name"></a>
                     <a class="cTab" href="javascript:void(0);" v-else v-text="userData.name"></a>

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

@@ -37,7 +37,7 @@
                             <div class="name">
                                 <span>{{userInfo.name}}</span>
                                 <a href="/user/setting/upgrade.html" v-if="userInfo.userIdentity === 4 && isPC" onclick="_czc.push(['_trackEvent','个人中心','升级入口','点击','','Um_Event_ClubUpgrade'])">
-                                    去升级会员机构
+                                    去升级资质机构
                                     <div class="name-tips">采美豆</div>
                                 </a>
                             </div>

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

@@ -119,10 +119,19 @@
                                 <label class="diyBox"><input type="radio" name="firstShopType" v-model="clubUpgradeUser.firstClubType" value="2" checked><i class="icon mIcon">生美</i></label>
                                 <span class="errTips icon mIcon" tips="" :class="typeflag?'show':''">请选择公司类型</span>
                             </div>
+                            <!-- 医美 -->
                             <div v-show="clubUpgradeUser.firstClubType == 1" class="formLine">
                                 <label class="diyBox second"><input type="radio" name="secondClubType" v-model="clubUpgradeUser.secondClubType" value="1" checked><i class="icon mIcon">诊所</i></label>
                                 <label class="diyBox second"><input type="radio" name="secondClubType" v-model="clubUpgradeUser.secondClubType" value="2" ><i class="icon mIcon">门诊</i></label>
                                 <label class="diyBox second"><input type="radio" name="secondClubType" v-model="clubUpgradeUser.secondClubType" value="3" ><i class="icon mIcon">医院</i></label>
+                                <label class="diyBox second"><input type="radio" name="secondClubType" v-model="clubUpgradeUser.secondClubType" value="4" ><i class="icon mIcon">其他</i></label>
+                                <span class="errTips icon mIcon" tips="" :class="secondtypeflag?'show':''">请选择公司类型</span>
+                            </div>
+                            <!-- 生美 -->
+                            <div v-show="clubUpgradeUser.firstClubType == 2" class="formLine">
+                                <label class="diyBox second"><input type="radio" name="secondClubType" v-model="clubUpgradeUser.secondClubType" value="5" checked><i class="icon mIcon">美容院</i></label>
+                                <label class="diyBox second"><input type="radio" name="secondClubType" v-model="clubUpgradeUser.secondClubType" value="6" ><i class="icon mIcon">养生馆</i></label>
+                                <label class="diyBox second"><input type="radio" name="secondClubType" v-model="clubUpgradeUser.secondClubType" value="7" ><i class="icon mIcon">其他</i></label>
                                 <span class="errTips icon mIcon" tips="" :class="secondtypeflag?'show':''">请选择公司类型</span>
                             </div>
                             <div v-show="clubUpgradeUser.firstClubType == 1" class="formLine">

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

@@ -29,8 +29,8 @@
                     <img src="/img/base/loading.gif">
                 </div>
                 <div class="container clear" v-else>
-                    <div class="title">升级会员机构</div>
-                    <div class="title-tips"><p>补充以下详细信息即可升级为会员机构，享受更多更好的服务</p></div>
+                    <div class="title">升级资质机构</div>
+                    <div class="title-tips"><p>补充以下详细信息即可升级为资质机构，享受更多更好的服务</p></div>
                     <div class="registerClub clear">
                         <form>
                             <div class="formLine">
@@ -112,15 +112,24 @@
                                 <label class="diyBox"><input type="radio" name="firstShopType" v-model="clubUpgradeUser.firstClubType" value="2" checked><i class="icon mIcon">生美</i></label>
                                 <span class="errTips icon mIcon" tips="" :class="typeflag?'show':''">请选择公司类型</span>
                             </div>
+                            <!-- 医美 -->
                             <div v-show="clubUpgradeUser.firstClubType == 1" class="formLine">
                                 <label class="diyBox second"><input type="radio" name="secondClubType" v-model="clubUpgradeUser.secondClubType" value="1" checked><i class="icon mIcon">诊所</i></label>
                                 <label class="diyBox second"><input type="radio" name="secondClubType" v-model="clubUpgradeUser.secondClubType" value="2" ><i class="icon mIcon">门诊</i></label>
                                 <label class="diyBox second"><input type="radio" name="secondClubType" v-model="clubUpgradeUser.secondClubType" value="3" ><i class="icon mIcon">医院</i></label>
+                                <label class="diyBox second"><input type="radio" name="secondClubType" v-model="clubUpgradeUser.secondClubType" value="4" ><i class="icon mIcon">其他</i></label>
+                                <span class="errTips icon mIcon" tips="" :class="secondtypeflag?'show':''">请选择公司类型</span>
+                            </div>
+                            <!-- 生美 -->
+                            <div v-show="clubUpgradeUser.firstClubType == 2" class="formLine">
+                                <label class="diyBox second"><input type="radio" name="secondClubType" v-model="clubUpgradeUser.secondClubType" value="5" checked><i class="icon mIcon">美容院</i></label>
+                                <label class="diyBox second"><input type="radio" name="secondClubType" v-model="clubUpgradeUser.secondClubType" value="6" ><i class="icon mIcon">养生馆</i></label>
+                                <label class="diyBox second"><input type="radio" name="secondClubType" v-model="clubUpgradeUser.secondClubType" value="7" ><i class="icon mIcon">其他</i></label>
                                 <span class="errTips icon mIcon" tips="" :class="secondtypeflag?'show':''">请选择公司类型</span>
                             </div>
                             <div v-show="clubUpgradeUser.firstClubType == 1" class="formLine">
                                 <div class="form-upload">
-                                    <p>资质：</p>
+                                    <p><em>*</em>资质：</p>
                                     <div class="form-upload-image" v-if="clubUpgradeUser.medicalPracticeLicense!=''&&clubUpgradeUser.medicalPracticeLicense!=null">
                                         <img class="upload-img" :src="clubUpgradeUser.medicalPracticeLicense" alt="" id="medicalPracticeLicenseImg" @click="showViewerImageFn2()">
                                         <i class="icon mIcon" @click="deleteMedicalImage()"></i>