商品模块化 联调

src/main/resources/config/dev/application-dev.yml

@@ -53,10 +53,10 @@ logging:
 # 服务域名
 caimei:
   siteEnv: 0 #网站环境，（2：正式环境，1：测试环境，0：开发环境）
-  spiServer: https://spi-b.caimei365.com
-#  spiServer: http://192.168.2.68:8008
-  coreServer: https://core-b.caimei365.com
-#  coreServer: http://192.168.2.68:18002
+#  spiServer: https://spi-b.caimei365.com
+  spiServer: http://192.168.2.75:8008
+#  coreServer: https://core-b.caimei365.com
+  coreServer: http://192.168.2.75:18002
   imageDomain: https://img-b.caimei365.com
   wwwDomain: https://www-b.caimei365.com
 

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

@@ -33,7 +33,7 @@
     .swiper-container a{margin-right: 16px;}
     .swiper-container .section_page_main{height: auto;}
     .hotList .section_page_main a>a{display: block;}
-    .hotList .section_page_main .productItem img{width: 100%;height: 164px;}
+    .hotList .section_page_main .productItem img{width: 100%;height: 164px;display: block;}
     .productItem .name {margin-top: 8px;display: block;padding: 0 8px;height: 40px;line-height: 21px;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical}
     .productItem .price{border: 0;box-sizing: border-box;padding: 0 8px;height: 54px;width: 100%;}
     .productItem .price .price_text_tag{width: 100%;height: 22px;box-sizing: border-box;float: left;margin-top: 3px;}

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

