数据库字段优化

src/main/resources/mapper/HomeMapper.xml

@@ -33,9 +33,9 @@
 <!--			p.`name` as `name`,-->
 <!--			br.name as brand,-->
 <!--			p.mainImage as image,-->
-<!--			p.price1 as price,-->
+<!--			p.price,-->
 <!--			p.unit as unit,-->
-<!--			p.price1TextFlag as priceFlag,-->
+<!--			p.priceFlag,-->
 <!--			p.actType as actType-->
 <!--		from product p-->
 <!--		left join cm_brand as br on p.brandID = br.id-->

src/main/resources/mapper/ProductMapper.xml

@@ -6,9 +6,9 @@
 			p.productID as id,
 			p.`name` as `name`,
 			p.mainImage as image,
-			p.price1 as price,
+			p.price,
 			p.unit as unit,
-			p.price1TextFlag as priceFlag,
+			p.priceFlag,
 
 			p.tags as tags,
 			p.productRemarks as remarks,
@@ -100,11 +100,11 @@
     <select id="getPriceItemById" resultType="com.caimei.www.pojo.order.CartItem">
 		select
 			p.productID as productId,
-			p.price1 as price,
+			p.price,
 			p.unit as unit,
 			p.step as step,
 			p.minBuyNumber as min,
-			p.price1TextFlag as priceFlag,
+			p.priceFlag,
 			p.ladderPriceFlag as ladderFlag,
 			p.validFlag as validFlag,
 			p.stock as stock

src/main/resources/mapper/SupplierMapper.xml

@@ -14,8 +14,7 @@
             s.taxCertificateImage as taxCertificate,
             s.authorizationCertificateImage as license,
             s.info,
-            s.productDesc,
-            s.site
+            s.productDesc
         from shop s
         where shopID = #{supplierId}
     </select>

src/main/resources/static/js/supplier-center/shop/release.js

