Merge remote-tracking branch 'origin/developerA' into developerA

src/main/resources/static/css/account/login.css

@@ -68,7 +68,15 @@ footer{display:none}
 .loginForm .submit .weChat{display:block;margin:6vw auto;width:50vw;color:#627386;line-height:8vw}
 .loginForm .submit .weChat span{display:inline-block;width:100%}
 .loginForm .submit .weChat .mIcon:before{width:12vw;height:12vw;background-position:0 -77.8vw}
-
+.bg{width: 100%;height: 100%;position: fixed;top: 0;left: 0;right: 0;bottom: 0;z-index: 99999999;font-family: inherit;overflow: hidden;background-color: #4444444f;opacity: 0}
+.bg .bg-content{width: 74.7vw;height: fit-content;position: absolute;top: 0;bottom: 0;right: 0;left: 0;margin: auto;z-index: 9999;background: #fff;border-radius: 4vw;}
+.bg .bg-content .bg-tittle{height:10.7vw;line-height: 10.7vw;font-size: 3.4vw;color: #333333;padding: 0 4vw;position: relative}
+.bg-tittle .icon{width: 6.4vw;height:6.4vw;position: absolute;right: 2.7vw;top: 2.7vw;cursor: pointer;}
+.bg-tittle .mIcon:before{ width:6.4vw ;height: 6.4vw;background-position: -33.5vw 0px;}
+.bg .bg-content .text-conten{padding: 4vw;border-top: .27vw solid #e2e7ef}
+.bg .bg-content .text-conten .status{color: #333333;font-size: 3.4vw;line-height: 5.4vw;margin-bottom: 5vw}
+.bg .bg-content .text-conten .tip-p{text-align: center;color:#e15616;font-size: 3vw;line-height: 7vw }
+.bg .bg-content .text-conten div{cursor: pointer;text-align: center;background: #e15616;width: 66.6vw;height: 9.9vw;line-height: 9.9vw;color: #fff;margin: auto;border-radius: .54vw;margin-top: 5vw}
 
 
 }

src/main/resources/static/css/product/instruement.css

@@ -64,8 +64,8 @@
     .brand{color: #9aa5b5;margin: 10px 8px;border: 1px solid #e3ebf7;display: inline-block;padding: 0 10px;border-radius: 2px}
     .item_icon{ width: 100%;height: 36px;padding: 12px 0 8px 0;}
     .item_icon img{width: 36px;height: 36px;display: block;margin: 0 auto;}
-    .productItem .price .price_grade{font-weight: normal;margin: 0;}
-    .productItem .price .bold{font-weight: bold;margin: 0}
+    .productItem .price em{font-weight: normal;margin: 0;}
+    .productItem .price em.bold{font-weight: bold;margin: 0}
     .price .right-box{margin:12px 0 0 0}
 }
 

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

@@ -130,6 +130,7 @@ var registerPage = new Vue({
                 UserApi.UpdateCompanyInfo(_self.supplierUser,function (response) {
                     if(response.code === 0){
                         CAIMEI.Alert('您的资料已提交成功，系统将在1-2个工作日内进行审核~','知道了',true,function () {
+                            CAIMEI.Storage.clear();//清除登录信息
                             window.location.href = '/index.html';
                             _self.loginLoading = false;
                         });

src/main/resources/static/js/product/produce-list.js

@@ -78,7 +78,6 @@ var productList = new Vue({
                         }else{
                             _self.listData=[],
                             _self.listData = _self.listData.concat(resultData);
-                            console.log(_self.listData)
                         }
 
                         _self.listLoading = false;

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

@@ -55,7 +55,7 @@
     </div>
     <div class="bg" v-if="stautsfalse" :style="stautsfalse?'opacity:1':''">
         <div class="bg-content">
-            <div class="bg-tittle"><p>提示</p><p class="icon" @click="hideBg"></p></div>
+            <div class="bg-tittle"><p>提示</p><p class="icon mIcon" @click="hideBg"></p></div>
             <div class="text-conten">
                 <p class="status">{{text}}</p>
                 <p class="tip-p">联系电话：0755-22907771</p>

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

@@ -79,15 +79,13 @@
                                                             </template>
                                                             <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
                                                                 <div class="price_text_tag">
-                                                                    <p class="listTag"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
+                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                                 </div>
                                                                 <div class="main_price_unde">￥会员可见</div>
                                                             </template>
                                                             <template v-else>
-                                                                <div class="price_text_tag" >
-                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                                </div>
-                                                                <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                                <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                             </template>
                                                         </template>
                                                     </template>
@@ -98,10 +96,8 @@
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
-                                                        <div class="price_text_tag" >
-                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                        </div>
-                                                        <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                        <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                        <span class="listTag right-box"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade">￥登录可见</em>
@@ -148,32 +144,25 @@
                                                             </template>
                                                             <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
                                                                 <div class="price_text_tag">
-                                                                    <p class="listTag" v-if="pros.product.actStatus==1" >{{pros.product.promotions.name}}</p>
+                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                                 </div>
                                                                 <div class="main_price_unde">￥会员可见</div>
                                                             </template>
                                                             <template v-else>
-                                                                <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
-                                                                 <div class="price_text_tag">
-                                                                    <p class="listTag"  v-if="pros.product.actStatus==1" >{{pros.product.promotions.name}}</p>
-                                                                 </div>
+                                                                <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                             </template>
                                                         </template>
                                                     </template>
                                                     <template v-else>
-                                                           <div class="price_text_tag">
-                                                             <p class="listTag" v-if="pros.product.actStatus==1" >{{pros.product.promotions.name}}</p>
-                                                           </div>
                                                           <div class="main_price_show" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>
                                                           <div class="main_price_show"  v-else>￥{{ pros.product.retailPrice | NumFormat  }}</div>
                                                     </template>
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
-                                                        <div class="price_text_tag">
-                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                        </div>
-                                                        <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                        <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                        <span class="listTag right-box"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade">￥登录可见</em>
@@ -225,10 +214,8 @@
                                                                 <div class="main_price_unde">￥会员可见</div>
                                                             </template>
                                                             <template v-else>
-                                                                <div class="price_text_tag ">
-                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                                </div>
-                                                              <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                                <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                             </template>
                                                         </template>
                                                     </template>
@@ -239,10 +226,8 @@
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
-                                                        <div class="price_text_tag ">
-                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                        </div>
-                                                       <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                        <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                        <span class="listTag right-box"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade">￥登录可见</em>
@@ -295,7 +280,7 @@
                                                                 <div class="main_price_unde">￥会员可见</div>
                                                             </template>
                                                             <template v-else>
-                                                                <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                                <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
                                                                 <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                             </template>
                                                         </template>
@@ -307,10 +292,8 @@
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
-                                                        <div class="price_text_tag ">
-                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                        </div>
-                                                        <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                        <em>￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                        <span class="listTag right-box"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade">￥登录可见</em>
@@ -361,10 +344,8 @@
                                                                 <div class="main_price_unde">￥会员可见</div>
                                                             </template>
                                                             <template v-else>
-                                                                <div class="price_text_tag">
-                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                                </div>
-                                                                <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                                <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                             </template>
                                                         </template>
                                                     </template>
@@ -375,10 +356,8 @@
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
-                                                        <div class="price_text_tag">
-                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                        </div>
-                                                       <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                        <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                        <span class="listTag right-box"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade">￥登录可见</em>
@@ -428,10 +407,8 @@
                                                                 <div class="main_price_unde">￥会员可见</div>
                                                             </template>
                                                             <template v-else>
-                                                                <div class="price_text_tag">
-                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                                </div>
-                                                               <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                                <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                             </template>
                                                         </template>
                                                     </template>
@@ -442,10 +419,8 @@
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
-                                                        <div class="price_text_tag">
-                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                        </div>
-                                                        <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                        <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                        <span class="listTag right-box"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade">￥登录可见</em>
@@ -496,10 +471,8 @@
                                                                 <div class="main_price_unde">￥会员可见</div>
                                                             </template>
                                                             <template v-else>
-                                                                <div class="price_text_tag">
-                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                                </div>
-                                                               <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                                <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                             </template>
                                                         </template>
                                                     </template>
@@ -510,10 +483,8 @@
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
-                                                        <div class="price_text_tag">
-                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                        </div>
-                                                        <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                        <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                        <span class="listTag right-box"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade">￥登录可见</em>
@@ -563,10 +534,8 @@
                                                                 <div class="main_price_unde">￥会员可见</div>
                                                             </template>
                                                             <template v-else>
-                                                                <div class="price_text_tag">
-                                                                    <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                                </div>
-                                                                <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                                <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                                <span class="listTag right-box" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                             </template>
                                                         </template>
                                                     </template>
@@ -577,10 +546,8 @@
                                                 </template>
                                                 <template v-else>
                                                     <template v-if="pros.product.productCategory == 1">
-                                                        <div class="price_text_tag" >
-                                                            <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
-                                                        </div>
-                                                        <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                        <em class="bold">￥<i :class="'icon mIcon i'+pros.product.price1Grade"></i></em>
+                                                        <span class="listTag right-box"  v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade">￥登录可见</em>