@@ -618,20 +618,20 @@ function setSearchProductList(list, userId, callback) {//处理搜索
     var resultData = [];
     list.map(function (item) {
         resultData.push({
-            id: item.p_id,
-            name: item.p_name,
-            image: item.p_image,
-            unit: item.p_unit,
-            brand: item.p_brand_name,
-            priceFlag: item.p_price_flag,
-            priceGrade: item.p_price_grade,
+            productId: item.productId,
+            name: item.name,
+            image: item.image,
+            unit: item.unit,
+            brandName: item.brandName,
+            priceFlag: item.priceFlag,
+            priceGrade: item.priceGrade,
             actStatus: 0,
             priceLoaded: false,
-            beautyActFlag:item.p_act_flag
+            beautyActFlag:item.beautyActFlag
         });
         // 0公开价格 1不公开价格 2仅对会员机构公开
-        if (item.p_price_flag !== 1) {
-            productIdArr.push(item.p_id)
+        if (item.priceFlag !== 1) {
+            productIdArr.push(item.productId)
         }
     });
     if (userId && userId > 0) {
@@ -642,7 +642,7 @@ function setSearchProductList(list, userId, callback) {//处理搜索
     return resultData;
 }
 function setProductPrice(productList, productIds, userId, callback){
-    $.getJSON(spiServer+"/product/listPrice",{
+    $.getJSON(coreServer+"/commodity/price/list",{
         userId: userId,
         productIds: productIds
     }).done(function (r) {
@@ -650,8 +650,8 @@ function setProductPrice(productList, productIds, userId, callback){
             var priceList = r.data;
             productList.map(function(product){
                 priceList.map(function(item){
-                    if(product.id*1 === item.productId){
-                        product.supplierId = item.supplierId;
+                    if(product.productId*1 === item.productId){
+                        product.shopId = item.shopId;
                         product.userIdentity = item.userIdentity;
                         product.price = item.price;
                         product.priceLoaded = true;

src/main/resources/static/js/common/serviceapi/product.service.js

@@ -17,7 +17,7 @@ var ProductApi = {
             });
         },
         GethomeData:function (params, callback) {//产品仪器楼层
-             Http.AjaxService({ url:'/home/instrumentData', type:'get', data:params, json:true})
+             Http.AjaxService({ url:'/commodity/classify/product', type:'get', data:params, json:true, isHost:true})
             .then(function(res){
                 callback(res);
             });
@@ -39,5 +39,12 @@ var ProductApi = {
             .then(function(res){
                 callback(res);
             });
-        }
+        },
+        GetProductSearchList:function (params, callback) {//产品仪器商品列表查询
+            Http.AjaxService({ url:'/commodity/search/query/product', type:'get', data:params, json:true, isHost:true})
+                .then(function(res){
+                    callback(res);
+                });
+        },
+
 };

src/main/resources/static/js/common/serviceapi/supplier.service.js

@@ -175,24 +175,6 @@ var SupplierApi = {
                     callback(res);
                 });
         },
-        GetMyOperationList : function(params,callback) {//查询机构运营人员管理列表
-            Http.AjaxService({ url:'/operation/list', type:'get', data:params, json:true})
-            .then(function(res){
-                callback(res);
-            });
-        },
-         DeleteMyOperation : function(params,callback) {//删除单个运营人员
-            Http.AjaxService({ url:'/operation/delete', type:'POST', data:params, json:false})
-            .then(function(res){
-                callback(res);
-            });
-        },
-         UpdateInvitationCode : function(params,callback) {//机构更新运营人员邀请码
-            Http.AjaxService({ url:'/operation/updateInvitationCode', type:'POST', data:params, json:false})
-            .then(function(res){
-                callback(res);
-            });
-        },
         dressUpList : function(params,callback) {//装扮主页列表
             Http.AjaxService({ url:'/supplier/dressUp', type:'get', data:params, json:true})
             .then(function(res){

src/main/resources/static/js/common/serviceapi/user.service.js

@@ -85,25 +85,25 @@ var UserApi = {
             });
         },
         GetMyOperationList : function(params,callback) {//查询机构运营人员管理列表
-            Http.AjaxService({ url:'/operation/list', type:'get', data:params, json:true})
+            Http.AjaxService({ url:'/user/operation/list', type:'get', data:params, json:true, isHost:true})
             .then(function(res){
                 callback(res);
             });
         },
         DeleteMyOperation : function(params,callback) {//删除单个运营人员
-            Http.AjaxService({ url:'/operation/delete', type:'POST', data:params, json:false})
+            Http.AjaxService({ url:'/user/operation/delete', type:'POST', data:params, json:false, isHost:true})
             .then(function(res){
                 callback(res);
             });
         },
         UpdateInvitationCode : function(params,callback) {//机构更新运营人员邀请码
-            Http.AjaxService({ url:'/operation/updateInvitationCode', type:'POST', data:params, json:false})
+            Http.AjaxService({ url:'/user/operation/code/update', type:'POST', data:params, json:false, isHost:true})
             .then(function(res){
                 callback(res);
             });
         },
-        AddOperationUse : function(params,callback) {//机构更新运营人员邀请码
-            Http.AjaxService({ url:'/operation/add', type:'POST', data:params, json:false})
+        AddOperationUse : function(params,callback) {//添加运营人员
+            Http.AjaxService({ url:'/user/operation/save', type:'POST', data:params, json:false, isHost:true})
             .then(function(res){
                 callback(res);
             });

src/main/resources/static/js/common/serviceapi/utils.service.js

@@ -8,7 +8,7 @@ var PublicApi = {
             Http.uploadImage({ url:'/formData/MultiPictareaddData',data:params},callback)
         },
         GetHomeData:function(params,callback){ //首页数据
-            Http.AjaxService({ url:'/home/data', type:'get', data:params, json:false})
+            Http.AjaxService({ url:'/commodity/home/floor', type:'get', data:params, json:false, isHost:true})
                 .then(function(res){
                     callback(res)
                 });
@@ -26,7 +26,7 @@ var PublicApi = {
                 });
         },
         GetProductClassify:function(params,callback){ //获取一级分类
-            Http.AjaxService({ url:'/product/classify', type:'get', data:params, json:false})
+            Http.AjaxService({ url:'/commodity/classify', type:'get', data:params, json:false, isHost:true})
                 .then(function(res){
                     callback(res)
                 });

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

@@ -58,9 +58,10 @@
             var _self = this;
             ProductApi.GethomeData(_self.params,function (res) {
                  if (res.code == 0 ) {
-                     _self.hotlist = res.data.hotSearchList;
-                     _self.floorList = res.data.floorList;
-                     _self.typeSort = res.data.page.typeSort;
+                     var data = res.data;
+                     _self.hotlist = data.hotSearchList;
+                     _self.floorList = data.floorList;
+                     _self.typeSort = data.typeSort;
                      _self.listLoading =false;
                      _self.floorList.forEach(function(page){
                          if(page.floorContent) {

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

@@ -71,16 +71,17 @@ var productList = new Vue({
         },
         getListByKeyword: function () {
             var _self = this;
-            $.getJSON(spiServer+"/search/query/product", {
+            ProductApi.GetProductSearchList({
                 keyword: this.params.keyword,
                 identity: GLOBAL_USER_IDENTITY,
                 pageSize: this.params.size,
                 pageNum: this.params.num,
                 sortField: this.params.sortField,
                 sortType: this.params.sortType
-            }, function (r) {
-                if (r.code === 0 && r.data) {
-                    var result = JSON.parse(r.data);
+            },function (res) {
+                console.log(res);
+                if (res.code === 0 && res.data ) {
+                    var result = JSON.parse(res.data);
                     _self.listRecord = result.total;
                     var resultData = setSearchProductList(result.items, _self.userId, function(){
                         _self.$forceUpdate();
@@ -95,44 +96,10 @@ var productList = new Vue({
                         _self.listData = _self.listData.concat(resultData);
                     }
                     console.log(_self.listData)
-                }
-                _self.listLoading = false;
-                _self.requestFlag = true;
-            })
-        },
-        getCategorys: function () {
-            var _self = this;
-            $.getJSON(spiServer+"/product/classify").done(function (r) {
-                if (r.code === 0 && r.data) {
-                    _self.classify = r.data;
-                    if(isPC){
-                        setTimeout(function(){
-                            $('#listClassify').slide({
-                                mainCell:".clsCon"
-                                ,titCell:".clsTab a"
-                                ,trigger: "mouseover"
-                            });
-                        },500);
-                        r.data.map(function(big){
-                            if (_self.params.bid == big.bigTypeID){
-                                _self.bigType = big.name;
-                                if (_self.params.sid && _self.params.sid>0) {
-                                    big.smalltypeList.map(function(small){
-                                        if (_self.params.sid==small.smallTypeID){
-                                            _self.smallType = small.name;
-                                            if (_self.params.tid && _self.params.tid>0) {
-                                                small.tinytypeList.map(function(tiny){
-                                                    if (_self.params.tid==tiny.tinyTypeID){
-                                                        _self.tinyType = tiny.name;
-                                                    }
-                                                })
-                                            }
-                                        }
-                                    })
-                                }
-                            }
-                        })
-                    }
+                    _self.listLoading = false;
+                    _self.requestFlag = true;
+                }else {
+                    CAIMEI.Alert(res.msg, '确定');
                 }
             });
         },
@@ -219,8 +186,6 @@ var productList = new Vue({
                     window.location.href = "/";
                 });
             }
-            // 获取分类
-            this.getCategorys();
         }
     },
     mounted: function () {

src/main/resources/static/js/supplier-center/operation/form.js

@@ -7,8 +7,8 @@ var operationPage = new Vue({
         addForm: {
             mobile: '',
             linkName: '',
-            userID: '',
-            clubID: '',
+            userId: '',
+            shopId: '',
             configFlag: 2
         },
         rule: {
@@ -45,8 +45,8 @@ var operationPage = new Vue({
     },
     mounted: function () {
         if(globalUserData){
-            this.addForm.userID = globalUserData.userId;
-            this.addForm.clubID = globalUserData.clubId;
+            this.addForm.userId = globalUserData.userId;
+            this.addForm.shopId = globalUserData.shopId;
         }
         $('.navLayout').find('.navList').removeClass("on").find('.con').hide().find('a').removeClass("on");
         $('.navLayout').find('.navList').eq(1).addClass("on").find('.con').show().find('a').eq(1).addClass("on");

src/main/resources/static/js/supplier-center/operation/list.js

@@ -12,7 +12,7 @@ var operationPage = new Vue({
             {value:4,name:'已取消'}
         ],
         listQuery:{
-            userID:0,
+            userId:0,
             linkName : '',
             mobile : '',
             pageNum:1,
@@ -92,7 +92,7 @@ var operationPage = new Vue({
         },
         GetQueryListData:function(){//查询运营人员列表
             var _self = this;
-            SupplierApi.GetMyOperationList(_self.listQuery,function (response) {
+            UserApi.GetMyOperationList(_self.listQuery,function (response) {
                 if(response.code == 0){
                     var data = response.data;
                     if(data.results && data.results.length>0) {
@@ -116,7 +116,7 @@ var operationPage = new Vue({
         UpdataOperationFn:function(data){//更新邀请码
             var _self = this;
             CAIMEI.Modal('确定更新邀请码吗？更新后将会短信通知该运营人员','取消','确定',function () {
-                SupplierApi.UpdateInvitationCode({id:data.id},function (response) {
+                UserApi.UpdateInvitationCode({id:data.id},function (response) {
                     if(response.code == 0 ){ //删除成功
                         CAIMEI.dialog(response.msg,true,function () {
                             _self.GetQueryListData();
@@ -130,7 +130,7 @@ var operationPage = new Vue({
         DeleteOperationFn:function(data){//删除运营人员
             var _self = this;
             CAIMEI.Modal('确定删除运营人员吗？','取消','确定',function () {
-                SupplierApi.DeleteMyOperation({id:data.id},function (response) {
+                UserApi.DeleteMyOperation({id:data.id},function (response) {
                     if(response.code == 0 ){ //删除成功
                         CAIMEI.dialog('删除成功',true,function () {
                             _self.GetQueryListData();
@@ -171,7 +171,7 @@ var operationPage = new Vue({
     },
     mounted: function () {
         if(globalUserData){
-            this.listQuery.userID = globalUserData.userId;
+            this.listQuery.userId = globalUserData.userId;
             this.listQuery.orderState = CAIMEI.getUrlParam('state');
             this.GetQueryListData();
         }

src/main/resources/static/js/user-center/operation/form.js

@@ -7,8 +7,8 @@ var operationPage = new Vue({
         addForm: {
             mobile: '',
             linkName: '',
-            userID: '',
-            clubID: '',
+            userId: '',
+            clubId: '',
             configFlag: 2
         },
         rule: {
@@ -27,12 +27,14 @@ var operationPage = new Vue({
             if (!pass) {return false;}
             _self.loginLoading = true;
             UserApi.AddOperationUse(_self.addForm,function (response) {
+                console.log(response);
                 if(response.code == 0 ){ //删除成功
                     CAIMEI.dialog('添加成功',true,function () {
                         window.location.href='/user/operation/list.html';
                         _self.loginLoading = false;
                     });
                 }else{
+                    console.log('222222222222222');
                     CAIMEI.Alert(response.msg,'确定',false);
                     _self.loginLoading = false;
                 }
@@ -45,8 +47,8 @@ var operationPage = new Vue({
     },
     mounted: function () {
         if(globalUserData){
-            this.addForm.userID = globalUserData.userId;
-            this.addForm.clubID = globalUserData.clubId;
+            this.addForm.userId = globalUserData.userId;
+            this.addForm.clubId = globalUserData.clubId;
         }
         $('.navLayout').find('.navList').removeClass("on").find('.con').hide().find('a').removeClass("on");
         $('.navLayout').find('.navList').eq(1).addClass("on").find('.con').show().find('a').eq(1).addClass("on");

src/main/resources/static/js/user-center/operation/list.js

@@ -13,7 +13,7 @@ var operationPage = new Vue({
             {value:4,name:'已取消'}
         ],
         listQuery:{
-            userID:0,
+            userId:0,
             linkName : '',
             mobile : '',
             pageNum:1,
@@ -173,7 +173,7 @@ var operationPage = new Vue({
         if(globalUserData){
             this.userId = globalUserData.userId;
             this.listQuery.orderState = CAIMEI.getUrlParam('state');
-            this.listQuery.userID = this.userId;
+            this.listQuery.userId = this.userId;
             this.GetQueryListData();
         }
         console.log(this.listQuery.orderState)

src/main/resources/templates/components/header.html

@@ -150,7 +150,7 @@
                         </div>
                         <div class="tabItem_right">
                             <div class="tabItem_right_content" v-for="(nav,i) in big.list" :class="{'on':i==0}">
-                                <div class="line"  v-if="nav.smalltypeList!==null&&nav.smalltypeList!==''" v-for="small in nav.smalltypeList">
+                                <div class="line"  v-if="nav.smallTypeList!==null&&nav.smallTypeList!==''" v-for="small in nav.smallTypeList">
                                     <div class="lft show">
                                         <a :href="'/product/instruelist.html?bigTypeID='+nav.bigTypeID+'&smallTypeID='+small.smallTypeID+'&typeSort='+nav.typeSort+''" target="_blank">
                                             <span v-if="isPC"> > </span>
@@ -158,13 +158,13 @@
                                         </a>
                                     </div>
                                     <div class="rgt mfw" >
-                                        <template v-if="small.tinytypeList!='' && small.tinytypeList!=null"  v-for="tiny in small.tinytypeList">
+                                        <template v-if="small.tinyTypeList!='' && small.tinyTypeList!=null"  v-for="tiny in small.tinyTypeList">
                                             <a class="3" :href="'/product/instruelist.html?bigTypeID='+nav.bigTypeID+'&smallTypeID='+small.smallTypeID+'&tinyTypeID='+tiny.tinyTypeID+'&typeSort='+nav.typeSort+''" target="_blank">
                                                 <img v-if="!isPC" :src="tiny.crmIcon" alt="tiny.name">
                                                 <span v-text="tiny.name"></span>
                                             </a>
                                         </template>
-                                        <template v-if="!small.tinytypeList">
+                                        <template v-if="!small.tinyTypeList">
                                             <a class="none" :href="'/product/instruelist.html?bigTypeID='+nav.bigTypeID+'&smallTypeID='+small.smallTypeID+'&typeSort='+nav.typeSort+''" target="_blank">
                                                 <img v-if="!isPC" :src="small.crmIcon" alt="全部商品">
                                                 <p>全部商品</p>
@@ -172,7 +172,7 @@
                                         </template>
                                     </div>
                                 </div>
-                                <template v-if="!nav.smalltypeList">
+                                <template v-if="!nav.smallTypeList">
                                     <div class="line">
                                         <div class="lft none">
                                             <a :href="'/product/instruelist.html?bigTypeID='+nav.bigTypeID+'&typeSort='+nav.typeSort+''" target="_blank">

src/main/resources/templates/index.html

@@ -119,7 +119,7 @@
                                             <!--正常商品, 二手商品-->
                                             <!--用户身份 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="main_price_text">
                                                         <div class="price_text_tag">
@@ -130,21 +130,21 @@
                                                 </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)">
+                                                    <template 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="main_price_text" v-if="pros.product.productCategory == 1">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">
                                                                     {{pros.product.promotions.name}}
-                                                                    <span v-if="pros.priceFlag != 1">:￥{{pros.product.retailPrice | NumFormat}}</span>
+                                                                    <span v-if="pros.priceFlag != 1">:￥{{pros.product.price | NumFormat}}</span>
                                                                 </p>
                                                             </div>
                                                             <div class="main_price_show" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
-                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
+                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice : pros.product.price ) | NumFormat  }}
                                                             </div>
                                                         </div>
                                                     </template>
                                                     <!--仅会员机构可见-->
-                                                    <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                    <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
                                                         <div class="main_price_text">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
@@ -157,7 +157,7 @@
                                                             <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
                                                         <div class="main_price_none">
-                                                            <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
+                                                            <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.priceGrade"></i></em>
                                                             <p class="listTag" v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
                                                     </template>
@@ -170,7 +170,7 @@
                                                 </div>
                                                 <div class="main_price_text" v-else>
                                                     <div class="price_text_tag"></div>
-                                                    <div class="main_price_show">￥{{ pros.product.retailPrice | NumFormat  }}</div>
+                                                    <div class="main_price_show">￥{{ pros.product.price | NumFormat  }}</div>
                                                 </div>
                                             </template>
                                         </template>
@@ -180,7 +180,7 @@
                                                     <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                                 <div class="main_price_none">
-                                                    <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
+                                                    <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.priceGrade"></i></em>
                                                     <p class="listTag " v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                             </template>
@@ -220,7 +220,7 @@
                                             <!--正常商品, 二手商品-->
                                             <!--用户身份 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="main_price_text">
                                                         <div class="price_text_tag">
@@ -231,21 +231,21 @@
                                                 </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)">
+                                                    <template 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="main_price_text" v-if="pros.product.productCategory == 1">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">
                                                                     {{pros.product.promotions.name}}
-                                                                    <span v-if="pros.priceFlag != 1">:￥{{pros.product.retailPrice | NumFormat}}</span>
+                                                                    <span v-if="pros.priceFlag != 1">:￥{{pros.product.price | NumFormat}}</span>
                                                                 </p>
                                                             </div>
                                                             <div class="main_price_show" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
-                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
+                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice : pros.product.price ) | NumFormat  }}
                                                             </div>
                                                         </div>
                                                     </template>
                                                     <!--仅会员机构可见-->
-                                                    <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                    <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
                                                         <div class="main_price_text">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
@@ -258,7 +258,7 @@
                                                             <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
                                                         <div class="main_price_none">
-                                                            <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
+                                                            <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.priceGrade"></i></em>
                                                             <p class="listTag" v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
                                                     </template>
@@ -271,7 +271,7 @@
                                                 </div>
                                                 <div class="main_price_text" v-else>
                                                     <div class="price_text_tag"></div>
-                                                    <div class="main_price_show">￥{{ pros.product.retailPrice | NumFormat  }}</div>
+                                                    <div class="main_price_show">￥{{ pros.product.price | NumFormat  }}</div>
                                                 </div>
                                             </template>
                                         </template>
@@ -281,7 +281,7 @@
                                                     <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                                 <div class="main_price_none">
-                                                    <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
+                                                    <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.priceGrade"></i></em>
                                                     <p class="listTag " v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                             </template>
@@ -321,7 +321,7 @@
                                             <!--正常商品, 二手商品-->
                                             <!--用户身份 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="main_price_text">
                                                         <div class="price_text_tag">
@@ -332,21 +332,21 @@
                                                 </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)">
+                                                    <template 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="main_price_text" v-if="pros.product.productCategory == 1">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">
                                                                     {{pros.product.promotions.name}}
-                                                                    <span v-if="pros.priceFlag != 1">:￥{{pros.product.retailPrice | NumFormat}}</span>
+                                                                    <span v-if="pros.priceFlag != 1">:￥{{pros.product.price | NumFormat}}</span>
                                                                 </p>
                                                             </div>
                                                             <div class="main_price_show" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
-                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
+                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice : pros.product.price ) | NumFormat  }}
                                                             </div>
                                                         </div>
                                                     </template>
                                                     <!--仅会员机构可见-->
-                                                    <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                    <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
                                                         <div class="main_price_text">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
@@ -359,7 +359,7 @@
                                                             <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
                                                         <div class="main_price_none">
-                                                            <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
+                                                            <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.priceGrade"></i></em>
                                                             <p class="listTag " v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
                                                     </template>
@@ -372,7 +372,7 @@
                                                 </div>
                                                 <div class="main_price_text" v-else>
                                                     <div class="price_text_tag"></div>
-                                                    <div class="main_price_show">￥{{ pros.product.retailPrice | NumFormat  }}</div>
+                                                    <div class="main_price_show">￥{{ pros.product.price | NumFormat  }}</div>
                                                 </div>
                                             </template>
                                         </template>
@@ -382,7 +382,7 @@
                                                     <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                                 <div class="main_price_none">
-                                                    <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
+                                                    <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.priceGrade"></i></em>
                                                     <p class="listTag " v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                             </template>
@@ -428,7 +428,7 @@
                                             <!--正常商品, 二手商品-->
                                             <!--用户身份 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="main_price_text">
                                                         <div class="price_text_tag">
@@ -439,21 +439,21 @@
                                                 </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)">
+                                                    <template 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="main_price_text" v-if="pros.product.productCategory == 1">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">
                                                                     {{pros.product.promotions.name}}
-                                                                    <span v-if="pros.priceFlag != 1">:￥{{pros.product.retailPrice | NumFormat}}</span>
+                                                                    <span v-if="pros.priceFlag != 1">:￥{{pros.product.price | NumFormat}}</span>
                                                                 </p>
                                                             </div>
                                                             <div class="main_price_show" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
-                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
+                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice : pros.product.price ) | NumFormat  }}
                                                             </div>
                                                         </div>
                                                     </template>
                                                     <!--仅会员机构可见-->
-                                                    <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                    <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
                                                         <div class="main_price_text">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
@@ -466,7 +466,7 @@
                                                             <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
                                                         <div class="main_price_none">
-                                                            <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
+                                                            <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.priceGrade"></i></em>
                                                             <p class="listTag " v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
                                                     </template>
@@ -479,7 +479,7 @@
                                                 </div>
                                                 <div class="main_price_text" v-else>
                                                     <div class="price_text_tag"></div>
-                                                    <div class="main_price_show">￥{{ pros.product.retailPrice | NumFormat  }}</div>
+                                                    <div class="main_price_show">￥{{ pros.product.price | NumFormat  }}</div>
                                                 </div>
                                             </template>
                                         </template>
@@ -489,7 +489,7 @@
                                                     <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                                 <div class="main_price_none">
-                                                    <em class="price_grade "><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
+                                                    <em class="price_grade "><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.priceGrade"></i></em>
                                                     <p class="listTag " v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                             </template>
@@ -523,7 +523,7 @@
                                             <!--正常商品, 二手商品-->
                                             <!--用户身份 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="main_price_text">
                                                         <div class="price_text_tag">
@@ -534,21 +534,21 @@
                                                 </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)">
+                                                    <template 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="main_price_text" v-if="pros.product.productCategory == 1">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">
                                                                     {{pros.product.promotions.name}}
-                                                                    <span v-if="pros.priceFlag != 1">:￥{{pros.product.retailPrice | NumFormat}}</span>
+                                                                    <span v-if="pros.priceFlag != 1">:￥{{pros.product.price | NumFormat}}</span>
                                                                 </p>
                                                             </div>
                                                             <div class="main_price_show" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
-                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
+                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice : pros.product.price ) | NumFormat  }}
                                                             </div>
                                                         </div>
                                                     </template>
                                                     <!--仅会员机构可见-->
-                                                    <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                    <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
                                                         <div class="main_price_text">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
@@ -561,7 +561,7 @@
                                                             <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
                                                         <div class="main_price_none">
-                                                            <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
+                                                            <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.priceGrade"></i></em>
                                                             <p class="listTag " v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
                                                     </template>
@@ -574,7 +574,7 @@
                                                 </div>
                                                 <div class="main_price_text" v-else>
                                                     <div class="price_text_tag"></div>
-                                                    <div class="main_price_show">￥{{ pros.product.retailPrice | NumFormat  }}</div>
+                                                    <div class="main_price_show">￥{{ pros.product.price | NumFormat  }}</div>
                                                 </div>
                                             </template>
                                         </template>
@@ -584,7 +584,7 @@
                                                     <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                                 <div class="main_price_none">
-                                                    <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
+                                                    <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.priceGrade"></i></em>
                                                     <p class="listTag " v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                             </template>
@@ -612,7 +612,7 @@
                                             <!--正常商品, 二手商品-->
                                             <!--用户身份 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="main_price_text">
                                                         <div class="price_text_tag">
@@ -623,21 +623,21 @@
                                                 </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)">
+                                                    <template 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="main_price_text" v-if="pros.product.productCategory == 1">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">
                                                                     {{pros.product.promotions.name}}
-                                                                    <span v-if="pros.priceFlag != 1">:￥{{pros.product.retailPrice | NumFormat}}</span>
+                                                                    <span v-if="pros.priceFlag != 1">:￥{{pros.product.price | NumFormat}}</span>
                                                                 </p>
                                                             </div>
                                                             <div class="main_price_show" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
-                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
+                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice : pros.product.price ) | NumFormat  }}
                                                             </div>
                                                         </div>
                                                     </template>
                                                     <!--仅会员机构可见-->
-                                                    <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                    <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
                                                         <div class="main_price_text">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
@@ -650,7 +650,7 @@
                                                             <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
                                                         <div class="main_price_none">
-                                                            <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
+                                                            <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.priceGrade"></i></em>
                                                             <p class="listTag " v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
                                                     </template>
@@ -663,7 +663,7 @@
                                                 </div>
                                                 <div class="main_price_text" v-else>
                                                     <div class="price_text_tag"></div>
-                                                    <div class="main_price_show">￥{{ pros.product.retailPrice | NumFormat  }}</div>
+                                                    <div class="main_price_show">￥{{ pros.product.price | NumFormat  }}</div>
                                                 </div>
                                             </template>
                                         </template>
@@ -673,7 +673,7 @@
                                                     <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                                 <div class="main_price_none">
-                                                    <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
+                                                    <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.priceGrade"></i></em>
                                                     <p class="listTag " v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                             </template>
@@ -704,7 +704,7 @@
                                             <!--正常商品, 二手商品-->
                                             <!--用户身份 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="main_price_text">
                                                         <div class="price_text_tag">
@@ -715,21 +715,21 @@
                                                 </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)">
+                                                    <template 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="main_price_text" v-if="pros.product.productCategory == 1">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">
                                                                     {{pros.product.promotions.name}}
-                                                                    <span v-if="pros.priceFlag != 1">:￥{{pros.product.retailPrice | NumFormat}}</span>
+                                                                    <span v-if="pros.priceFlag != 1">:￥{{pros.product.price | NumFormat}}</span>
                                                                 </p>
                                                             </div>
                                                             <div class="main_price_show" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
-                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
+                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice : pros.product.price ) | NumFormat  }}
                                                             </div>
                                                         </div>
                                                     </template>
                                                     <!--仅会员机构可见-->
-                                                    <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                    <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
                                                         <div class="main_price_text">
                                                             <div class="price_text_tag">
                                                                 <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
@@ -742,7 +742,7 @@
                                                             <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
                                                         <div class="main_price_none">
-                                                            <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
+                                                            <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.priceGrade"></i></em>
                                                             <p class="listTag " v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
                                                     </template>
@@ -755,7 +755,7 @@
                                                 </div>
                                                 <div class="main_price_text" v-else>
                                                     <div class="price_text_tag"></div>
-                                                    <div class="main_price_show">￥{{ pros.product.retailPrice | NumFormat  }}</div>
+                                                    <div class="main_price_show">￥{{ pros.product.price | NumFormat  }}</div>
                                                 </div>
                                             </template>
                                         </template>
@@ -765,7 +765,7 @@
                                                     <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                                 <div class="main_price_none">
-                                                    <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
+                                                    <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.priceGrade"></i></em>
                                                     <p class="listTag " v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                 </div>
                                             </template>
@@ -792,7 +792,7 @@
                                                     <!--正常商品, 二手商品-->
                                                     <!--用户身份 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="main_price_text">
                                                                 <div class="price_text_tag">
@@ -803,21 +803,21 @@
                                                         </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)">
+                                                            <template 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="main_price_text" v-if="pros.product.productCategory == 1">
                                                                     <div class="price_text_tag">
                                                                         <p class="listTag" v-if="pros.product.actStatus==1">
                                                                             {{pros.product.promotions.name}}
-                                                                            <span v-if="pros.priceFlag != 1">:￥{{pros.product.retailPrice | NumFormat}}</span>
+                                                                            <span v-if="pros.priceFlag != 1">:￥{{pros.product.price | NumFormat}}</span>
                                                                         </p>
                                                                     </div>
                                                                     <div class="main_price_show" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
-                                                                        ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
+                                                                        ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice : pros.product.price ) | NumFormat  }}
                                                                     </div>
                                                                 </div>
                                                             </template>
                                                             <!--仅会员机构可见-->
-                                                            <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                            <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
                                                                 <div class="main_price_text">
                                                                     <div class="price_text_tag">
                                                                         <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
@@ -830,7 +830,7 @@
                                                                     <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                                 </div>
                                                                 <div class="main_price_none">
-                                                                    <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
+                                                                    <em class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.priceGrade"></i></em>
                                                                     <p class="listTag " v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                                 </div>
                                                             </template>
@@ -843,7 +843,7 @@
                                                         </div>
                                                         <div class="main_price_text" v-else>
                                                             <div class="price_text_tag"></div>
-                                                            <div class="main_price_show">￥{{ pros.product.retailPrice | NumFormat  }}</div>
+                                                            <div class="main_price_show">￥{{ pros.product.price | NumFormat  }}</div>
                                                         </div>
                                                     </template>
                                                 </template>
@@ -853,7 +853,7 @@
                                                             <p class="listTag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
                                                         <div class="main_price_none">
-                                                            <em class="price_grade right-box"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.price1Grade"></i></em>
+                                                            <em class="price_grade right-box"><span class="bold">￥</span><i :class="'icon mIcon price_grade_'+pros.product.priceGrade"></i></em>
                                                             <p class="listTag" v-if="pros.actStatus==1">{{pros.product.promotions.name}}</p>
                                                         </div>
                                                     </template>

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

@@ -61,25 +61,25 @@
                                                 <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>
                                                             </div>
                                                             <div class="main_price_unde">￥价格未公开</div>
                                                         </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)">
+                                                            <template 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}}
-                                                                        <span v-if="pros.priceFlag != 1">:￥{{pros.product.retailPrice | NumFormat}}</span>
+                                                                        <span v-if="pros.priceFlag != 1">:￥{{pros.product.price | NumFormat}}</span>
                                                                     </p>
                                                                 </div>
                                                                 <div class="main_price_show" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
-                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
+                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice : pros.product.price ) | NumFormat  }}
                                                             </div>
                                                             </template>
-                                                            <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                            <template 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>
                                                                 </div>
@@ -89,14 +89,14 @@
                                                                 <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>
+                                                                <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.priceGrade"></i></div>
                                                             </template>
                                                         </template>
                                                     </template>
                                                     <template v-else>
                                                           <div class="price_text_tag"></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>
+                                                          <div class="main_price_show" v-else>￥{{ pros.product.price | NumFormat  }}</div>
                                                     </template>
                                                 </template>
                                                 <template v-else>
@@ -104,7 +104,7 @@
                                                         <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>
+                                                        <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.priceGrade"></i></div>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade sec">￥登录可见</em>
@@ -133,25 +133,25 @@
                                                 <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>
                                                             </div>
                                                             <div class="main_price_unde">￥价格未公开</div>
                                                         </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)">
+                                                            <template 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}}
-                                                                        <span v-if="pros.priceFlag != 1">:￥{{pros.product.retailPrice | NumFormat}}</span>
+                                                                        <span v-if="pros.priceFlag != 1">:￥{{pros.product.price | NumFormat}}</span>
                                                                     </p>
                                                                 </div>
                                                                 <div class="main_price_show" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
-                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
+                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice : pros.product.price ) | NumFormat  }}
                                                             </div>
                                                             </template>
-                                                            <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                            <template 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>
                                                                 </div>
@@ -161,14 +161,14 @@
                                                                 <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>
+                                                                <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.priceGrade"></i></div>
                                                             </template>
                                                         </template>
                                                     </template>
                                                     <template v-else>
                                                           <div class="price_text_tag"></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>
+                                                          <div class="main_price_show"  v-else>￥{{ pros.product.price | NumFormat  }}</div>
                                                     </template>
                                                 </template>
                                                 <template v-else>
@@ -176,7 +176,7 @@
                                                         <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>
+                                                        <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.priceGrade"></i></div>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade sec">￥登录可见</em>
@@ -205,25 +205,25 @@
                                                 <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>
                                                             </div>
                                                             <div class="main_price_unde">￥价格未公开</div>
                                                         </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)">
+                                                            <template 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}}
-                                                                        <span v-if="pros.priceFlag != 1">:￥{{pros.product.retailPrice | NumFormat}}</span>
+                                                                        <span v-if="pros.priceFlag != 1">:￥{{pros.product.price | NumFormat}}</span>
                                                                     </p>
                                                                 </div>
                                                                 <div class="main_price_show" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
-                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
+                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice : pros.product.price ) | NumFormat  }}
                                                             </div>
                                                             </template>
-                                                            <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                            <template 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>
                                                                 </div>
@@ -233,14 +233,14 @@
                                                                 <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>
+                                                              <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.priceGrade"></i></div>
                                                             </template>
                                                         </template>
                                                     </template>
                                                     <template v-else>
                                                           <div class="price_text_tag"></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>
+                                                          <div class="main_price_show" v-else>￥{{ pros.product.price | NumFormat  }}</div>
                                                     </template>
                                                 </template>
                                                 <template v-else>
@@ -248,7 +248,7 @@
                                                         <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>
+                                                       <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.priceGrade"></i></div>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade sec">￥登录可见</em>
@@ -282,25 +282,25 @@
                                                 <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>
                                                             </div>
                                                             <div class="main_price_unde">￥价格未公开</div>
                                                         </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)">
+                                                            <template 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}}
-                                                                        <span v-if="pros.priceFlag != 1">:￥{{pros.product.retailPrice | NumFormat}}</span>
+                                                                        <span v-if="pros.priceFlag != 1">:￥{{pros.product.price | NumFormat}}</span>
                                                                     </p>
                                                                 </div>
                                                                 <div class="main_price_show" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
-                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
+                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice : pros.product.price ) | NumFormat  }}
                                                             </div>
                                                             </template>
-                                                            <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                            <template 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>
                                                                 </div>
@@ -310,14 +310,14 @@
                                                                 <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>
+                                                                <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.priceGrade"></i></div>
                                                             </template>
                                                         </template>
                                                     </template>
                                                     <template v-else>
                                                           <div class="price_text_tag"></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>
+                                                          <div class="main_price_show" v-else>￥{{ pros.product.price | NumFormat  }}</div>
                                                     </template>
                                                 </template>
                                                 <template v-else>
@@ -325,7 +325,7 @@
                                                         <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>
+                                                        <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.priceGrade"></i></div>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade sec">￥登录可见</em>
@@ -352,25 +352,25 @@
                                                 <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>
                                                             </div>
                                                             <div class="main_price_unde">￥价格未公开</div>
                                                         </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)">
+                                                            <template 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}}
-                                                                        <span v-if="pros.priceFlag != 1">:￥{{pros.product.retailPrice | NumFormat}}</span>
+                                                                        <span v-if="pros.priceFlag != 1">:￥{{pros.product.price | NumFormat}}</span>
                                                                     </p>
                                                                 </div>
                                                                 <div class="main_price_show" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
-                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
+                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice : pros.product.price ) | NumFormat  }}
                                                             </div>
                                                             </template>
-                                                            <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                            <template 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>
                                                                 </div>
@@ -380,14 +380,14 @@
                                                                 <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>
+                                                                <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.priceGrade"></i></div>
                                                             </template>
                                                         </template>
                                                     </template>
                                                     <template v-else>
                                                           <div class="price_text_tag"></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>
+                                                          <div class="main_price_show" v-else>￥{{ pros.product.price | NumFormat  }}</div>
                                                     </template>
                                                 </template>
                                                 <template v-else>
@@ -395,7 +395,7 @@
                                                         <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>
+                                                       <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.priceGrade"></i></div>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade sec">￥登录可见</em>
@@ -420,25 +420,25 @@
                                                 <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>
                                                             </div>
                                                             <div class="main_price_unde">￥价格未公开</div>
                                                         </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)">
+                                                            <template 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}}
-                                                                        <span v-if="pros.priceFlag != 1">:￥{{pros.product.retailPrice | NumFormat}}</span>
+                                                                        <span v-if="pros.priceFlag != 1">:￥{{pros.product.price | NumFormat}}</span>
                                                                     </p>
                                                                 </div>
                                                                 <div class="main_price_show" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
-                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
+                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice : pros.product.price ) | NumFormat  }}
                                                             </div>
                                                             </template>
-                                                            <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                            <template 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>
                                                                 </div>
@@ -448,14 +448,14 @@
                                                                 <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>
+                                                               <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.priceGrade"></i></div>
                                                             </template>
                                                         </template>
                                                     </template>
                                                     <template v-else>
                                                           <div class="price_text_tag"></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>
+                                                          <div class="main_price_show" v-else>￥{{ pros.product.price | NumFormat  }}</div>
                                                     </template>
                                                 </template>
                                                 <template v-else>
@@ -463,7 +463,7 @@
                                                         <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>
+                                                        <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.priceGrade"></i></div>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade sec">￥登录可见</em>
@@ -490,25 +490,25 @@
                                                 <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>
                                                             </div>
                                                             <div class="main_price_unde">￥价格未公开</div>
                                                         </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)">
+                                                            <template 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}}
-                                                                        <span v-if="pros.priceFlag != 1">:￥{{pros.product.retailPrice | NumFormat}}</span>
+                                                                        <span v-if="pros.priceFlag != 1">:￥{{pros.product.price | NumFormat}}</span>
                                                                     </p>
                                                                 </div>
                                                                 <div class="main_price_show" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
-                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
+                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice : pros.product.price ) | NumFormat  }}
                                                             </div>
                                                             </template>
-                                                            <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                            <template 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>
                                                                 </div>
@@ -518,14 +518,14 @@
                                                                 <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>
+                                                               <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.priceGrade"></i></div>
                                                             </template>
                                                         </template>
                                                     </template>
                                                     <template v-else>
                                                           <div class="price_text_tag"></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>
+                                                          <div class="main_price_show" v-else>￥{{ pros.product.price | NumFormat  }}</div>
                                                     </template>
                                                 </template>
                                                 <template v-else>
@@ -533,7 +533,7 @@
                                                         <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>
+                                                        <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.priceGrade"></i></div>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade sec">￥登录可见</em>
@@ -557,25 +557,25 @@
                                                 <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>
                                                             </div>
                                                             <div class="main_price_unde">￥价格未公开</div>
                                                         </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)">
+                                                            <template 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}}
-                                                                        <span v-if="pros.priceFlag != 1">:￥{{pros.product.retailPrice | NumFormat}}</span>
+                                                                        <span v-if="pros.priceFlag != 1">:￥{{pros.product.price | NumFormat}}</span>
                                                                     </p>
                                                                 </div>
                                                                 <div class="main_price_show" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
-                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.price1 : pros.product.retailPrice ) | NumFormat  }}
+                                                                ￥{{ (PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice : pros.product.price ) | NumFormat  }}
                                                             </div>
                                                             </template>
