bugCommit

src/main/resources/static/css/base/form.css

@@ -8,7 +8,10 @@
 .formLine input,.formLine select{box-sizing:border-box;width:100%;height:36px;line-height:34px;text-indent:1.2em;background-color:#FFF;border:1px solid #b8bfca;border-radius:2px}
 .formLine textarea{width:100%;height:114px;margin-top: 20px; box-sizing:border-box;border:solid 1px #b8bfca;padding:10px 16px;line-height:20px;resize: none;border-radius: 2px;outline: none;}
 .formLine select{width:154px}
-.formLine.error input,.formLine.error textarea{border-color:#f94b4b}
+.formLine.error input,
+.formLine.error textarea,
+.formLine .address.error select,
+.formLine .address.error textarea{border-color:#f94b4b}
 .formLine input:focus{border-color:#ffe6dc;}
 .formLine p{height:auto;line-height:32px}
 .formLine p em{font-style:normal;color:#f94b4b;margin:0 5px}

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

@@ -49,10 +49,15 @@ li{list-style:none}
     .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;}
     .order-container .section-shopinfo .shopinfo-bott p .red{color: #FF2A2A;}
-    .order-container .section-shopinfo .shopinfo-bott .bott-top{width: 100%;float: left;}
+    .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 .total{float: right;font-size: 16px;}
+    .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 .bott-bot p{color: #627386;}
     .order-container .section-shopinfo .bott-bot span{margin-left: 10px;color: #22272E;}
     /*发票信息*/
@@ -125,7 +130,8 @@ li{list-style:none}
     .section-shopinfo .name{display:inline-block;color:#9aa5b5}
     .section-shopinfo .title .priceTag{width:22vw;height:6.4vw;position:absolute;right:0;top:2vw}
     .section-shopinfo .title .priceTag .tag{top:0}
-    .section-shopinfo{width:100%;background:#FFF;color:#9aa5b5;font-size:3.4vw;margin-top:1.5vw;padding:0 3.2vw;box-sizing:border-box}
+    .section-shopinfo{width:100%;background:#FFF;color:#9aa5b5;font-size:3.4vw;margin-top:1.5vw;padding:2vw 3.2vw;box-sizing:border-box}
+    .section-shopinfo .product{padding:2vw 0;box-sizing:border-box}
     .section-prosinfo{padding:1vw 0 1vw 32.2vw;position:relative;margin-top:2vw}
     .section-prosinfo .image{width:28vw;position:absolute;left:0;top:0}
     .section-prosinfo .image img{width:28vw;height:28vw}
@@ -137,6 +143,10 @@ li{list-style:none}
     .section-prosinfo .text .price{font-size:3.4vw;color:#627386}
     .section-prosinfo .text .price .red{color:#f94b4b}
     .shopinfo-bott{border-top:1px solid #F7F7F7;width:100%;box-sizing:border-box;margin:0 auto;line-height:10.6vw;color:#22272e;font-size:3.4vw;text-align:right;padding:0 3.2vw}
+    .shopinfo-bott .total p{width: 100%;float: right;line-height: 6vw;}
+    .shopinfo-bott .total p .money{color: #999999;text-decoration: line-through;}
+    .shopinfo-bott .total p .money-sign{color: #999999;text-decoration: line-through;}
+    .shopinfo-bott .total p .money-reduced{color: #e15616;}
     .shopinfo-bott p{display:inline-block;margin-left:3vw}
     .shopinfo-bott p .red{color:#627386}
     .shopinfo-bott .bott-bot{text-align:left;line-height:6vw;color:#627386;padding-bottom:2vw}

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

@@ -36,7 +36,7 @@ var registerPage = new Vue({
             businessLicenseImage:'',
             headpic:'',
             medicalPracticeLicenseImg:'',
-            firstClubType:'',
+            firstClubType:0,
             secondClubType:0,
             department:'',
             provinceID :'',
@@ -186,6 +186,19 @@ var registerPage = new Vue({
             if (_self.loginLoading) { return false; }
             this.$nextTick(function() {
                 if (!pass) {return false;}
+                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){
+                    $('#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;
                 UserApi.ClubUpgrade(_self.clubUpgradeUser,function (response) {
@@ -242,7 +255,7 @@ var registerPage = new Vue({
             if (_self.mainProEdit.length>0) {
                 if (_self.mainPros.indexOf(_self.mainProEdit)<0){
                     var obj = {name:_self.mainProEdit};
-                    if(_self.clubUpgradeUser.firstClubType === '0'){
+                    if(_self.clubUpgradeUser.firstClubType === '2'){
                         if(_self.checkedArray(_self.mainProEdit,_self.mentuzCampNullList)){
                             CAIMEI.dialog('主营内容已存在!',false);
                         }else {
@@ -310,6 +323,8 @@ var registerPage = new Vue({
             _this.formData.append('file', file[0]);
             PublicApi.uploadimg(_this.formData,function(response){
                 _this.clubUpgradeUser.businessLicenseImage = response.data;
+                $('#formbusinessLicenseImage').parent().removeClass("error");
+                $('#formbusinessLicenseImage').siblings('.errTips').removeClass("show");
                 event.target.value = '';
             });
         },

src/main/resources/static/js/base.js

@@ -567,7 +567,7 @@ function verifyHandle(obj){
     var reg = $(obj).attr("rule");
     var errorTxt = $(obj).siblings('.errTips').attr("tips");
     if ($.trim(v) === '') {
-        if ($(obj).attr("placeholder").indexOf("请输入")>=0) {
+        if ($(obj).attr("placeholder") && $(obj).attr("placeholder").indexOf("请输入")>=0) {
             errorTxt = $(obj).attr("placeholder").split("请输入")[1]+'不能为空';
         } else {
             errorTxt = '不能为空';

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

@@ -281,7 +281,6 @@ var orderPage = new Vue({
             var supportPageOffset = window.pageXOffset !== undefined; // 判断是否支持pageXOffset
             var isCSS1Compat = ((document.compatMode || "") === "CSS1Compat"); // 判断渲染模式是不是标准模式
             var scrollHeight = supportPageOffset ? window.pageYOffset : isCSS1Compat ? document.documentElement.scrollTop : document.body.scrollTop;
-            console.log(scrollHeight)
             if(scrollHeight<100){
                 _self.isFiexd = true
             }else{

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

@@ -119,6 +119,19 @@ var informationPage = new Vue({
             if (_self.loginLoading) { return false; }
             this.$nextTick(function() {
                 if (!pass) {return false;}
+                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){
+                    $('#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("/");
                 if(_self.userIdentity === 4){
                     params = {

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

@@ -103,7 +103,7 @@
                 </div>
                 <div class="formLine">
                     <p><em>*</em>机构名称：</p>
-                    <input type="text" v-model.trim="clubUpgradeUser.name" placeholder="请与营业执照的注册名称保持一致" :rule="rule.name" maxlength="30" @blur="blurHandle($event)" needverify>
+                    <input type="text" v-model.trim="clubUpgradeUser.name" placeholder="请输入与营业执照的注册名称保持一致的机构名称" :rule="rule.name" maxlength="30" @blur="blurHandle($event)" needverify>
                     <i class="checked icon mIcon"></i>
                     <span class="errTips icon mIcon" tips="请输入机构名称"></span>
                 </div>
@@ -119,17 +119,16 @@
                             <option v-for="(item ,index) in ProvinceList" :key="index" :value='item.provinceID' >{{item.name}}</option>
                         </select>
                         <select name="cityID" id="cCity" @change="ChangeGetcity($event)" >
-                            <option value="" >请选择</option>
+                            <option value="">请选择</option>
                             <option v-for="(item ,index) in cityArray" :key="index" :value="item.cityID" >{{item.name}}</option>
                         </select>
-                        <select name="townID" id="cTown" @change="ChangeGetcTown($event)">
-                            <option value="" >请选择</option>
+                        <select name="townID" id="cTown" @change="ChangeGetcTown($event)" needverify>
+                            <option value="">请选择</option>
                             <option v-for="(item ,index) in townArray" :key="index" :value="item.townID"  >{{item.name}}</option>
                         </select>
-                        <textarea placeholder="建议您如实填写详细地址，例如：街道名称，门牌号码，楼层和房间号等信息"  v-model="clubUpgradeUser.address"></textarea>
+                        <textarea placeholder="请输入您的详细联系地址"  v-model="clubUpgradeUser.address" @blur="blurHandle($event)" needverify></textarea>
+                        <span class="errTips icon mIcon" tips="请输入正确的联系地址"></span>
                     </div>
-                    <i class="checked icon mIcon"></i>
-                    <span class="errTips icon mIcon" tips="请输入正确的联系地址"></span>
                 </div>
                 <div class="formLine">
                     <p>营业执照编号：</p>
@@ -142,7 +141,7 @@
                             <img class="upload-img" :src="clubUpgradeUser.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>
@@ -167,7 +166,7 @@
                     </div>
                 </div>
                 <div class="formLine">
-                    <p><em>*</em>机构类型：</p>
+                    <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>
                     <span class="errTips icon mIcon" tips="请选择公司类型"></span>

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

@@ -112,7 +112,7 @@
                                                     <p>折扣：<span class="none">{{pros.discount == null ? '0' : pros.discount}}%</span></p>
                                                     <p>折后单价：<span class="none">￥{{pros.discountPrice | NumFormat}}</span></p>
                                                     <!-- 促销活动 -->
-                                                    <div v-if="pros.productPromotion" class="priceTag">
+                                                    <div v-if="pros.productPromotion && pros.productPromotion.type !=3" class="priceTag">
                                                         <i v-if="pros.productPromotion.type==1 && pros.productPromotion.mode==1" @click="toggleThisLadder($event)" class="tag icon mIcon" v-text="pros.productPromotion.name+'：¥'+toFloat(pros.productPromotion.touchPrice)"></i>
                                                         <i v-else class="tag icon mIcon" @click="toggleThisLadder($event)" v-text="pros.productPromotion?pros.productPromotion.name:''"></i>
                                                         <div class="promotion mFixed">
@@ -137,8 +137,15 @@
                                 </div>
                                 <div class="shopinfo-bott clear">
                                     <div class="bott-top">
-                                        <p class="count">共<span class="red">{{shop.itemCount}}</span>件商品</p>
-                                        <p class="total">合计：<span class="red">￥{{shop.totalAmount | NumFormat}}</span></p>
+                                        <div class="count">共<span class="red">{{shop.itemCount}}</span>件商品</div>
+                                        <div class="total">
+                                            <p class="sum-none" v-if="shop.promotionFullReduction>0">
+                                                <span class="money-sign">￥</span>
+                                                <span class="money">{{ (shop.totalAmount+shop.promotionFullReduction) | NumFormat }}</span>
+                                                <span class="money-reduced">减<span>￥{{ (shop.promotionFullReduction) | NumFormat}}</span></span>
+                                            </p>
+                                            <p :class="shop.promotionFullReduction == 0 ? 'none' : ''"><span>合计：</span><span class="red">￥{{shop.totalAmount | NumFormat}}</span></p>
+                                        </div>
                                     </div>
                                     <div v-if="shop.note" class="bott-bot">
                                          <p>备注: <span>{{shop.note ? shop.note : '无'}}</span></p>

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

@@ -87,7 +87,7 @@
                                     <p v-if="order.freePostFlag == '-1'">运费：<span>到付</span> </p>
                                     <p v-if="order.freePostFlag == '1'">运费：<span>￥{{order.freight | NumFormat}}</span> </p>
                                     <p v-if="order.discountFee!=0">经理折扣：<span>￥{{order.discountFee | NumFormat}}</span> </p>
-                                    <p>促销满减：<span>￥{{order.payTotalFee | NumFormat}}</span> </p>
+                                    <p>促销满减：<span>￥{{order.promotionFullReduction | NumFormat}}</span> </p>
                                     <p>赠品数：<span>{{order.presentCount + order.promotionalGiftsCount}}</span></p>
                                 </div>
                                 <div class="order-item">

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

@@ -72,10 +72,10 @@
                                         <option value="" >请选择</option>
                                         <option v-for="(item ,index) in townArray" :key="index" :value="item.townID"  >{{item.name}}</option>
                                     </select>
-                                    <textarea placeholder="建议您如实填写详细地址，例如：街道名称，门牌号码，楼层和房间号等信息"  v-model="clubUpgradeUser.address"></textarea>
+                                    <textarea placeholder="建议您如实填写详细地址，例如：街道名称，门牌号码，楼层和房间号等信息"  v-model="clubUpgradeUser.address" @blur="blurHandle($event)" needverify></textarea>
+                                    <i class="checked icon mIcon"></i>
+                                    <span class="errTips icon mIcon" tips="请输入正确的联系地址"></span>
                                 </div>
-                                <i class="checked icon mIcon"></i>
-                                <span class="errTips icon mIcon" tips="请输入正确的联系地址"></span>
                             </div>
                             <div class="formLine">
                                 <p>营业执照编号：</p>
@@ -88,7 +88,7 @@
                                         <img class="upload-img" :src="clubUpgradeUser.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>
@@ -113,7 +113,7 @@
                                 </div>
                             </div>
                             <div class="formLine">
-                                <p><em>*</em>机构类型：</p>
+                                <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>
                                 <span class="errTips icon mIcon" tips="请选择公司类型"></span>