@@ -124,7 +124,7 @@ var releaseContainer = new Vue({
         vShow_Tags:false,
         vShow_Unit:false,
         vShow_NormalPrice:false,
-        vShow_Price1:false,
+        vShow_price:false,
         vShow_includedTax:false,
         vShow_MinBuyNumber:false,
         vShow_Stock:false,
@@ -859,20 +859,20 @@ var releaseContainer = new Vue({
                 return
             }
             if(_this.releaseParams.price == ''){
-                _this.vShow_Price1 = true;
+                _this.vShow_price = true;
                 _this.fromMessage = '请输入售价';
                 _this.scrollIntoView();
                 setTimeout(function(){
-                    _this.vShow_Price1 = false;
+                    _this.vShow_price = false;
                 },2000);
                 return;
             }
-            if(_this.releaseParams.price1 == 0){
-                _this.vShow_Price1 = true;
+            if(_this.releaseParams.price == 0){
+                _this.vShow_price = true;
                 _this.fromMessage = '售价不能为0';
                 _this.scrollIntoView();
                 setTimeout(function(){
-                    _this.vShow_Price1 = false;
+                    _this.vShow_price = false;
                 },2000);
                 return;
             }
@@ -1099,8 +1099,8 @@ var releaseContainer = new Vue({
         input_normalPrice: function(e){
             this.vShow_NormalPrice = false;
         },
-        input_price1: function(e){
-            this.vShow_Price1 = false;
+        input_price: function(e){
+            this.vShow_price = false;
         },
         input_trainingFee: function(event){
             var E_Number = event.target.value;

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

@@ -97,7 +97,7 @@
                                             <!--正常商品, 二手商品-->
                                             <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
                                             <template v-if="pros.productCategory==1">
-                                                <template v-if="pros.price1TextFlag==1">
+                                                <template v-if="pros.priceFlag==1">
                                                     <!--价格未公开-->
                                                     <div class="main_price_text">
                                                         <div class="price_text_tag">
@@ -109,7 +109,7 @@
                                                 </template>
                                                 <template v-else>
                                                     <!--可见价格-->
-                                                    <template v-if="(pros.price1TextFlag==0 && pros.userIdentity!=3) || pros.userIdentity==2 || (pros.userIdentity==3 && pros.shopID==GLOBAL_SHOP_ID)">
+                                                    <template v-if="(pros.priceFlag==0 && pros.userIdentity!=3) || pros.userIdentity==2 || (pros.userIdentity==3 && pros.shopID==GLOBAL_SHOP_ID)">
                                                         <div class="main_price_text" v-if="pros.productCategory == 1">
                                                             <div class="price_text_tag">
 <!--																<p class="couponTag" v-if="pros.couponsLogo">优惠券</p>-->
@@ -119,12 +119,12 @@
                                                                 </p>
                                                             </div>
                                                             <div class="main_price_show" :class="PromotionsFormat(pros.promotions) ? 'none' : ''">
-                                                                ￥{{ (PromotionsFormat(pros.promotions) ? pros.price1 : pros.retailPrice ) | NumFormat  }}
+                                                                ￥{{ (PromotionsFormat(pros.promotions) ? pros.price : pros.retailPrice ) | NumFormat  }}
                                                             </div>
                                                         </div>
                                                     </template>
                                                     <!--仅会员机构可见-->
-                                                    <template v-else-if="pros.price1TextFlag==2 && pros.userIdentity==4">
+                                                    <template v-else-if="pros.priceFlag==2 && pros.userIdentity==4">
                                                         <div class="main_price_text">
                                                             <div class="price_text_tag">
 <!--																<p class="couponTag" v-if="pros.couponsLogo">优惠券</p>-->
@@ -139,7 +139,7 @@
                                                             <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
                                                         </div>
                                                         <div class="main_price_none">
-                                                            <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.price1Grade"></i></em>
+                                                            <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.priceGrade"></i></em>
                                                             <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
                                                         </div>
                                                     </template>
@@ -163,7 +163,7 @@
                                                     <p class="listTag" v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
                                                 </div>
                                                 <div class="main_price_none">
-                                                    <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.price1Grade"></i></em>
+                                                    <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.priceGrade"></i></em>
                                                     <p class="listTag " v-if="pros.actStatus==1">{{pros.promotions.name}}</p>
                                                 </div>
                                             </template>

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

@@ -79,7 +79,7 @@
                                             <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                                 <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
                                                 <template v-if="pros.product.productCategory==1">
-                                                    <template v-if="pros.product.price1TextFlag==1">
+                                                    <template v-if="pros.product.priceFlag==1">
                                                         <div class="price_text_tag">
                                                             <p class="listTag" v-if="pros.product.actStatus==1">
                                                                 {{pros.product.promotions.name}}</p>
@@ -88,7 +88,7 @@
                                                     </template>
                                                     <template v-else>
                                                         <template
-                                                                v-if="(pros.product.price1TextFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
+                                                                v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">
                                                                     {{pros.product.promotions.name}}
@@ -98,12 +98,12 @@
                                                             <div class="main_price_show"
                                                                  :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
                                                                 ￥{{ (PromotionsFormat(pros.product.promotions) ?
-                                                                pros.product.price1 : pros.product.retailPrice ) |
+                                                                pros.product.price : pros.product.retailPrice ) |
                                                                 NumFormat }}
                                                             </div>
                                                         </template>
                                                         <template
-                                                                v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                                v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">
                                                                     {{pros.product.promotions.name}}</p>
@@ -116,7 +116,7 @@
                                                                     {{pros.product.promotions.name}}</p>
                                                             </div>
                                                             <div class=" price_grade"><span class="bold">￥</span><i
-                                                                    :class="'icon mIcon i'+pros.product.price1Grade"></i>
+                                                                    :class="'icon mIcon i'+pros.product.priceGrade"></i>
                                                             </div>
                                                         </template>
                                                     </template>
@@ -138,7 +138,7 @@
                                                             {{pros.product.promotions.name}}</p>
                                                     </div>
                                                     <div class=" price_grade"><span class="bold">￥</span><i
-                                                            :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                            :class="'icon mIcon i'+pros.product.priceGrade"></i></div>
                                                 </template>
                                                 <template v-else>
                                                     <em class="price_grade sec">￥登录可见</em>
@@ -176,7 +176,7 @@
                                             <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                                 <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
                                                 <template v-if="pros.product.productCategory==1">
-                                                    <template v-if="pros.product.price1TextFlag==1">
+                                                    <template v-if="pros.product.priceFlag==1">
                                                         <div class="price_text_tag">
                                                             <p class="listTag" v-if="pros.product.actStatus==1">
                                                                 {{pros.product.promotions.name}}</p>
@@ -185,7 +185,7 @@
                                                     </template>
                                                     <template v-else>
                                                         <template
-                                                                v-if="(pros.product.price1TextFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
+                                                                v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">
                                                                     {{pros.product.promotions.name}}
@@ -195,12 +195,12 @@
                                                             <div class="main_price_show"
                                                                  :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
                                                                 ￥{{ (PromotionsFormat(pros.product.promotions) ?
-                                                                pros.product.price1 : pros.product.retailPrice ) |
+                                                                pros.product.price : pros.product.retailPrice ) |
                                                                 NumFormat }}
                                                             </div>
                                                         </template>
                                                         <template
-                                                                v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                                v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">
                                                                     {{pros.product.promotions.name}}</p>
@@ -213,7 +213,7 @@
                                                                     {{pros.product.promotions.name}}</p>
                                                             </div>
                                                             <div class=" price_grade"><span class="bold">￥</span><i
-                                                                    :class="'icon mIcon i'+pros.product.price1Grade"></i>
+                                                                    :class="'icon mIcon i'+pros.product.priceGrade"></i>
                                                             </div>
                                                         </template>
                                                     </template>
@@ -235,7 +235,7 @@
                                                             {{pros.product.promotions.name}}</p>
                                                     </div>
                                                     <div class=" price_grade"><span class="bold">￥</span><i
-                                                            :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                            :class="'icon mIcon i'+pros.product.priceGrade"></i></div>
                                                 </template>
                                                 <template v-else>
                                                     <em class="price_grade sec">￥登录可见</em>
@@ -275,7 +275,7 @@
                                             <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                                 <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
                                                 <template v-if="pros.product.productCategory==1">
-                                                    <template v-if="pros.product.price1TextFlag==1">
+                                                    <template v-if="pros.product.priceFlag==1">
                                                         <div class="price_text_tag">
                                                             <p class="listTag" v-if="pros.product.actStatus==1">
                                                                 {{pros.product.promotions.name}}</p>
@@ -284,7 +284,7 @@
                                                     </template>
                                                     <template v-else>
                                                         <template
-                                                                v-if="(pros.product.price1TextFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
+                                                                v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">
                                                                     {{pros.product.promotions.name}}
@@ -294,12 +294,12 @@
                                                             <div class="main_price_show"
                                                                  :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
                                                                 ￥{{ (PromotionsFormat(pros.product.promotions) ?
-                                                                pros.product.price1 : pros.product.retailPrice ) |
+                                                                pros.product.price : pros.product.retailPrice ) |
                                                                 NumFormat }}
                                                             </div>
                                                         </template>
                                                         <template
-                                                                v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                                v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">
                                                                     {{pros.product.promotions.name}}</p>
@@ -312,7 +312,7 @@
                                                                     {{pros.product.promotions.name}}</p>
                                                             </div>
                                                             <div class=" price_grade"><span class="bold">￥</span><i
-                                                                    :class="'icon mIcon i'+pros.product.price1Grade"></i>
+                                                                    :class="'icon mIcon i'+pros.product.priceGrade"></i>
                                                             </div>
                                                         </template>
                                                     </template>
@@ -334,7 +334,7 @@
                                                             {{pros.product.promotions.name}}</p>
                                                     </div>
                                                     <div class=" price_grade"><span class="bold">￥</span><i
-                                                            :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                            :class="'icon mIcon i'+pros.product.priceGrade"></i></div>
                                                 </template>
                                                 <template v-else>
                                                     <em class="price_grade sec">￥登录可见</em>
@@ -378,7 +378,7 @@
                                             <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                                 <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
                                                 <template v-if="pros.product.productCategory==1">
-                                                    <template v-if="pros.product.price1TextFlag==1">
+                                                    <template v-if="pros.product.priceFlag==1">
                                                         <div class="price_text_tag">
                                                             <p class="listTag" v-if="pros.product.actStatus==1">
                                                                 {{pros.product.promotions.name}}</p>
@@ -387,7 +387,7 @@
                                                     </template>
                                                     <template v-else>
                                                         <template
-                                                                v-if="(pros.product.price1TextFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
+                                                                v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">
                                                                     {{pros.product.promotions.name}}
@@ -397,12 +397,12 @@
                                                             <div class="main_price_show"
                                                                  :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
                                                                 ￥{{ (PromotionsFormat(pros.product.promotions) ?
-                                                                pros.product.price1 : pros.product.retailPrice ) |
+                                                                pros.product.price : pros.product.retailPrice ) |
                                                                 NumFormat }}
                                                             </div>
                                                         </template>
                                                         <template
-                                                                v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                                v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">
                                                                     {{pros.product.promotions.name}}</p>
@@ -415,7 +415,7 @@
                                                                     {{pros.product.promotions.name}}</p>
                                                             </div>
                                                             <div class=" price_grade"><span class="bold">￥</span><i
-                                                                    :class="'icon mIcon i'+pros.product.price1Grade"></i>
+                                                                    :class="'icon mIcon i'+pros.product.priceGrade"></i>
                                                             </div>
                                                         </template>
                                                     </template>
@@ -437,7 +437,7 @@
                                                             {{pros.product.promotions.name}}</p>
                                                     </div>
                                                     <div class=" price_grade"><span class="bold">￥</span><i
-                                                            :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                            :class="'icon mIcon i'+pros.product.priceGrade"></i></div>
                                                 </template>
                                                 <template v-else>
                                                     <em class="price_grade sec">￥登录可见</em>
@@ -470,7 +470,7 @@
                                             <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                                 <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
                                                 <template v-if="pros.product.productCategory==1">
-                                                    <template v-if="pros.product.price1TextFlag==1">
+                                                    <template v-if="pros.product.priceFlag==1">
                                                         <div class="price_text_tag">
                                                             <p class="listTag" v-if="pros.product.actStatus==1">
                                                                 {{pros.product.promotions.name}}</p>
@@ -479,7 +479,7 @@
                                                     </template>
                                                     <template v-else>
                                                         <template
-                                                                v-if="(pros.product.price1TextFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
+                                                                v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">
                                                                     {{pros.product.promotions.name}}
@@ -489,12 +489,12 @@
                                                             <div class="main_price_show"
                                                                  :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
                                                                 ￥{{ (PromotionsFormat(pros.product.promotions) ?
-                                                                pros.product.price1 : pros.product.retailPrice ) |
+                                                                pros.product.price : pros.product.retailPrice ) |
                                                                 NumFormat }}
                                                             </div>
                                                         </template>
                                                         <template
-                                                                v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                                v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">
                                                                     {{pros.product.promotions.name}}</p>
@@ -507,7 +507,7 @@
                                                                     {{pros.product.promotions.name}}</p>
                                                             </div>
                                                             <div class=" price_grade"><span class="bold">￥</span><i
-                                                                    :class="'icon mIcon i'+pros.product.price1Grade"></i>
+                                                                    :class="'icon mIcon i'+pros.product.priceGrade"></i>
                                                             </div>
                                                         </template>
                                                     </template>
@@ -529,7 +529,7 @@
                                                             {{pros.product.promotions.name}}</p>
                                                     </div>
                                                     <div class=" price_grade"><span class="bold">￥</span><i
-                                                            :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                            :class="'icon mIcon i'+pros.product.priceGrade"></i></div>
                                                 </template>
                                                 <template v-else>
                                                     <em class="price_grade sec">￥登录可见</em>
@@ -561,7 +561,7 @@
                                             <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                                 <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
                                                 <template v-if="pros.product.productCategory==1">
-                                                    <template v-if="pros.product.price1TextFlag==1">
+                                                    <template v-if="pros.product.priceFlag==1">
                                                         <div class="price_text_tag">
                                                             <p class="listTag" v-if="pros.product.actStatus==1">
                                                                 {{pros.product.promotions.name}}</p>
@@ -570,7 +570,7 @@
                                                     </template>
                                                     <template v-else>
                                                         <template
-                                                                v-if="(pros.product.price1TextFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
+                                                                v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">
                                                                     {{pros.product.promotions.name}}
@@ -580,12 +580,12 @@
                                                             <div class="main_price_show"
                                                                  :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
                                                                 ￥{{ (PromotionsFormat(pros.product.promotions) ?
-                                                                pros.product.price1 : pros.product.retailPrice ) |
+                                                                pros.product.price : pros.product.retailPrice ) |
                                                                 NumFormat }}
                                                             </div>
                                                         </template>
                                                         <template
-                                                                v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                                v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">
                                                                     {{pros.product.promotions.name}}</p>
@@ -598,7 +598,7 @@
                                                                     {{pros.product.promotions.name}}</p>
                                                             </div>
                                                             <div class=" price_grade"><span class="bold">￥</span><i
-                                                                    :class="'icon mIcon i'+pros.product.price1Grade"></i>
+                                                                    :class="'icon mIcon i'+pros.product.priceGrade"></i>
                                                             </div>
                                                         </template>
                                                     </template>
@@ -620,7 +620,7 @@
                                                             {{pros.product.promotions.name}}</p>
                                                     </div>
                                                     <div class=" price_grade"><span class="bold">￥</span><i
-                                                            :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                            :class="'icon mIcon i'+pros.product.priceGrade"></i></div>
                                                 </template>
                                                 <template v-else>
                                                     <em class="price_grade sec">￥登录可见</em>
@@ -653,7 +653,7 @@
                                             <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                                 <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
                                                 <template v-if="pros.product.productCategory==1">
-                                                    <template v-if="pros.product.price1TextFlag==1">
+                                                    <template v-if="pros.product.priceFlag==1">
                                                         <div class="price_text_tag">
                                                             <p class="listTag" v-if="pros.product.actStatus==1">
                                                                 {{pros.product.promotions.name}}</p>
@@ -662,7 +662,7 @@
                                                     </template>
                                                     <template v-else>
                                                         <template
-                                                                v-if="(pros.product.price1TextFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
+                                                                v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">
                                                                     {{pros.product.promotions.name}}
@@ -672,12 +672,12 @@
                                                             <div class="main_price_show"
                                                                  :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
                                                                 ￥{{ (PromotionsFormat(pros.product.promotions) ?
-                                                                pros.product.price1 : pros.product.retailPrice ) |
+                                                                pros.product.price : pros.product.retailPrice ) |
                                                                 NumFormat }}
                                                             </div>
                                                         </template>
                                                         <template
-                                                                v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                                v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">
                                                                     {{pros.product.promotions.name}}</p>
@@ -690,7 +690,7 @@
                                                                     {{pros.product.promotions.name}}</p>
                                                             </div>
                                                             <div class=" price_grade"><span class="bold">￥</span><i
-                                                                    :class="'icon mIcon i'+pros.product.price1Grade"></i>
+                                                                    :class="'icon mIcon i'+pros.product.priceGrade"></i>
                                                             </div>
                                                         </template>
                                                     </template>
@@ -712,7 +712,7 @@
                                                             {{pros.product.promotions.name}}</p>
                                                     </div>
                                                     <div class=" price_grade"><span class="bold">￥</span><i
-                                                            :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                            :class="'icon mIcon i'+pros.product.priceGrade"></i></div>
                                                 </template>
                                                 <template v-else>
                                                     <em class="price_grade sec">￥登录可见</em>
@@ -743,7 +743,7 @@
                                             <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                                                 <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
                                                 <template v-if="pros.product.productCategory==1">
-                                                    <template v-if="pros.product.price1TextFlag==1">
+                                                    <template v-if="pros.product.priceFlag==1">
                                                         <div class="price_text_tag">
                                                             <p class="listTag" v-if="pros.product.actStatus==1">
                                                                 {{pros.product.promotions.name}}</p>
@@ -752,7 +752,7 @@
                                                     </template>
                                                     <template v-else>
                                                         <template
-                                                                v-if="(pros.product.price1TextFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
+                                                                v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">
                                                                     {{pros.product.promotions.name}}
@@ -762,12 +762,12 @@
                                                             <div class="main_price_show"
                                                                  :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
                                                                 ￥{{ (PromotionsFormat(pros.product.promotions) ?
-                                                                pros.product.price1 : pros.product.retailPrice ) |
+                                                                pros.product.price : pros.product.retailPrice ) |
                                                                 NumFormat }}
                                                             </div>
                                                         </template>
                                                         <template
