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

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

@@ -138,6 +138,7 @@ var productList = new Vue({
                     this.tinyName ='';
                     this.smallTypeID='';
                     this.tinyTypeID='';
+                    this.tinytypeList=[];
                     this.getclassify();
                     break;
                 case 2://选择二级分类查询
@@ -145,6 +146,7 @@ var productList = new Vue({
                     this.tinyName = '';
                     this.smallTypeID = item.smallTypeID;
                     this.params.id = item.smallTypeID;
+                    this.tinyTypeID='';
                     this.tinytypeList =item.tinytypeList;
                     break;
                 case 3://选择三级分类查询
@@ -199,7 +201,7 @@ var productList = new Vue({
                                      if(pros.tinytypeList!=''&&pros.tinytypeList!=null){
                                         _self.tinytypeList = pros.tinytypeList;
                                         _self.tinytypeList.forEach(function (thiny) {
-                                            if (thiny.tinyTypeID==_self.tinyTypeID){
+                                            if (thiny.tinyTypeID ==_self.tinyTypeID){
                                                 _self.tinyName=thiny.name;
 
                                             }

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

@@ -11,7 +11,7 @@
 <template th:replace="components/header"></template>
 
 <!-- 二手商品发布 -->
-<div id="fleaMarketForm">
+<div id="fleaMarketForm" v-cloak="">
      <div class="bannerimg"><img src="/img/flea-market/banner@2x.png" v-if="isPC"><img src="/img/flea-market/banner3.png " v-else></div>
       <div class="my-maintenance" id="secondHandrelease">
             <div class="mt-top" >

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

@@ -90,7 +90,7 @@
                                                         </template>
                                                     </template>
                                                     <template v-else>
-                                                          <div class="main_price_unde" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</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>
@@ -155,7 +155,7 @@
                                                         </template>
                                                     </template>
                                                     <template v-else>
-                                                          <div class="main_price_unde" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</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>
@@ -220,7 +220,7 @@
                                                         </template>
                                                     </template>
                                                     <template v-else>
-                                                          <div class="main_price_unde" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</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>
@@ -286,7 +286,7 @@
                                                         </template>
                                                     </template>
                                                     <template v-else>
-                                                          <div class="main_price_unde" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</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>
@@ -350,7 +350,7 @@
                                                         </template>
                                                     </template>
                                                     <template v-else>
-                                                          <div class="main_price_unde" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</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>
@@ -413,7 +413,7 @@
                                                         </template>
                                                     </template>
                                                     <template v-else>
-                                                          <div class="main_price_unde" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</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>
@@ -477,7 +477,7 @@
                                                         </template>
                                                     </template>
                                                     <template v-else>
-                                                          <div class="main_price_unde" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</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>
@@ -540,7 +540,7 @@
                                                         </template>
                                                     </template>
                                                     <template v-else>
-                                                          <div class="main_price_unde" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</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>