bugCommit

src/main/resources/static/css/pay/caimei-paycash.css

@@ -40,9 +40,9 @@ input::-webkit-outer-spin-button {
     .pay-ment{width: 100%;height: auto;float: left;background: #FFFFFF;margin-top: 7px;box-shadow: 0px 3px 6px 0px rgba(0, 0, 0, 0.07);}
     .pay-ment .pay-record{width: 100%;height: auto;float: left;background: #FFFFFF;padding: 10px 0;box-sizing:border-box;}
     .pay-ment .pay-record .record-title{width: 100%;padding: 0 20px;background: #FFFFFF;line-height: 44px;font-size: 16px;color: #333333;text-align: left;box-sizing:border-box;}
-    .pay-ment .pay-record .record-content{width: 1160px;height: auto;padding: 8px 540px 8px 20px;margin: 0 auto;background: #F7F7F7;border-radius: 5px;box-sizing:border-box;}
+    .pay-ment .pay-record .record-content{width: 1160px;height: auto;padding: 8px 540px 8px 10px;margin: 0 auto;background: #FFF;border-radius: 5px;box-sizing:border-box;}
     .pay-ment .pay-record .record-content .record-li{width: 100%;height: 30px;float: left;}
-    .pay-ment .pay-record .record-content .record-li.none{font-size: 14px;color: #333333;text-align: left;line-height: 30px;}
+    .pay-ment .pay-record .record-content .record-li.none{font-size: 14px;color: #627386;text-align: left;line-height: 30px;}
     .pay-ment .pay-record .record-content .record-li .record-tb{width: 33.33%;height: 30px;float: left;font-size: 14px;color: #333333;text-align: left;line-height: 30px;}
     .pay-ment .pay-record .record-content .record-li .record-tb:last-child{text-align: right;color: #999999;}
     .pay-method{width: 100%;height: auto;float: left;background: #FFFFFF;margin-top: 20px;}
@@ -86,13 +86,14 @@ input::-webkit-outer-spin-button {
     .payment-transfer{width: 100%;height: auto;padding: 0 24px;}
     .payment-transfer .payment-transfer-main{width: 100%;height: auto;}
     .payment-transfer .payment-transfer-main .label{width: 100%;height: 38px;line-height: 38px;font-size: 13px;color: #333;}
-    .payment-transfer .payment-transfer-main .label .label-title{color: #999999;}
-    .payment-transfer .payment-transfer-main .label .label-t{color: #666;}
+    .payment-transfer .payment-transfer-main .label .label-title{color: #E15616;padding-left: 20px;position: relative;}
+    .payment-transfer .payment-transfer-main .label .label-title .icon{width: 16px;height: 16px;display: block;position: absolute;top: 2px;left: 0;}
+    .payment-transfer .payment-transfer-main .label .label-title .icon:before{width: 16px;height: 16px;background-position: -340px -415px;}    .payment-transfer .payment-transfer-main .label .label-t{color: #627386;}
     .payment-transfer .payment-transfer-main .label .text{color: #333;float: left;width: 25%;}
     .payment-transfer .payment-transfer-main .label .text-p{color: #333;float: left;}
     .payment-transfer .payment-transfer-main .label .text-p input{border: none;background-color: #FFF;width: 60px;font-size: 14px;color: #333;}
     .payment-transfer .payment-transfer-main .label .text-p .copy{display: inline-block;width:42px;height:18px;background:linear-gradient(34deg,rgba(255,41,41,1) 0%,rgba(255,109,27,1) 100%);opacity:1;border-radius:3px;line-height: 18px;font-size: 12px;margin-top: 10px;margin-left:10px;color: #FFF;text-align: center;}
-    .payment-transfer .payment-transfer-main .label .label-c{color: #E15616;}
+    .payment-transfer .payment-transfer-main .label .label-c{color: #FF2A2A;}
     .pay-button-main{width: 100%;height: 72px;box-sizing: border-box;padding: 11px 0;background-color: #FFFFFF;float: left;border-bottom: 1px solid #EBEBEB;}
     .pay-button-main .pay-button{width: 100%;height: 50px;float: left;}
     .pay-button-main .pay-button a{width: 232px;height: 50px;display: block;background:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);border-radius: 2px;font-size: 14px;line-height: 50px;text-align: center;color: #FFF6D9;float: right;}

src/main/resources/static/css/shopping/shopping.css

@@ -135,7 +135,7 @@ li{list-style:none}
     .addressWrap .btnBox .group p:first-child{line-height:32px}
     .addressWrap .btnBox .group .check{display:inline-block;height:18px;line-height:18px;color:#1890f9;margin-bottom: 22px;}
     .addressWrap .btnBox .group .check input{vertical-align:top;margin-right:10px}
-    .model-address-content{width:100%;height:100%;position:fixed;top:0;left:0;background-color:rgba(0,0,0,.4)}
+    .model-address-content{width:100%;height:100%;position:fixed;top:0;left:0;background-color:rgba(0,0,0,.4);z-index: 99999;}
     .model-address-content .model-content{width:650px;height:593px;padding:0 0 16px 0;position:absolute;top:0;left:0;right:0;bottom:0;background-color:#FFFFFF;margin:auto;border-radius:2px;box-sizing:border-box}
     .model-address-content .title{width:100%;height:42px;float:left;box-sizing:border-box;position:relative;padding:0 16px;border-bottom:1px solid #e2e7ef}
     .model-address-content .title p{font-size:14px;line-height:42px;text-align:left;color:#22272e;float:left}

src/main/resources/static/css/user-center/order/detail.css

@@ -31,7 +31,7 @@ li{list-style:none}
     .order-container .section .section-info .order-content .order-item p .none{color:#22272e;}
     /*商品信息*/
     .order-container .section-list{margin-bottom: 10px;width: 100%;height: auto;box-sizing:border-box;}
-    .order-container .section-shopinfo{width: 100%;height: auto;margin-bottom: 5px;box-sizing: border-box;padding: 0 20px 20px 20px;background-color: #FFFFFF;}
+    .order-container .section-shopinfo{width: 100%;height: auto;margin-bottom: 5px;box-sizing: border-box;padding: 0 20px 0px 20px;background-color: #FFFFFF;}
     .order-container .section-shopinfo .title{width: 100%;height: 56px;box-sizing: border-box;padding: 8px 0;border-bottom: 1px solid #e2e7ef;}
     .order-container .section-shopinfo .title .logo{width: 39px;height: 39px;box-sizing: border-box;border: 1px solid #e2e7ef;float: left;display: block;margin-right: 5px;}
     .order-container .section-shopinfo .title .name{line-height: 40px;float: left;font-size: 14px;color: #22272E;text-align: left;margin-right: 20px;}
@@ -45,6 +45,8 @@ li{list-style:none}
     .order-container .section-shopinfo .product-t .tit{float: left;width: 100%;margin-bottom: 6px;line-height: 22px;font-size: 16px;text-align: left;color: #22272E;}
     .order-container .section-shopinfo .product-t .info{width: 100%;height: auto;float: left;}
     .order-container .section-shopinfo .product-t .info>p{line-height:24px;font-size:14px;color:#627386;text-align:left;display:inline-block;width:30%}
+    .order-container .section-shopinfo .product-t .price>p{line-height:24px;font-size:14px;color:#627386;text-align:left;display:inline-block;width:30%}
+    .order-container .section-shopinfo .product-t .price>p .red{color: #FF2A2A;}
     .price-total{padding-top:20px;text-align:right;color:#22272e;font-size:16px}
     .price-total span{color:#f94b4b}
     .order-container .section-shopinfo .shopinfo-bott{width: 100%;height: auto;box-sizing: border-box;padding-left:110px;line-height: 38px;color: #22272E;    border-top: 1px dashed #F7F7F7;}
@@ -52,12 +54,14 @@ li{list-style:none}
     .order-container .section-shopinfo .shopinfo-bott .bott-top{width: 100%;float: left;height: 60px;}
     .order-container .section-shopinfo .shopinfo-bott .bott-bot{width: 100%;float: left;}
     .order-container .section-shopinfo .shopinfo-bott .count{float: left;font-size: 14px;}
+    .order-container .section-shopinfo .shopinfo-bott .count.none{line-height: 60px;}
+    .order-container .section-shopinfo .shopinfo-bott .count span{color: #E15616;margin: 5px 0;}
     .order-container .section-shopinfo .shopinfo-bott .total{float: right;font-size: 16px;display: inline-block;text-align:right;}
     .order-container .section-shopinfo .shopinfo-bott .total p{display: inline-block;float: left;height: 30px;line-height: 30px;width: 100%;}
     .order-container .section-shopinfo .shopinfo-bott .total p .money{font-size: 14px;color: #999999;text-decoration: line-through;}
     .order-container .section-shopinfo .shopinfo-bott .total p .money-sign{font-size: 14px;color: #999999;text-decoration: line-through;}
     .order-container .section-shopinfo .shopinfo-bott .total p .money-reduced{margin-left: 5px;font-size: 14px;color: #e15616;}
-    .order-container .section-shopinfo .shopinfo-bott .total p .none{line-height: 60px;}
+    .order-container .section-shopinfo .shopinfo-bott .total p.none{line-height: 60px;}
     .order-container .section-shopinfo .bott-bot p{color: #627386;}
     .order-container .section-shopinfo .bott-bot span{margin-left: 10px;color: #22272E;}
     /*发票信息*/
@@ -66,7 +70,7 @@ li{list-style:none}
     .order-container .section-invoice .tit p{float: left;}
     .order-container .section-invoice .tit .icon{width: 24px;height: 24px;display: block;float: right;}
     .order-container .section-invoice .tit .icon:before{width: 24px;height: 24px;background-position: -90px -0px;}
-    .order-container .section-invoice .invoice-none{width: 100%;line-height: 24px;font-size: 14px;color: #999999;height: 24px;float: left;box-sizing: border-box;}
+    .order-container .section-invoice .invoice-none{width: 100%;line-height: 24px;font-size: 14px;color: #627386;height: 24px;float: left;box-sizing: border-box;}
     .order-container .section-invoice .invoice-content>p{display:inline-block;min-width:49%;line-height: 36px;color: #627386;font-size: 14px;}
     .order-container .section-invoice .invoice-content p span{color: #22272E;}
     /*转账信息*/
@@ -74,13 +78,15 @@ li{list-style:none}
     .payment-transfer{width: 100%;height: auto;}
     .payment-transfer .payment-transfer-main{width: 100%;height: auto;}
     .payment-transfer .payment-transfer-main .label{width: 100%;height: 38px;line-height: 38px;font-size: 13px;color: #333;}
-    .payment-transfer .payment-transfer-main .label .label-title{color: #999999;}
-    .payment-transfer .payment-transfer-main .label .label-t{color: #666;}
-    .payment-transfer .payment-transfer-main .label .text{color: #333;float: left;width: 25%;}
+    .payment-transfer .payment-transfer-main .label .label-title{color: #E15616;padding-left: 20px;position: relative;}
+    .payment-transfer .payment-transfer-main .label .label-title .icon{width: 16px;height: 16px;display: block;position: absolute;top: 2px;left: 0;}
+    .payment-transfer .payment-transfer-main .label .label-title .icon:before{width: 16px;height: 16px;background-position: -340px -415px;}
+    .payment-transfer .payment-transfer-main .label .label-t{color: #627386;}
+    .payment-transfer .payment-transfer-main .label .text{color: #333;float: left;margin-right: 30px;}
     .payment-transfer .payment-transfer-main .label .text-p{color: #333;float: left;}
     .payment-transfer .payment-transfer-main .label .text-p input{border: none;background-color: #FFF;width: 60px;font-size: 14px;color: #333;}
-    .payment-transfer .payment-transfer-main .label .text-p .copy{    display: inline-block;width: 56px;height: 24px;background-image: linear-gradient(214deg, #ff2929 0%, #ff6d1b 100%);border-radius: 2px;line-height: 24px;opacity:1;font-size: 12px;margin-top: 5px;margin-left: 5px;color: #FFF;text-align: center;}
-    .payment-transfer .payment-transfer-main .label .label-c{color: #E15616;}
+    .payment-transfer .payment-transfer-main .label .text-p .copy{display: inline-block;width: 56px;height: 24px;background-image: linear-gradient(214deg, #ff2929 0%, #ff6d1b 100%);border-radius: 2px;line-height: 24px;opacity:1;font-size: 12px;margin-top: 5px;margin-left: 5px;color: #FFF;text-align: center;}
+    .payment-transfer .payment-transfer-main .label .label-c{color: #FF2A2A;}
     /*退款记录*/
     .section-paymentlist{margin-bottom: 10px;width: 100%;height: auto;box-sizing: border-box;float: left;padding:10px 20px;background-color: #FFFFFF;}
     .section-paymentlist .record-title{width: 100%;height: 48px;line-height: 48px;float: left;font-size: 16px;color: #22272E;}
@@ -160,7 +166,7 @@ li{list-style:none}
     .payment-transfer .label>p{font-size:3.4vw;color:#22272e;line-height:5vw;padding:1.6vw 0}
     .payment-transfer .label .label-title{font-size:3.1vw;color:#e15616}
     .payment-transfer .label .label-t{color:#627386}
-    .payment-transfer .label .label-c{color:#1890f9;font-size:3.1vw}
+    .payment-transfer .label .label-c{color:#FF2A2A;font-size:3.1vw}
     .payment-transfer .label>p .red{color:#e15616}
     .record-title,.record-empty{width:100%;box-sizing:border-box;font-size:3.4vw;margin-top:1.5vw;padding:3.2vw;background:#FFF;color:#22272e}
     .record-title span{color:#f94b4b}

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

@@ -36,7 +36,7 @@ var registerPage = new Vue({
             businessLicenseImage:'',
             headpic:'',
             medicalPracticeLicenseImg:'',
-            firstClubType:0,
+            firstClubType:'',
             secondClubType:0,
             department:'',
             provinceID :'',
@@ -186,18 +186,14 @@ var registerPage = new Vue({
             if (_self.loginLoading) { return false; }
             this.$nextTick(function() {
                 if (!pass) {return false;}
-                if(_self.clubUpgradeUser.businessLicenseImage == ''){
+                if(!_self.clubUpgradeUser.businessLicenseImage){
                     $('#formbusinessLicenseImage').parent().addClass("error").find('.checked').removeClass("show");
                     $('#formbusinessLicenseImage').siblings('.errTips').text('请上传营业执照图片').addClass("show");
-                    return  false;
                 }
-                if(_self.clubUpgradeUser.firstClubType === 0){
+                if(!_self.clubUpgradeUser.firstClubType){
                     $('#firstClubType').parent().addClass("error");
                     $('#firstClubType').siblings('.errTips').text('请选择机构类型').addClass("show");
                     return  false;
-                }else{
-                    $('#firstClubType').parent().removeClass("error");
-                    $('#firstClubType').siblings('.errTips').removeClass("show");
                 }
                 _self.clubUpgradeUser.mainPros = _self.userMainPros.join("/");
                 _self.loginLoading = true;
@@ -241,6 +237,10 @@ var registerPage = new Vue({
                 }
             });
         },
+        ChangeFirstClubType:function(event){
+            $('#secondShopType').parent().removeClass("error");
+            $('#firstClubType').siblings('.errTips').removeClass("show");
+        },
         refreshCodeImage:function(){
             this.getMobileImage()
         },
@@ -328,7 +328,7 @@ var registerPage = new Vue({
                 event.target.value = '';
             });
         },
-        uploadMentuzImageFn: function(event){//上传营业执照
+        uploadMentuzImageFn: function(event){//上传门头照
             var _this = this;
             var inputDOM = _this.$refs.businessMentuImage;
             var file = inputDOM.files;

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

@@ -28,7 +28,7 @@ var registerPage = new Vue({
             cityID : '',
             townID : '',
             address:'',
-            firstShopType:'2',
+            firstShopType:'',
             secondShopType: '',
             mainpro:'',
             isAgreed:0,
@@ -78,6 +78,20 @@ var registerPage = new Vue({
                     CAIMEI.dialog('两次密码输入不一致',false,function () {});
                     return;
                 }
+                if(!_self.supplierUser.businessLicenseImage){
+                    $('#formbusinessLicenseImage').parent().addClass("error").find('.checked').removeClass("show");
+                    $('#formbusinessLicenseImage').siblings('.errTips').text('请上传营业执照图片').addClass("show");
+                }
+                if(_self.supplierUser.firstShopType == ''){
+                    $('#firstClubType').parent().addClass("error");
+                    $('#firstClubType').siblings('.errTips').text('请选择机构类型').addClass("show");
+                    return  false;
+                }
+                if(_self.userMainPros == ''){
+                    $('#secondShopType').parent().addClass("error");
+                    $('#secondShopType').siblings('.errTips').text('请选择主营内容').addClass("show");
+                    return  false;
+                }
                 _self.loginLoading = true;
                 UserApi.SupplierRgister(_self.supplierUser,function (response) {
                     if(response.code === 0){
@@ -150,6 +164,14 @@ var registerPage = new Vue({
                 }
             })
         },
+        ChangeFirstClubType:function(event){
+            $('#firstClubType').parent().removeClass("error");
+            $('#firstClubType').siblings('.errTips').removeClass("show");
+        },
+        ChangeSecondShopType:function(event){
+            $('#secondShopType').parent().removeClass("error");
+            $('#secondShopType').siblings('.errTips').removeClass("show");
+        },
         refreshCodeImage:function(){
             this.getMobileImage()
         },
@@ -173,6 +195,8 @@ var registerPage = new Vue({
             _this.formData.append('file', file[0]);
             PublicApi.uploadimg(_this.formData,function(response){
                 _this.supplierUser.businessLicenseImage = response.data;
+                $('#formbusinessLicenseImage').parent().removeClass("error");
+                $('#formbusinessLicenseImage').siblings('.errTips').removeClass("show");
                 event.target.value = '';
             });
         },

src/main/resources/static/js/shopping/confirm.js

@@ -233,6 +233,7 @@ var shoppingConfirm = new Vue({
             this.addressForm.provinceId= '';
             this.addressForm.desc= '';
             this.addressForm.default= '';
+            this.getProvinceOptions();
             if(!isPC){fixedBody();}
         },
         updateAddress: function(){

src/main/resources/static/js/user-center/order/detail.js

@@ -234,6 +234,7 @@ var orderPage = new Vue({
             _self.modelType = 0;
         },
         hanldQueryExpressFn:function(){//跳转查看物流
+            var _self = this;
             window.location.href='/user/order/logistics.html?orderId='+_self.orderId;
         },
         copyOrderBtnSubmitFn:function(){//复制订单标识

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

@@ -167,8 +167,8 @@
                 </div>
                 <div class="formLine">
                     <p id="firstClubType"><em>*</em>机构类型：</p>
-                    <label class="diyBox"><input type="radio" name="firstShopType" v-model="clubUpgradeUser.firstClubType" value="1" ><i class="icon mIcon">医美</i></label>
-                    <label class="diyBox"><input type="radio" name="firstShopType" v-model="clubUpgradeUser.firstClubType" value="2" checked><i class="icon mIcon">生美</i></label>
+                    <label class="diyBox"><input type="radio" name="firstShopType" v-model="clubUpgradeUser.firstClubType" value="1"  @change="ChangeFirstClubType"><i class="icon mIcon">医美</i></label>
+                    <label class="diyBox"><input type="radio" name="firstShopType" v-model="clubUpgradeUser.firstClubType" value="2" checked  @change="ChangeFirstClubType"><i class="icon mIcon">生美</i></label>
                     <span class="errTips icon mIcon" tips="请选择公司类型"></span>
                 </div>
                 <div v-show="clubUpgradeUser.firstClubType == 1" class="formLine">

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

@@ -101,7 +101,7 @@
                             <option value="">请选择</option>
                             <option v-for="(item ,index) in townArray" :key="index" :value="item.townID"  >{{item.name}}</option>
                         </select>
-                        <textarea placeholder="建议您如实填写详细地址，例如：街道名称，门牌号码，楼层和房间号等信息"  v-model="supplierUser.address"></textarea>
+                        <textarea placeholder="请输入您的详细联系地址"  v-model="supplierUser.address" @blur="blurHandle($event)" needverify></textarea>
                         <i class="checked icon mIcon"></i>
                         <span class="errTips icon mIcon" tips="请输入正确的联系地址"></span>
                     </div>
@@ -118,7 +118,7 @@
                                 <img class="upload-img" :src="supplierUser.businessLicenseImage" alt="" id="businessLicenseImage" @click="showViewerImageFn()">
                                 <i class="icon mIcon" @click="deleteBusinessImage()"></i>
                             </div>
-                            <div class="formLine-file" v-else>
+                            <div class="formLine-file" v-else id="formbusinessLicenseImage">
                                 <input ref="businessLicenseImage" class="file" type="file" accept="image/png,image/jpeg,image/gif,image/jpg"  @change="uploadBusinessLicenseImageFn">
                                 <i class="icon mIcon file-biss"></i>
                             </div>
@@ -130,9 +130,9 @@
                         </div>
                     </div>
                     <div class="formLine">
-                        <p><em>*</em>公司类型：</p>
-                        <label class="diyBox"><input type="radio" name="firstShopType" v-model="supplierUser.firstShopType" value="1" ><i class="icon mIcon">医疗</i></label>
-                        <label class="diyBox"><input type="radio" name="firstShopType" v-model="supplierUser.firstShopType" value="2" checked><i class="icon mIcon">非医疗</i></label>
+                        <p id="firstClubType"><em>*</em>公司类型：</p>
+                        <label class="diyBox"><input type="radio" name="firstShopType" v-model="supplierUser.firstShopType" value="1" @change="ChangeFirstClubType"><i class="icon mIcon">医疗</i></label>
+                        <label class="diyBox"><input type="radio" name="firstShopType" v-model="supplierUser.firstShopType" value="2" checked @change="ChangeFirstClubType"><i class="icon mIcon">非医疗</i></label>
                         <span class="errTips icon mIcon mIcon" tips="请选择公司类型"></span>
                     </div>
                     <div v-if="supplierUser.firstShopType == 1" class="formLine">
@@ -144,9 +144,9 @@
                         <span class="errTips icon mIcon" tips="请选择公司类型"></span>
                     </div>
                     <div class="formLine">
-                        <p><em>*</em>主营产品：</p>
-                        <p class="business">
-                            <label v-for="pro in mentuzCampNullList" class="diyBox second"><input type="checkbox" name="secondShopType" v-model="userMainPros" :value="pro.name" ><i class="icon mIcon">{{pro.name}}</i></label>
+                        <p><em>*</em>主营内容：</p>
+                        <p class="business" id="secondShopType">
+                            <label v-for="pro in mentuzCampNullList" class="diyBox second"><input type="checkbox" name="secondShopType" v-model="userMainPros" :value="pro.name" @change="ChangeSecondShopType"><i class="icon mIcon">{{pro.name}}</i></label>
                             <input type="text" placeholder="请输入其他自定义品项目" v-model.trim="mainProEdit">
                             <a href="javascript:void(0);" @click="mainProAdd()">确认添加</a>
                         </p>

src/main/resources/templates/pay/caimei-paycash.html

@@ -94,7 +94,7 @@
                     <div class="payment" id="offlinePayment" v-if="tabIndex === 1">
                         <div class="payment-transfer">
                             <div class="payment-transfer-main" id="paymentTransferMain">
-                                <div class="label"><P class="label-title">除了线上支付，您还可以通过直接转账的方式付款</P></div>
+                                <div class="label"><P class="label-title"><i class="icon mIcon"></i>除了线上支付，您还可以通过直接转账的方式付款</P></div>
                                 <div class="label"><P class="label-t">转账信息</P></div>
                                 <div class="label">
                                     <P class="text">开户行：中信银行（深圳泰然支行）</P>

src/main/resources/templates/user-center/order/detail.html

@@ -65,7 +65,7 @@
                                     <p>待付金额：<span class="red">￥{{orderInfo.pendingPayments | NumFormat}}</span> </p>
                                 </div>
                                 <div class="order-item">
-                                    <p>税费： <span>￥{{orderInfo.expensesOfTaxation | NumFormat}}</span> </p>
+                                    <p>税费： <span class="none">￥{{orderInfo.expensesOfTaxation | NumFormat}}</span> </p>
                                     <p v-if="orderInfo.freePostFlag == '0'">运费：<span class="none">包邮</span> </p>
                                     <p v-if="orderInfo.freePostFlag == '-1'">运费：<span class="none">到付</span> </p>
                                     <p v-if="orderInfo.freePostFlag == '1'">运费：<span class="none">￥{{orderInfo.freight | NumFormat}}</span> </p>
@@ -137,7 +137,7 @@
                                 </div>
                                 <div class="shopinfo-bott clear">
                                     <div class="bott-top">
-                                        <div class="count">共<span class="red">{{shop.itemCount}}</span>件商品</div>
+                                        <div class="count" :class="shop.promotionFullReduction == 0 ? 'none' : ''">共<span class="red">{{shop.itemCount}}</span>件商品</div>
                                         <div class="total">
                                             <p class="sum-none" v-if="shop.promotionFullReduction>0">
                                                 <span class="money-sign">￥</span>
@@ -174,7 +174,7 @@
                         <div class="section-payment shadow">
                             <div class="payment-transfer">
                                 <div class="payment-transfer-main" id="paymentTransferMain">
-                                    <div class="label"><P class="label-title">除了线上支付，您还可以通过直接转账的方式付款</P></div>
+                                    <div class="label"><P class="label-title"><i class="icon mIcon"></i>除了线上支付，您还可以通过直接转账的方式付款</P></div>
                                     <div class="label"><P class="label-t">转账信息</P></div>
                                     <div class="label">
                                         <P class="text">开户行：中信银行（深圳泰然支行）</P>

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

@@ -114,7 +114,7 @@
                             </div>
                             <div class="formLine">
                                 <p id="firstClubType"><em>*</em>机构类型：</p>
-                                <label class="diyBox"><input type="radio" name="firstShopType" v-model="clubUpgradeUser.firstClubType" value="1" ><i class="icon mIcon">医美</i></label>
+                                <label class="diyBox"><input type="radio" name="firstShopType" v-model="clubUpgradeUser.firstClubType" value="1"><i class="icon mIcon">医美</i></label>
                                 <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="请选择公司类型"></span>
                             </div>