-                                                                v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                                v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">
                                                                     {{pros.product.promotions.name}}</p>
@@ -780,7 +780,7 @@
                                                                     {{pros.product.promotions.name}}</p>
                                                             </div>
                                                             <div class=" price_grade"><span class="bold">￥</span><i
-                                                                    :class="'icon mIcon i'+pros.product.price1Grade"></i>
+                                                                    :class="'icon mIcon i'+pros.product.priceGrade"></i>
                                                             </div>
                                                         </template>
                                                     </template>
@@ -802,7 +802,7 @@
                                                             {{pros.product.promotions.name}}</p>
                                                     </div>
                                                     <div class=" price_grade"><span class="bold">￥</span><i
-                                                            :class="'icon mIcon i'+pros.product.price1Grade"></i></div>
+                                                            :class="'icon mIcon i'+pros.product.priceGrade"></i></div>
                                                 </template>
                                                 <template v-else>
                                                     <em class="price_grade sec">￥登录可见</em>

src/main/resources/templates/supplier-center/shop/release.html

@@ -267,11 +267,11 @@
                             <div class="release-from clear">
                                 <div class="release-label"><span class="star">*</span>售价:</div>
                                 <div class="release-input">
-                                    <input class="input price" v-model="releaseParams.price" maxlength="40" type="number" placeholder="请输入商品售价" @input="input_price1">
+                                    <input class="input price" v-model="releaseParams.price" maxlength="40" type="number" placeholder="请输入商品售价" @input="input_price">
                                     <span class="unit">{{releaseParams.unit}}</span>
                                     <span class="yang">￥</span>
                                 </div>
-                                <div class="release-tips" v-show="vShow_Price1">{{fromMessage}}</div>
+                                <div class="release-tips" v-show="vShow_price">{{fromMessage}}</div>
                             </div>
                             <div class="release-from clear">
                                 <div class="release-label"><span class="star">*</span>售价是否含税:</div>
@@ -307,7 +307,7 @@
                                     <span class="tax">税率：<span class="mg">{{releaseParams.taxPoint}}%</span></span>
                                     <a href="javascript: void(0);" class="edit-btn" @click="taxPonitEdit">修改</a>
                                 </div>
-                                <div class="release-tips" v-show="vShow_Price1">{{fromMessage}}</div>
+                                <div class="release-tips" v-show="vShow_price">{{fromMessage}}</div>
                             </div>
                             <div class="popup" v-show="isTaxPonitEditPopup" :class="isTaxPonitEditPopup?'active':''">
                                 <div class="popup-layer edit">