-                                                            <template v-else-if="pros.product.price1TextFlag==2 && pros.product.userIdentity==4">
+                                                            <template 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>
                                                                 </div>
@@ -585,14 +585,14 @@
                                                                 <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>
+                                                                <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.priceGrade"></i></div>
                                                             </template>
                                                         </template>
                                                     </template>
                                                     <template v-else>
                                                           <div class="price_text_tag"></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>
+                                                          <div class="main_price_show" v-else>￥{{ pros.product.price | NumFormat  }}</div>
                                                     </template>
                                                 </template>
                                                 <template v-else>
@@ -600,7 +600,7 @@
                                                         <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>
+                                                        <div class=" price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+pros.product.priceGrade"></i></div>
                                                     </template>
                                                     <template v-else>
                                                             <em class="price_grade sec">￥登录可见</em>

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

@@ -102,10 +102,10 @@
         <ul class="productList clear mfw">
             <li class="productItem mfc" v-for="p in listData">
                 <div class="item">
-                    <a class="image" :href="'/product-'+p.id+'.html'">
+                    <a class="image" :href="'/product-'+p.productId+'.html'">
                         <img src="/img/base/placeholder.png" :data-original="p.image" :alt="p.name">
                     </a>
-                    <a class="name" :href="'/product-'+p.id+'.html'">
+                    <a class="name" :href="'/product-'+p.productId+'.html'">
                          <span v-html="addhtml +p.name" v-if="p.beautyActFlag==1"></span>
                          <span v-html="p.name" v-else></span>
                     </a>
@@ -158,6 +158,7 @@
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/product.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/product/list.js(v=${version})}"></script>
 </body>
 </html>

src/main/resources/templates/supplier-center/operation/list.html

@@ -130,7 +130,7 @@
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/supplier.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/user.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/supplier-center/operation/list.js(v=${version})}"></script>
 </body>
 </html>