Merge remote-tracking branch 'origin/developerC' into developerB

src/main/resources/static/js/flea-market/form.js

@@ -469,6 +469,7 @@ var fleaMarketForm = new Vue({
         province:function () {
            var _this = this;
            _this.from.province = event.target.value;
+           console.log('aaa', _this.from.province)
             if(_this.from.province==''){//省为请选择时市区初始化
                 _this.cityArray=[];
                 _this.townArray=[];
@@ -491,12 +492,10 @@ var fleaMarketForm = new Vue({
 
                 }
             })
-
-
         },
         getcTown:function(event){
             var _this = this;
-            PublicApi.GetTown({cityId:_this.from.city},function(response){
+            PublicApi.GetTown({ type:2, parentId:_this.from.city},function(response){
                 if(response.code == 0 ){
                     _this.townArray = response.data;
                     _this.secondParams.townId = event.target.value;
@@ -528,6 +527,4 @@ var fleaMarketForm = new Vue({
             }
         })
     },
-
-
 })

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

@@ -421,7 +421,7 @@
         },
          getcTown:function(event){
             var _this = this;
-            PublicApi.GetTown({cityId:_this.params.cityId},function(response){
+            PublicApi.GetTown({ type:2, parentId:_this.params.cityId},function(response){
                 if(response.code == 0 ){
                     _this.townArray = response.data;
                     _this.params.townId = event.target.value;

src/main/resources/static/js/user-center/repair/repair.js

@@ -107,7 +107,7 @@ var repairForm = new Vue({
             var donClass = '#townname';
            var domTownname =  document.querySelector(donClass);
            _this.postData.townName = domTownname.options[domTownname.selectedIndex].text;
-            PublicApi.GetTown({cityId:_this.cityID},function(response){
+            PublicApi.GetTown({ type:2, parentId:_this.cityID},function(response){
                 if(response.code == 0 ){
                     _this.townArray = response.data;
                     _this.townID = event.target.value;

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

@@ -411,7 +411,7 @@ var upgradePage = new Vue({
         },
          getcTown:function(event){
             var _this = this;
-            PublicApi.GetTown({cityId:_this.clubUpgradeUser.cityId},function(response){
+            PublicApi.GetTown({ type:2, parentId:_this.clubUpgradeUser.cityId},function(response){
                 if(response.code == 0 ){
                     _this.townArray = response.data;
                     _this.clubUpgradeUser.townId = event.target.value;

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

@@ -17,7 +17,7 @@
     <div class="selectAccount">
         <div class="title">请选择注册的账号类型</div>
         <div class="cont">
-            <span class="a"><img src="/img/account/clubPC.png" @click="clickTab(1)"> <p class="purchase">采购方(买家)</p><p class="tips-text">医院机构/美容会所/个人买家</p></span>
+            <span class="a"><img src="/img/account/clubPC.png" @click="clickTab(1)"> <p class="purchase">采购方(买家)</p><p class="tips-text">医院机构/美容会所/普通买家</p></span>
             <span class="b"><img src="/img/account/supplierPC.png"  @click="clickTab(2)"><p class="purchase">供应商(卖家)</p><p class="tips-text">仪器/产品/服务供应商</p></span>
         </div>
     </div>

src/main/resources/templates/flea-market/form.html

@@ -130,7 +130,7 @@
                             <i class="province icon mIcon selected"></i>
                         <select class="address-input reg-select province" name="provinceID" id="cProvince" @change="province" >
                             <option value="" >请选择</option>
-                            <option v-for="(item ,index) in provinceArray" :key="index" :value='item.provinceID' >{{item.name}}</option>
+                            <option v-for="(item ,index) in provinceArray" :key="index" :value='item.id' >{{item.name}}</option>
                         </select>
                         <i class="cCity icon mIcon selected"></i>
                         <select class="address-input reg-select city" name="cityID" id="cCity" @change="getcity($event)" >

src/main/resources/templates/single-page/repair.html

@@ -21,7 +21,14 @@
         <div class="content">
             <img src="/img/repair/repair.jpg" alt="采美仪器维修介绍">
 <!--            <div class="btnBox">-->
-<!--                <a href="/repair/form.html" class="fixedBtn">申请维修</a>-->
+<!--                <a href="/repair/form.
+
+
+
+
+
+
+" class="fixedBtn">申请维修</a>-->
 <!--            </div>-->
         </div>
     </div>

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

@@ -56,7 +56,7 @@
                                 <p><em>*</em>公司地址：</p>
                                  <select name="provinceID" id="cProvince" @change="province" v-model="params.provinceId">
                                      <option value="0">请选择</option>
-                                     <option v-for="item in provinceArray" :value="item.provinceID">{{item.name}}</option>
+                                     <option v-for="item in provinceArray" :value="item.id">{{item.name}}</option>
                                  </select>
                                  <select name="cityID" id="cityID" @change="getcity($event)" v-model="params.cityId">
                                      <option value="0"  selected="">请选择</option>

src/main/resources/templates/user-center/repair/form.html

@@ -41,7 +41,7 @@
                 <div class="address">
                     <select id="cProvince" @change="province($event)">
                         <option value="">请选择</option>
-                         <option v-for="item in provinceArray" :value="item.provinceID">{{item.name}}</option>
+                         <option v-for="item in provinceArray" :value="item.id">{{item.name}}</option>
                     </select>
                     <select id="cityname" @change="getcity($event)">
                         <option value="">请选择</option>

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

@@ -54,7 +54,7 @@
                                 <div class="address">
                                     <select name="provinceID" id="cProvince" @change="province" v-model="clubUpgradeUser.provinceId">
                                         <option value="0" >请选择</option>
-                                        <option v-for="(item ,index) in provinceArray" :key="index" :value='item.provinceID' >{{item.name}}</option>
+                                        <option v-for="(item ,index) in provinceArray" :key="index" :value='item.id' >{{item.name}}</option>
                                     </select>
                                     <select name="cityID" id="cCity" @change="getcity($event)" v-model="clubUpgradeUser.cityId">
                                         <option value="0" >请选择</option>