线上优化

src/main/resources/static/css/product/detail.h5.css

@@ -75,10 +75,12 @@ li{list-style:none}
 .productInfo .comment{color:#93979F;padding:5vw 0;    margin-right: 25px;position: relative}
 .productBox .detailBox .row .l{display: inline-block;min-width: 14.5vw;text-align-last: justify;vertical-align: top}
 .icon.comment:before{
-      width: 25px;
-    height: 25px;
+     width: 6.7vw;
+    height: 6.7vw;
     background-position: 0px -33px;
     position: absolute;
-    top: 15px
+    top:4vw;
 }
 .comment-right{float: right}
+.noprice{color: #e15616;font-size: 3vw}
+.noprice .mIcon::before{width: 5vw;height: 4vw;background-position: -48.2vw -69.2vw;position: relative;top: 1vw}

src/main/resources/static/css/product/detail.pc.css

@@ -136,3 +136,9 @@ input::-webkit-outer-spin-button,input::-webkit-inner-spin-button{-webkit-appear
 .comment-right{float:right;color:#93979f}
 .tabCon .item div p{line-height: 26px;text-align: left;}
 .tabCon .item div p.tl{line-height: 40px;text-align: left; font-weight: bold;}
+.noprice{color: #e15616;}
+.noprice .icon::before{
+    width: 25px;
+    height: 25px;
+    background-position: 0px 10px;
+}

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

@@ -104,9 +104,9 @@ var informationPage = new Vue({
                     _self.addressfrom.townID = data.club.townID;
                     _self.userMainPros = _self.setNewMainpro(data.club.mainpro);
                     console.log(_self.userMainPros);
-                    _self.GetProvinceFn();
-                    _self.GetCtiyFn();
-                    _self.GetTownFn();
+                    // _self.GetProvinceFn();
+                    // _self.GetCtiyFn();
+                    // _self.GetTownFn();
                 }else{
                     CAIMEI.Alert(response.msg,'确定',false);
                 }

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

@@ -84,18 +84,25 @@ var upgradePage = new Vue({
                     _self.clubUpgradeUser.provinceID = data.club.provinceID;
                     _self.clubUpgradeUser.cityID = data.club.cityID;
                     _self.clubUpgradeUser.townID= data.club.townID;
-                    _self.userMainPros = _self.setNewMainpro(data.club.mainpro);
+                    // _self.userMainPros = _self.setNewMainpro(data.club.mainpro);
                     _self.clubUpgradeUser.headpic = data.club.headpic;
                     _self.clubUpgradeUser.businessLicenseImage = data.club.businessLicenseImage;
                     _self.clubUpgradeUser.firstClubType = data.club.firstClubType;
                     _self.clubUpgradeUser.secondClubType = data.club.secondClubType;
                     _self.clubUpgradeUser.address = data.club.address;
                     console.log(_self.userMainPros);
+                    if(data.club.provinceID ==null){
+                         _self.clubUpgradeUser.provinceID = 0;
+                     }
                     if(data.club.cityID!=''&&data.club.cityID!=null){
-                        _self.getcity()
+                        _self.getcity();
+                    }else {
+                         _self.clubUpgradeUser.cityID = 0
                     }
                     if(data.club.townID!=''&&data.club.townID!=null){
                         _self.getcTown();
+                    }else {
+                         _self.clubUpgradeUser.townID = 0
                     }
                 }else{
                     CAIMEI.Alert(response.msg,'确定',false);
@@ -104,6 +111,8 @@ var upgradePage = new Vue({
         },
         SubComfirUpgradeFn:function() {//升级会员机构
             var _self = this;
+            var pass = verifyForm();
+            if (!pass) {return false;}
             if(_self.clubUpgradeUser.townID==0){
                 _self.flagshow = true;
                 setTimeout(function () {
@@ -111,14 +120,14 @@ var upgradePage = new Vue({
                 },2000)
                 return;
             }
-            // else if(_self.clubUpgradeUser.businessLicenseImage==''||_self.clubUpgradeUser.businessLicenseImage==null){
-            //     _self.businessflag = true;
-            //          setTimeout(function () {
-            //                 _self.businessflag = false;
-            //             },2000)
-            //     return
-            // }
-             if(_self.clubUpgradeUser.firstClubType==''){
+             if(_self.clubUpgradeUser.businessLicenseImage==''||_self.clubUpgradeUser.businessLicenseImage==null){
+                _self.businessflag = true;
+                     setTimeout(function () {
+                            _self.businessflag = false;
+                        },2000)
+                return;
+            }
+             if(_self.clubUpgradeUser.firstClubType==''||_self.clubUpgradeUser.firstClubType==null){
                _self.typeflag = true;
                setTimeout(function () {
                     _self.typeflag = false;
@@ -148,11 +157,11 @@ var upgradePage = new Vue({
                     _self.userMainProflag = false;
                 },2000)
                 }
+                 return;
             }
-                var pass = verifyForm();
+
                 if (_self.loginLoading) { return false; }
                 this.$nextTick(function() {
-                    if (!pass) {return false;}
                     _self.clubUpgradeUser.mainpro = _self.userMainPros.join("/");
                 var  params= {
                         userID:_self.clubUpgradeUser.userID,
@@ -392,7 +401,7 @@ var upgradePage = new Vue({
         PublicApi.GetProvince({},function(response){ //省份
             if(response.code == 0){
             console.log(response)
-                _self.provinceArray = response.data
+            _self.provinceArray = response.data;
             }else{
                 CAIMEI.Alert(response.msg, '确定', false);
             }

src/main/resources/templates/product/detail.html

@@ -49,6 +49,7 @@
                 <p class="tags">
                     <span th:each="tag: *{tagList}" th:text="${tag}"></span>
                 </p>
+                <p class="noprice" v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0&&priceObj.userIdentity!=4&&priceObj.priceFlag!=1"><i class="icon mIcon"></i>商品未公开价格，请联系0755-22907771</p>
                 <div class="detail" v-if="!isNoneDisabled">
                     <div class="row price"><span class="l">采美价</span><i>：</i>
                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
@@ -138,8 +139,8 @@
                     <div class="row" th:if="not${#strings.isEmpty(product.unit)}"><span class="l">包装规格</span><i>：</i><em th:text="*{unit}"></em></div>
                     <div class="row" th:if="not${#strings.isEmpty(product.productCode)}"><span class="l">商品编码</span><i>：</i><em th:text="*{productCode}"></em></div>
                     <div class="row" th:if="not${#strings.isEmpty(product.stock)}"><span class="l">库存</span><i>：</i><em th:text="*{stock}"></em></div>
-                    <div class="row" th:if="not${#strings.isEmpty(product.minBuyNumber)}"><span class="l">起批量</span><i>：</i><em th:text="*{minBuyNumber}"></em></div>
-                    <div v-show="GLOBAL_USER_ID && GLOBAL_USER_ID>0" class="row"><span class="l">采购量</span><i>：</i>
+                    <div class="row" th:if="not${#strings.isEmpty(product.minBuyNumber)}" v-show="GLOBAL_USER_ID && GLOBAL_USER_ID>0&&priceObj.userIdentity!=4&&priceObj.priceFlag!=1"><span class="l">起批量</span><i>：</i><em th:text="*{minBuyNumber}"></em></div>
+                    <div v-show="GLOBAL_USER_ID && GLOBAL_USER_ID>0&&priceObj.priceFlag!=1&&priceObj.userIdentity!=4" class="row"><span class="l">采购量</span><i>：</i>
                         <span class="number">
                             <em class="sub" @click="numberSub()">-</em>
                             <input type="number" :value="number" v-model="number" maxlength='6' @change="numberChange()">