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

# Conflicts:
#	src/main/resources/static/js/product/instruement.js
#	src/main/resources/static/js/product/produce-list.js
#	src/main/resources/templates/supplier/list.html

src/main/java/com/caimei/www/controller/RedirectController.java

@@ -55,11 +55,11 @@ public class RedirectController {
      */
     @GetMapping("/cmpage/info-2-{id}.html")
     public String toequipment(@PathVariable("id") Integer equipmentId) {
-        return "redirect:/equipment/"+equipmentId+".html";
+        return "redirect:/equipment-"+equipmentId+".html";
     }
     @GetMapping("/equipment/detail.html")
     public String toequipment2(@RequestParam("id") Integer equipmentId) {
-        return "redirect:/equipment/"+equipmentId+".html";
+        return "redirect:/equipment-"+equipmentId+".html";
     }
     /**
      * 直播页面【旧】

src/main/java/com/caimei/www/controller/unlimited/EquipmentController.java

@@ -46,7 +46,7 @@ public class EquipmentController extends BaseController {
     /**
      * 项目仪器详情页
      */
-    @GetMapping("/equipment/{id}.html")
+    @GetMapping("/equipment-{id}.html")
     public String home(final Model model, @PathVariable("id") Integer equipmentId) {
         PageContent detail = equipmentService.getEquipmentById(equipmentId);
         if(detail== null){

src/main/java/com/caimei/www/controller/unlimited/ProductController.java

@@ -85,7 +85,9 @@ public class ProductController extends BaseController {
         if (pageId == null) {
             return super.errorPath();
         }
+        String title = singlePageService.getPageTitleById(id);
         model.addAttribute("pageId", id);
+        model.addAttribute("pageTitle", title);
         return INSTRUMENT_PAGE_PATH;
     }
 

src/main/java/com/caimei/www/mapper/SinglePageDao.java

@@ -94,6 +94,7 @@ public interface SinglePageDao {
      * 产品仪器页
      */
     Integer getInstrumentPageIdById(Integer id);
+    String getPageTitleById(Integer id);
     /**
      * 活动专题页
      */

src/main/java/com/caimei/www/service/page/SinglePageService.java

@@ -33,6 +33,7 @@ public interface SinglePageService {
      * @return
      */
     Integer getInstrumentPageIdById(Integer id);
+    String getPageTitleById(Integer id);
     /**
      * 活动专题页
      */

src/main/java/com/caimei/www/service/page/impl/BaseServiceImpl.java

@@ -5,7 +5,6 @@ import com.alibaba.fastjson.JSONObject;
 import com.caimei.www.mapper.BaseDao;
 import com.caimei.www.pojo.page.*;
 import com.caimei.www.service.page.BaseService;
-import com.caimei.www.utils.AppletsLinkUtil;
 import com.caimei.www.utils.RequestUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
@@ -70,8 +69,6 @@ public class BaseServiceImpl implements BaseService {
                         link = link + "?name=" + item.getName();
                     }
                 }
-                item.setLinkType(AppletsLinkUtil.getLinkType(link));
-                item.setLinkParam(AppletsLinkUtil.getLinkParam(item.getLinkType(), link));
                 item.setLink(link);
             }
 //            List<SubMenu> subList = baseDao.getSubMenus(item.getId());

src/main/java/com/caimei/www/service/page/impl/SinglePageServiceImpl.java

@@ -110,6 +110,14 @@ public class SinglePageServiceImpl implements SinglePageService {
         return pageId;
     }
 
+    @Override
+    public String getPageTitleById(Integer id) {
+        if (id == null) {
+            return null;
+        }
+        return singlePageDao.getPageTitleById(id);
+    }
+
     @Override
     public Integer getActivityPageIdById(Integer id) {
         if (id == null) {

src/main/java/com/caimei/www/utils/AppletsLinkUtil.java

@@ -1,238 +0,0 @@
-package com.caimei.www.utils;
-
-import lombok.extern.slf4j.Slf4j;
-import org.thymeleaf.util.StringUtils;
-
-import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.regex.Pattern;
-
-/**
- * 小程序链接工具类
- *
- * @author : Charles
- * @date : 2021/4/9
- */
-@Slf4j
-public class AppletsLinkUtil {
-    /**
-     * 1二级页面
-     */
-    public static final Pattern pattern1 = Pattern.compile("/cmpage/info-1");
-    public static final Pattern pattern34 = Pattern.compile("/topic.html");
-    /**
-     * 2项目仪器详情
-     */
-    public static final Pattern pattern2 = Pattern.compile("/cmpage/info-2");
-    public static final Pattern pattern6 = Pattern.compile("equipment/detail");
-    /**
-     * 3直播页面
-     */
-    public static final Pattern pattern3 = Pattern.compile("/cmpage/info-3");
-    public static final Pattern pattern36 = Pattern.compile("wx.vzan.com");
-    /**
-     * 4自由页面
-     */
-    public static final Pattern pattern4 = Pattern.compile("/cmpage/info-4");
-    public static final Pattern pattern33 = Pattern.compile("page.html");
-    /**
-     * 5商品详情
-     */
-    public static final Pattern pattern5 = Pattern.compile("/product-");
-
-    /**
-     * 7供应商主页
-     */
-    public static final Pattern pattern7 = Pattern.compile("supplier/prolist");
-    public static final Pattern pattern8 = Pattern.compile("supplier/index.html");
-    public static final Pattern pattern9 = Pattern.compile("view/supplierHomePage.jsp");
-    public static final Pattern pattern10 = Pattern.compile("supplier/productlist-");
-    /**
-     * 8专题活动页
-     */
-    public static final Pattern pattern11 = Pattern.compile("promotions.html");
-    public static final Pattern pattern12 = Pattern.compile("cmpage/area.html");
-    /**
-     * 9二手市场介绍
-     */
-    public static final Pattern pattern13 = Pattern.compile("html/secondHand/introduction.jsp");
-    public static final Pattern pattern14 = Pattern.compile("flea-market/intro.html");
-    /**
-     * 10二手商品列表
-     */
-    public static final Pattern pattern15 = Pattern.compile("html/secondHand/secondList.jsp");
-    public static final Pattern pattern16 = Pattern.compile("flea-market/list.html");
-    /**
-     * 11二手商品发布
-     */
-    public static final Pattern pattern17 = Pattern.compile("html/maintenance/view/secondtransactions.jsp");
-    public static final Pattern pattern18 = Pattern.compile("flea-market/form.html");
-    /**
-     * 12商品搜索
-     */
-    public static final Pattern pattern19 = Pattern.compile("product/search.shtml");
-    public static final Pattern pattern20 = Pattern.compile("product/search/list");
-    public static final Pattern pattern21 = Pattern.compile("product/list.html");
-    /**
-     * 13信息详情
-     */
-    public static final Pattern pattern22 = Pattern.compile("info/detail");
-    /**
-     * 14品牌招商介绍页
-     */
-    public static final Pattern pattern23 = Pattern.compile("html/InvestmentCaiMei/investmentpage.jsp");
-    public static final Pattern pattern24 = Pattern.compile("investment.html");
-    /**
-     * 15维修保养介绍页
-     */
-    public static final Pattern pattern25 = Pattern.compile("html/maintenance/view/mt-entry-index.jsp");
-    public static final Pattern pattern26 = Pattern.compile("repair.html");
-    /**
-     * 16首页
-     */
-    public static final Pattern pattern27 = Pattern.compile("index.action");
-    public static final Pattern pattern28 = Pattern.compile("index.html");
-    /**
-     * 17注册页
-     */
-    public static final Pattern pattern29 = Pattern.compile("web/login/view/register_new_vip.jsp");
-    public static final Pattern pattern30 = Pattern.compile("register.html");
-    /**
-     * 18信息中心
-     */
-    public static final Pattern pattern31 = Pattern.compile("info/center");
-    /**
-     * 19供应商列表
-     */
-    public static final Pattern pattern32 = Pattern.compile("supplier/list.html");
-    /**
-     * 20分类详情
-     */
-    public static final Pattern pattern35 = Pattern.compile("/cmpage/info-5");
-    /**
-     * 21美博会专题页
-     */
-    public static final Pattern pattern37 = Pattern.compile("/beautytopic");
-    /**
-     * 22美体会专题页
-     */
-    public static final Pattern pattern38 = Pattern.compile("/cmpage/info-5-301");
-
-    /**
-     * 根据链接判断链接类型
-     *
-     * @param link
-     * @return
-     */
-    public static Integer getLinkType(String link) {
-        if (!StringUtils.isEmpty(link)) {
-            if (pattern1.matcher(link).find() || pattern34.matcher(link).find()) {
-                return 1;
-            } else if (pattern2.matcher(link).find() || pattern6.matcher(link).find()) {
-                return 2;
-            } else if (pattern3.matcher(link).find() || pattern36.matcher(link).find()) {
-                return 3;
-            } else if (pattern4.matcher(link).find() || pattern33.matcher(link).find()) {
-                return 4;
-            } else if (pattern5.matcher(link).find()) {
-                return 5;
-            } else if (pattern7.matcher(link).find() || pattern8.matcher(link).find() || pattern9.matcher(link).find() || pattern10.matcher(link).find()) {
-                return 7;
-            } else if (pattern11.matcher(link).find() || pattern12.matcher(link).find()) {
-                return 8;
-            } else if (pattern13.matcher(link).find() || pattern14.matcher(link).find()) {
-                return 9;
-            } else if (pattern15.matcher(link).find() || pattern16.matcher(link).find()) {
-                return 10;
-            } else if (pattern17.matcher(link).find() || pattern18.matcher(link).find()) {
-                return 11;
-            } else if (pattern19.matcher(link).find() || pattern20.matcher(link).find() || pattern21.matcher(link).find()) {
-                return 12;
-            } else if (pattern22.matcher(link).find()) {
-                return 13;
-            } else if (pattern23.matcher(link).find() || pattern24.matcher(link).find()) {
-                return 14;
-            } else if (pattern25.matcher(link).find() || pattern26.matcher(link).find()) {
-                return 15;
-            } else if (pattern27.matcher(link).find() || pattern28.matcher(link).find()) {
-                return 16;
-            } else if (pattern29.matcher(link).find() || pattern30.matcher(link).find()) {
-                return 17;
-            } else if (pattern31.matcher(link).find()) {
-                return 18;
-            } else if (pattern32.matcher(link).find()) {
-                return 19;
-            } else if (pattern35.matcher(link).find()) {
-                if (pattern38.matcher(link).find()) {
-                    return 22;
-                }
-                return 20;
-            } else if (pattern37.matcher(link).find()) {
-                return 21;
-            } else {
-                return -1;
-            }
-        } else {
-            return -1;
-        }
-    }
-
-    /**
-     * 根据链接获取链接中携带的参数
-     *
-     * @param linkType
-     * @param link
-     * @return
-     */
-    public static Map<String, Object> getLinkParam(Integer linkType, String link) {
-        HashMap<String, Object> map = new HashMap<>();
-        String[] idArr = link.split("/");
-        String[] split1 = null;
-        String[] split2 = null;
-        String[] split3 = null;
-        if (idArr.length > 0) {
-            split1 = idArr[idArr.length - 1].split("-");
-            split2 = idArr[idArr.length - 1].split("=");
-            if (split1.length > 0) {
-                split3 = split1[split1.length - 1].split("\\.");
-            }
-        }
-        if (linkType == 3 || linkType == 5 || linkType == 20 || linkType == 22) {
-            //-{id}.html
-            if (split3 != null && split3.length == 2) {
-                map.put("id", split3[0]);
-            }
-        } else if (linkType == 1 || linkType == 2 || linkType == 4 || linkType == 7) {
-            if (pattern1.matcher(link).find() || pattern2.matcher(link).find() || pattern4.matcher(link).find() || pattern7.matcher(link).find() || pattern10.matcher(link).find()) {
-                //-{id}.html
-                if (split3 != null && split3.length == 2) {
-                    map.put("id", split3[0]);
-                }
-            } else if (pattern6.matcher(link).find() || pattern33.matcher(link).find() || pattern8.matcher(link).find() || pattern9.matcher(link).find() || pattern34.matcher(link).find()) {
-                //id={id}
-                if (split2 != null && split2.length == 2) {
-                    map.put("id", split2[1]);
-                }
-            }
-        } else if (linkType == 13 || linkType == 18) {
-            //a-{id}-b
-            if (split1 != null && split1.length == 3) {
-                map.put("id", split1[1]);
-            }
-        } else if (linkType == 12 || linkType == 19) {
-            //keyword=
-            if (split2 != null && split2.length == 2) {
-                String keyword = split2[1];
-                try {
-                    keyword = URLDecoder.decode(keyword, "UTF-8");
-                } catch (UnsupportedEncodingException e) {
-                    log.error("try-catch:",e);
-                }
-                map.put("keyword", keyword);
-            }
-        }
-        return map;
-    }
-}

src/main/resources/mapper/SinglePageMapper.xml

@@ -82,6 +82,9 @@
             a.type=5 and a.enabledStatus=1
             and a.id=#{id}
     </select>
+    <select id="getPageTitleById" resultType="java.lang.String">
+        select title from cm_page where id=#{id}
+    </select>
     <select id="getActivityPageIdById" resultType="java.lang.Integer">
         select id from cm_page a
         where

src/main/resources/static/css/activity/activityTopic.css

@@ -105,6 +105,7 @@ a:hover{color:#333}
 .product-template .floor-item .floor-item-text .pro-price{bottom:0;line-height:22px}
 .product-template .floor-item .floor-item-text .pro-price span{vertical-align:middle}
 .product-template .floor-item .floor-item-text .pro-price .price-tag{height:22px;margin:2px 0 ;}
+.product-template .floor-item .floor-item-text .pro-price .none{color: #999999;text-decoration: line-through;}
 .product-template .floor-item .floor-item-text .pro-price .price-tag .tag{display:inline-block;height:20px;line-height:20px;border:1px solid #ffe6dc;border-radius:2px;font-size:12px;color:#e15616;cursor:pointer;background:#fff;padding:0 4px;position:relative;font-style:normal}
 .product-template.floor-grid-1 .floor-main{height:604.42857px;overflow:hidden}
 .product-template.floor-grid-1 .floor-item-ad.ad1{width:100%;height:117.14286px;margin-right:0}
@@ -235,6 +236,7 @@ a:hover{color:#333}
 .product-template .floor-item .floor-item-text .pro-price .price-tag{height:5vw;padding:1vw 0}
 .product-template .floor-item .floor-item-text .pro-price .price-tag .tag{font-size:2.4vw;display:inline-block;line-height:5vw;color:#e15616;padding:0 0.8vw;border:1px solid #e15616;border-radius:0.5vw}
 .product-template .floor-item .floor-item-text .pro-price .price{height:5vw;line-height:5vw}
+.product-template .floor-item .floor-item-text .pro-price .none{color: #999999;text-decoration: line-through;}
 .product-template.floor-grid-1 .floor-item-ad{float:left;margin:2vw 2vw 0 0}
 .product-template.floor-grid-1 .floor-item-ad.ad1{width:94vw;height:32vw;margin-right:0}
 .product-template.floor-grid-1 .floor-item-ad.ad2{width:46vw;height:35vw}

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

@@ -188,7 +188,7 @@ var globalHead = new Vue({
             this.userIdentity = userData.userIdentity;
             this.shopId = userData.shopId;
         }
-        if($(window).width() > 1400){
+        if($(window).height() > 750){
             $(window).on('scroll', function() {
                 var scrollTop = $(this).scrollTop();
                 if(scrollTop>200){
@@ -346,8 +346,8 @@ $(function(){
     $('#topSearch').on("click", '.searchBtn', function(){
         var type = isPC ? $('#topSearch').find('[data-select]').attr("data-select")*1 : $('#topSearch').find('select').val()*1;
         var keyword = $.trim($('#topSearch').find('.keyword').val());
-        // 商品
-        if (keyword.length < 2) {
+        // 商品,文章
+        if (keyword.length < 2 && (type === 0 || type > 2)) {
             $.confirm({
                 useBootstrap: false,
                 boxWidth: (isPC?'300px':'70%'),

src/main/resources/static/js/center.js

@@ -3,11 +3,17 @@ $(function(){
     //GLOBAL_USER_IDENTITY: 2-会员机构；3-供应商；4-普通机构
     var pageFlag = window.location.pathname.split("/")[1];
     if (pageFlag == "supplier" && (GLOBAL_USER_IDENTITY=== 2 || GLOBAL_USER_IDENTITY===4)) {
+        // 机构访问供应商页面直接跳转机构个人中心
         window.location.href = "/user/dashboard.html";
     }else if (pageFlag == "user" && (GLOBAL_USER_IDENTITY === 1 || GLOBAL_USER_IDENTITY===3)) {
+        // 供应商访问机构页面直接跳转供应商个人中心
         window.location.href = "/supplier/dashboard.html";
-    }else{
-        return;
+    }
+    // 登录状态判断
+    if (!globalUserData || !GLOBAL_USER_ID){
+        CAIMEI.Alert("登录已失效，请重新登录", '确定', true, function(){
+            window.location.href = "/login.html";
+        });
     }
 });
 

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

@@ -33,7 +33,8 @@ var PagesApi = {
                 url:'/commodity/promotions/list',
                 type:'GET',
                 data:params,
-                json:false
+                json:false,
+                isHost:true
             })
             .then(function(res){
                 callback(res);

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

@@ -196,10 +196,11 @@ var ProductApi = {
         },
         getActivityData: function (params, callback) {
             Http.AjaxService({
-                url: '/home/activity/data',
+                url: '/commodity/page/floor',
                 type: 'get',
                 data: params,
-                json: true
+                json: true,
+                isHost:true
             })
             .then(function (res) {
                 callback(res);

src/main/resources/static/js/index.js

@@ -220,7 +220,7 @@ var homeData = new Vue({
                     $(".price_grade_shop").hide();
                     $(".main_price_login").show();
                     priceList.map(function(price){
-                        // 用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构
+                        // userIdentity用户身份: 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构
                         // priceFlag: 0公开价格 1不公开价格 2仅对会员机构公开
                         var parent = $(".main_price_text.product_"+ price.productId);
                         var priceFlag = parent.find(".main_price_login").attr('data-id')*1;
@@ -297,10 +297,9 @@ var homeData = new Vue({
                         }
                     });
                     // 侧边模块固定 fixed
-                    if($('#fixed-wrap').length>0 && $(window).width()>1400) {
-                        var tocWrap = $('#fixed-wrap'),
-                            changeSize = $("#globalHead").outerHeight() + $("#swiper-container").outerHeight() + $("#sidebar").outerHeight();
-                            //changeSize = document.getElementById("header").offsetHeight + document.getElementById("sidebar").offsetHeight;
+                    if($('#fixed-wrap').length>0 && $(window).height()>750) {
+                        var tocWrap = $('#fixed-wrap');
+                        var changeSize = $("#globalHead").outerHeight() + $("#swiper-container").outerHeight() + $("#sidebar").outerHeight();
                         scrollSize >= changeSize ? tocWrap.addClass("fixed") : tocWrap.removeClass("fixed");
                     }
                 }
@@ -321,17 +320,15 @@ var homeData = new Vue({
         $('#advertising').on('click','.close',function () {
             $(this).parents('.item').hide();
         });
-        // var isActivityStatus =  localStorage.getItem('isActivityStatus');
-        // //新加优惠券弹窗
-        // if(isActivityStatus){
-        //     var  lockTime = localStorage.getItem('lockTime');
-        //     var  eTime = this.diffTime(lockTime);
-        //     _this.showflag = eTime;
-        // }else{
-        //     setTimeout(function () {
-        //          _this.showflag = true;
-        //     },1000);
-        // }
+        var isActivityStatus =  localStorage.getItem('isActivityStatus');
+        //新加优惠券弹窗
+        if(isActivityStatus){
+            var  lockTime = localStorage.getItem('lockTime');
+            _this.popupFlag = this.diffTime(lockTime);
+        }else{
+            setTimeout(function () {
+                 _this.popupFlag = true;
+            },1000);
+        }
     }
 });
-

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

@@ -187,6 +187,10 @@ var productDetail = new Vue({
         toLogin: function() {
             setBeforeUrl();
             window.location.href = '/login.html';
+        },
+        toUpgrade: function() {
+            setBeforeUrl();
+            window.location.href = '/user/setting/upgrade.html';
         },
 		addShopCart: function(){ //加入购物车
 		    var _self = this;

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

@@ -50,7 +50,7 @@
             }
         },
         toserch:function(item){
-            window.location.href='/product/classify-'+this.typeSort+'-'+item.bigTypeID+'.html?name='+this.nav_linkName
+            window.location.href='/product/classify-'+this.typeSort+'-'+item.bigTypeId+'.html?name='+this.nav_linkName
         },
         seeMore:function(page){
              page.isPageMore = !page.isPageMore;

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

@@ -1,7 +1,7 @@
 var productList = new Vue({
     el: "#productList",
     data: {
-        searchFlag: false,
+        // searchFlag: false,
         listLoading: true,
         requestFlag: true,
         noMore: false,
@@ -11,9 +11,9 @@ var productList = new Vue({
             keyword: "",
             sortField: "",
             sortType: 1, // 1降序，其他升序
-            bid: "",
-            sid: "",
-            tid: ""
+            // bid: "",
+            // sid: "",
+            // tid: ""
         },
         classify: [],
         listData: [], //priceflag 0公开价格 1不公开价格 2仅对会员机构公开,//userIdentity: 2-会员机构, 4-普通机构
@@ -103,37 +103,37 @@ var productList = new Vue({
                 }
             });
         },
-        getListByCategory: function (path, categoryId) {
-            var _self = this;
-            $.getJSON(spiServer+"/search/query/product/"+ path ,{
-                id: categoryId,
-                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);
-                    _self.listRecord = result.total;
-                    var resultData = setSearchProductList(result.items, _self.userId, function(){
-                        _self.$forceUpdate();
-                        setTimeout(function(){
-                            // 图片懒加载
-                            $("img[data-original]").lazyload();
-                        },500);
-                    });
-                    if(isPC){
-                        _self.listData = resultData;
-                    }else{
-                        _self.listData = _self.listData.concat(resultData);
-                    }
-                    console.log(_self.listData)
-                }
-                _self.listLoading = false;
-                _self.requestFlag = true;
-            })
-        }
+        // getListByCategory: function (path, categoryId) {
+        //     var _self = this;
+        //     $.getJSON(spiServer+"/search/query/product/"+ path ,{
+        //         id: categoryId,
+        //         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);
+        //             _self.listRecord = result.total;
+        //             var resultData = setSearchProductList(result.items, _self.userId, function(){
+        //                 _self.$forceUpdate();
+        //                 setTimeout(function(){
+        //                     // 图片懒加载
+        //                     $("img[data-original]").lazyload();
+        //                 },500);
+        //             });
+        //             if(isPC){
+        //                 _self.listData = resultData;
+        //             }else{
+        //                 _self.listData = _self.listData.concat(resultData);
+        //             }
+        //             console.log(_self.listData)
+        //         }
+        //         _self.listLoading = false;
+        //         _self.requestFlag = true;
+        //     })
+        // }
     },
     created: function () {
         if(isPC){
@@ -150,7 +150,7 @@ var productList = new Vue({
         $('#topSearch').find('.keyword').val(getUrlParam("keyword"));
         this.params.sortField = getUrlParam("sortField") ? getUrlParam("sortField") : "";
         this.params.sortType = getUrlParam("sortType") ? getUrlParam("sortType") * 1 : 1;
-        this.searchFlag = (this.params.keyword !== "");
+        // this.searchFlag = (this.params.keyword !== "");
         if(globalUserData){
             this.userId = globalUserData.userId;
             this.userIdentity = globalUserData.identity;
@@ -161,32 +161,35 @@ var productList = new Vue({
             this.userId = JSON.parse(userInfo).userId;
             this.shopID = JSON.parse(userInfo).shopId;
         }
-        if (this.searchFlag) {
-            // 获取列表数据
-            this.getListByKeyword();
-        } else {
-            // category=1000-1001-1005
-            if (!getUrlParam("category")) {
-                this.listLoading = false;
-                return false;
-            }
-            var category = getUrlParam("category").split("-");
-            this.params.bid = category[0];
-            this.params.sid = category[1];
-            this.params.tid = category[2];
-            // 根据分类获取数据
-            if (this.params.tid && this.params.tid>0) {
-                this.getListByCategory("tinyType", this.params.tid);
-            } else if (this.params.sid && this.params.sid>0){
-                this.getListByCategory("smallType", this.params.sid);
-            } else if (this.params.bid && this.params.bid>0) {
-                this.getListByCategory("bigType", this.params.bid);
-            } else {
-                alertInfo("URL参数异常！", function(){
-                    window.location.href = "/";
-                });
-            }
-        }
+        // 获取列表数据
+        this.getListByKeyword();
+
+        // if (this.searchFlag) {
+        //     // 获取列表数据
+        //     this.getListByKeyword();
+        // } else {
+        //     // category=1000-1001-1005
+        //     if (!getUrlParam("category")) {
+        //         this.listLoading = false;
+        //         return false;
+        //     }
+        //     var category = getUrlParam("category").split("-");
+        //     this.params.bid = category[0];
+        //     this.params.sid = category[1];
+        //     this.params.tid = category[2];
+        //     // 根据分类获取数据
+        //     if (this.params.tid && this.params.tid>0) {
+        //         this.getListByCategory("tinyType", this.params.tid);
+        //     } else if (this.params.sid && this.params.sid>0){
+        //         this.getListByCategory("smallType", this.params.sid);
+        //     } else if (this.params.bid && this.params.bid>0) {
+        //         this.getListByCategory("bigType", this.params.bid);
+        //     } else {
+        //         alertInfo("URL参数异常！", function(){
+        //             window.location.href = "/";
+        //         });
+        //     }
+        // }
     },
     mounted: function () {
         var _self = this;
@@ -204,19 +207,21 @@ var productList = new Vue({
                     if(next <= totalPage){
                         if (_self.requestFlag){
                             _self.params.num = next;
-                            if (_self.searchFlag) {
-                                // 获取列表数据
-                                _self.getListByKeyword();
-                            } else {
-                                // 根据分类获取数据
-                                if (_self.params.tid && _self.params.tid>0) {
-                                    _self.getListByCategory("tinyType", _self.params.tid);
-                                } else if (_self.params.sid && _self.params.sid>0){
-                                    _self.getListByCategory("smallType", _self.params.sid);
-                                } else if (_self.params.bid && _self.params.bid>0) {
-                                    _self.getListByCategory("bigType", _self.params.bid);
-                                }
-                            }
+                            // 获取列表数据
+                            _self.getListByKeyword();
+                            // if (_self.searchFlag) {
+                            //     // 获取列表数据
+                            //     _self.getListByKeyword();
+                            // } else {
+                            //     // 根据分类获取数据
+                            //     if (_self.params.tid && _self.params.tid>0) {
+                            //         _self.getListByCategory("tinyType", _self.params.tid);
+                            //     } else if (_self.params.sid && _self.params.sid>0){
+                            //         _self.getListByCategory("smallType", _self.params.sid);
+                            //     } else if (_self.params.bid && _self.params.bid>0) {
+                            //         _self.getListByCategory("bigType", _self.params.bid);
+                            //     }
+                            // }
                         }
                         _self.requestFlag = false;
                     }else{

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

@@ -13,9 +13,9 @@ var productList = new Vue({
         bigName:'',
         smallName:'',
         tinyName:'',
-        bigTypeID:'',
-        smallTypeID:'',//二级分类id
-        tinyTypeID:'',//三级分类id
+        bigTypeId:'',
+        smallTypeId:'',//二级分类id
+        tinyTypeId:'',//三级分类id
         listRecord: 0,
         pageInput: '1',
         source:'www',
@@ -59,7 +59,7 @@ var productList = new Vue({
     methods:{
         getclassify:function(){
             var _self = this;
-            ProductApi.GetbigTypeclassify({ typeId:_self.bigTypeID, idType:1, source:_self.source },function (res) {
+            ProductApi.GetbigTypeclassify({ typeId:_self.bigTypeId, idType:1, source:_self.source },function (res) {
                 if(res.code==0){
                     _self.smalltypeList = res.data.smallTypeList;
                 }else {
@@ -119,14 +119,14 @@ var productList = new Vue({
             switch (index) {
                 case 1:
                     this.smallName = '';
-                    this.params.id = this.bigTypeID;
-                    this.smallTypeID='';
+                    this.params.id = this.bigTypeId;
+                    this.smallTypeId='';
                     this.getproductList();
                     break;
                 case 2:
                     this.tinyName = '';
-                    this.params.id = this.smallTypeID;
-                    this.tinyTypeID='';
+                    this.params.id = this.smallTypeId;
+                    this.tinyTypeId='';
                     this.getproductList();
                     break;
             }
@@ -149,26 +149,26 @@ var productList = new Vue({
                 case 1://选择1集分类查询
                     this.bigName=item.name;
                     this.smallName = '';
-                    this.bigTypeID = item.bigTypeId;
+                    this.bigTypeId = item.bigTypeId;
                     this.params.id = item.bigTypeId;
                     this.smallName ='';
                     this.tinyName ='';
-                    this.smallTypeID='';
-                    this.tinyTypeID='';
+                    this.smallTypeId='';
+                    this.tinyTypeId='';
                     this.tinytypeList=[];
                     this.getclassify();
                     break;
                 case 2://选择二级分类查询
                     this.smallName = item.name;
                     this.tinyName = '';
-                    this.smallTypeID = item.smallTypeId;
+                    this.smallTypeId = item.smallTypeId;
                     this.params.id = item.smallTypeId;
-                    this.tinyTypeID='';
+                    this.tinyTypeId='';
                     this.tinytypeList =item.tinytypeList;
                     break;
                 case 3://选择三级分类查询
                     this.tinyName = item.name;
-                    this.tinyTypeID = item.tinyTypeId;
+                    this.tinyTypeId = item.tinyTypeId;
                     this.params.id = item.tinyTypeId;
                     break;
             }
@@ -185,28 +185,28 @@ var productList = new Vue({
     mounted:function () {
         var _self = this;
         this.nav_linkName = decodeURI(CAIMEI.getUrlParam('name'));
-        // this.bigTypeID = getUrlParam('bigTypeID');
-        // this.smallTypeID = getUrlParam('smallTypeID');
-        // this.tinyTypeID = getUrlParam('tinyTypeID');
+        // this.bigTypeId = getUrlParam('bigTypeId');
+        // this.smallTypeId = getUrlParam('smallTypeId');
+        // this.tinyTypeId = getUrlParam('tinyTypeId');
         // var typeSort =  getUrlParam('typeSort');
         var paramsArr = window.location.pathname.split(".")[0].split("-");
         var typeSort =  paramsArr.length>=1 ? paramsArr[1] : '';
-        this.bigTypeID = paramsArr.length>=2 ? paramsArr[2] : '';
-        this.smallTypeID = paramsArr.length>=3 ? paramsArr[3] : '';
-        this.tinyTypeID = paramsArr.length>=4 ? paramsArr[4] : '';
-        console.log( this.smallTypeID)
-        console.log( this.tinyTypeID)
-        if(this.tinyTypeID==null &&  this.smallTypeID==null){
-            this.params.id=this.bigTypeID;
+        this.bigTypeId = paramsArr.length>=2 ? paramsArr[2] : '';
+        this.smallTypeId = paramsArr.length>=3 ? paramsArr[3] : '';
+        this.tinyTypeId = paramsArr.length>=4 ? paramsArr[4] : '';
+        console.log( this.smallTypeId)
+        console.log( this.tinyTypeId)
+        if(this.tinyTypeId==null &&  this.smallTypeId==null){
+            this.params.id=this.bigTypeId;
             this.params.idType = 1;
-        }else if(this.tinyTypeID==null){
-            this.params.id=this.smallTypeID;
+        }else if(this.tinyTypeId==null){
+            this.params.id=this.smallTypeId;
             this.params.idType = 2;
-        }else if(this.smallTypeID==null){
-            this.params.id=this.bigTypeID;
+        }else if(this.smallTypeId==null){
+            this.params.id=this.bigTypeId;
             this.params.idType = 1;
         }else {
-            this.params.id=this.tinyTypeID;
+            this.params.id=this.tinyTypeId;
             this.params.idType = 3;
         }
 
@@ -215,17 +215,17 @@ var productList = new Vue({
                 if (res.code==0){
                     _self.classify = res.data;
                     _self.classify.forEach(function (item) {
-                        if(_self.bigTypeID == item.bigTypeId){
+                        if(_self.bigTypeId == item.bigTypeId){
                             _self.bigName = item.name;
                             if (item.smallTypeList!='' && item.smallTypeList!=null){
                                 _self.smalltypeList= item.smallTypeList;
                                 _self.smalltypeList.forEach(function (pros) {
-                                    if(_self.smallTypeID == pros.smallTypeId){
+                                    if(_self.smallTypeId == pros.smallTypeId){
                                         _self.smallName = pros.name;
                                         if(pros.tinyTypeList!=''&&pros.tinyTypeList!=null){
                                             _self.tinytypeList = pros.tinyTypeList;
                                             _self.tinytypeList.forEach(function (thiny) {
-                                                if (thiny.tinyTypeId ==_self.tinyTypeID){
+                                                if (thiny.tinyTypeId ==_self.tinyTypeId){
                                                     _self.tinyName=thiny.name;
                                                 }
                                             })
@@ -269,4 +269,5 @@ var productList = new Vue({
             });
         }
     }
+
 })

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

@@ -208,6 +208,16 @@ var releaseContainer = new Vue({
                     }else{
                         _this.paramKeyList = data.parametersList;
                     }
+                    // 下拉列表初始化
+                    setTimeout(function(){
+                        _this.ChangeClassificationFirst({bigTypeId:data.bigTypeId, name:data.bigTypeName});
+                        setTimeout(function(){
+                            _this.ChangeClassificationTwo({smallTypeId:data.smallTypeId, name:data.smallTypeName});
+                            setTimeout(function(){
+                                _this.ChangeClassificationThree({tinyTypeId:data.tinyTypeId, name:data.tinyTypeName});
+                            },500);
+                        },500);
+                    },500);
                 }else{
                     CAIMEI.Alert(response.msg, '确定', false);
                 }
@@ -425,7 +435,7 @@ var releaseContainer = new Vue({
             _this.classificationThreeList =[];
             _this.isSelectActive = 0;
             if(_this.releaseParams.bigTypeId!=''){
-                 _this.GetTwoClassFn(_this.releaseParams.bigTypeId);
+                 _this.GetTwoClassFn(option.bigTypeId);
             }
         },
         ChangeClassificationTwo: function(option){//选择二级分类
@@ -436,7 +446,7 @@ var releaseContainer = new Vue({
             _this.releaseParams.smallTypeId = option.smallTypeId;
             _this.releaseParams.twoClassifyName = option.name;
             _this.isSelectActive = 0;
-            _this.GetThreeClassFn(_this.releaseParams.smallTypeId);
+            _this.GetThreeClassFn(option.smallTypeId);
         },
         ChangeClassificationThree: function(option){//选择三级分类
             var _this = this;
@@ -1108,6 +1118,10 @@ var releaseContainer = new Vue({
             this.newNum = value;
         },
     },
+    created: function () {
+        // 获取初始一级分类菜单
+        this.GetFistClassFn(this.releaseParams.commodityType);
+    },
     mounted: function () {
         var _this = this;
         // var NODE_ENV_BASE_URL = $('#spiServer').val();
@@ -1122,6 +1136,5 @@ var releaseContainer = new Vue({
                 _this.GetEditReleaseProductInfo(_this.productId);
             }
         }
-         _this.GetFistClassFn(_this.releaseParams.commodityType)
     }
 });

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

@@ -22,12 +22,12 @@
             </div>
             <form v-show="!qrCodeLogin">
                 <div class="formLine">
-                    <input type="text" v-model="loginAccount" placeholder="请输入邮箱或手机号" :rule="rule.account" maxlength="30" @blur="blurHandle($event)" needverify>
+                    <input type="text" v-model.trim="loginAccount" placeholder="请输入邮箱或手机号" :rule="rule.account" maxlength="30" @blur="blurHandle($event)" needverify>
                     <i class="checked icon mIcon"></i>
                     <span class="errTips icon mIcon" tips="请提供正确的邮箱或手机号码"></span>
                 </div>
                 <div class="formLine">
-                    <input type="password" v-model="loginPassword" placeholder="请输入密码" :rule="rule.password" maxlength="30" @blur="blurHandle($event)" needverify>
+                    <input type="password" v-model.trim="loginPassword" placeholder="请输入密码" :rule="rule.password" maxlength="30" @blur="blurHandle($event)" needverify>
                     <i class="checked icon mIcon"></i>
                     <span class="errTips icon mIcon" tips="请输入正确的密码"></span>
                     <i class="icon showPwd" @click="showPassword($event)"></i>

src/main/resources/templates/activity/activityTopic.html

@@ -394,7 +394,7 @@
                       <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                         <template v-if="pros.product.productCategory==1">
                           <!-- 样式1 价格未公开-->
-                          <template v-if="pros.product.price1TextFlag==1">
+                          <template v-if="pros.product.priceFlag==1">
                             <div class="price-tag">
                               <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                             </div>
@@ -403,22 +403,22 @@
                           <template v-else>
                             <!-- 样式2-->
                             <template
-                              v-if="(pros.product.price1TextFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
+                              v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                               <div class="price-tag">
                                 <span class="tag" 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 && PromotionsFormat(pros.product.promotions)">:￥{{pros.product.price | NumFormat}}</span>
                                 </span>
                               </div>
                               <div class="price" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
                                 <span>
-                                  ￥{{(PromotionsFormat(pros.product.promotions) ? pros.product.price1
-                                  : pros.product.retailPrice) | NumFormat }}
+                                  ￥{{(PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice
+                                  : pros.product.price) | NumFormat }}
                                 </span>
                               </div>
                             </template>
                             <!-- 样式3 -->
-                            <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-tag" v-if="pros.product.actStatus==1">
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
@@ -430,7 +430,7 @@
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
                               <div class="price"><span>￥</span>
-                                <span class="p-icon" :class="'i'+pros.product.price1Grade"></span>
+                                <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                               </div>
                             </template>
                           </template>
@@ -440,7 +440,7 @@
                           <div class="price-tag"></div>
                           <div class="price" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>
                           <div class="price" v-else>
-                            <span>￥{{ pros.product.retailPrice | NumFormat }}</span>
+                            <span>￥{{ pros.product.price | NumFormat }}</span>
                           </div>
                         </template>
                       </template>
@@ -452,7 +452,7 @@
                           </div>
                           <div class="price">
                             <span>￥</span>
-                            <span class="p-icon" :class="'i'+pros.product.price1Grade"></span>
+                            <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                           </div>
                         </template>
                         <!-- 样式7 -->
@@ -511,7 +511,7 @@
                       <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                         <template v-if="pros.product.productCategory==1">
                           <!-- 样式1 价格未公开-->
-                          <template v-if="pros.product.price1TextFlag==1">
+                          <template v-if="pros.product.priceFlag==1">
                             <div class="price-tag">
                               <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                             </div>
@@ -520,22 +520,22 @@
                           <template v-else>
                             <!-- 样式2-->
                             <template
-                              v-if="(pros.product.price1TextFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
+                              v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                               <div class="price-tag">
                                 <span class="tag" 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 && PromotionsFormat(pros.product.promotions)">:￥{{pros.product.price | NumFormat}}</span>
                                 </span>
                               </div>
                               <div class="price" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
                                 <span>
-                                  ￥{{(PromotionsFormat(pros.product.promotions) ? pros.product.price1
-                                  : pros.product.retailPrice) | NumFormat }}
+                                  ￥{{(PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice
+                                  : pros.product.price) | NumFormat }}
                                 </span>
                               </div>
                             </template>
                             <!-- 样式3 -->
-                            <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-tag" v-if="pros.product.actStatus==1">
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
@@ -547,7 +547,7 @@
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
                               <div class="price"><span>￥</span>
-                                <span class="p-icon" :class="'i'+pros.product.price1Grade"></span>
+                                <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                               </div>
                             </template>
                           </template>
@@ -557,7 +557,7 @@
                           <div class="price-tag"></div>
                           <div class="price" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>
                           <div class="price" v-else>
-                            <span>￥{{ pros.product.retailPrice | NumFormat }}</span>
+                            <span>￥{{ pros.product.price | NumFormat }}</span>
                           </div>
                         </template>
                       </template>
@@ -569,7 +569,7 @@
                           </div>
                           <div class="price">
                             <span>￥</span>
-                            <span class="p-icon" :class="'i'+pros.product.price1Grade"></span>
+                            <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                           </div>
                         </template>
                         <!-- 样式7 -->
@@ -639,7 +639,7 @@
                       <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                         <template v-if="pros.product.productCategory==1">
                           <!-- 样式1 价格未公开-->
-                          <template v-if="pros.product.price1TextFlag==1">
+                          <template v-if="pros.product.priceFlag==1">
                             <div class="price-tag">
                               <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                             </div>
@@ -648,22 +648,22 @@
                           <template v-else>
                             <!-- 样式2-->
                             <template
-                              v-if="(pros.product.price1TextFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
+                              v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                               <div class="price-tag">
                                 <span class="tag" 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 && PromotionsFormat(pros.product.promotions)">:￥{{pros.product.price | NumFormat}}</span>
                                 </span>
                               </div>
                               <div class="price" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
                                 <span>
-                                  ￥{{(PromotionsFormat(pros.product.promotions) ? pros.product.price1
-                                  : pros.product.retailPrice) | NumFormat }}
+                                  ￥{{(PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice
+                                  : pros.product.price) | NumFormat }}
                                 </span>
                               </div>
                             </template>
                             <!-- 样式3 -->
-                            <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-tag" v-if="pros.product.actStatus==1">
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
@@ -675,7 +675,7 @@
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
                               <div class="price"><span>￥</span>
-                                <span class="p-icon" :class="'i'+pros.product.price1Grade"></span>
+                                <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                               </div>
                             </template>
                           </template>
@@ -685,7 +685,7 @@
                           <div class="price-tag"></div>
                           <div class="price" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>
                           <div class="price" v-else>
-                            <span>￥{{ pros.product.retailPrice | NumFormat }}</span>
+                            <span>￥{{ pros.product.price | NumFormat }}</span>
                           </div>
                         </template>
                       </template>
@@ -697,7 +697,7 @@
                           </div>
                           <div class="price">
                             <span>￥</span>
-                            <span class="p-icon" :class="'i'+pros.product.price1Grade"></span>
+                            <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                           </div>
                         </template>
                         <!-- 样式7 -->
@@ -740,7 +740,7 @@
                       <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                         <template v-if="pros.product.productCategory==1">
                           <!-- 样式1 价格未公开-->
-                          <template v-if="pros.product.price1TextFlag==1">
+                          <template v-if="pros.product.priceFlag==1">
                             <div class="price-tag">
                               <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                             </div>
@@ -749,22 +749,22 @@
                           <template v-else>
                             <!-- 样式2-->
                             <template
-                              v-if="(pros.product.price1TextFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
+                              v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                               <div class="price-tag">
                                 <span class="tag" 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 && PromotionsFormat(pros.product.promotions)">:￥{{pros.product.price | NumFormat}}</span>
                                 </span>
                               </div>
                               <div class="price" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
                                 <span>
-                                  ￥{{(PromotionsFormat(pros.product.promotions) ? pros.product.price1
-                                  : pros.product.retailPrice) | NumFormat }}
+                                  ￥{{(PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice
+                                  : pros.product.price) | NumFormat }}
                                 </span>
                               </div>
                             </template>
                             <!-- 样式3 -->
-                            <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-tag" v-if="pros.product.actStatus==1">
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
@@ -776,7 +776,7 @@
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
                               <div class="price"><span>￥</span>
-                                <span class="p-icon" :class="'i'+pros.product.price1Grade"></span>
+                                <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                               </div>
                             </template>
                           </template>
@@ -786,7 +786,7 @@
                           <div class="price-tag"></div>
                           <div class="price" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>
                           <div class="price" v-else>
-                            <span>￥{{ pros.product.retailPrice | NumFormat }}</span>
+                            <span>￥{{ pros.product.price | NumFormat }}</span>
                           </div>
                         </template>
                       </template>
@@ -798,7 +798,7 @@
                           </div>
                           <div class="price">
                             <span>￥</span>
-                            <span class="p-icon" :class="'i'+pros.product.price1Grade"></span>
+                            <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                           </div>
                         </template>
                         <!-- 样式7 -->
@@ -858,7 +858,7 @@
                       <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                         <template v-if="pros.product.productCategory==1">
                           <!-- 样式1 价格未公开-->
-                          <template v-if="pros.product.price1TextFlag==1">
+                          <template v-if="pros.product.priceFlag==1">
                             <div class="price-tag">
                               <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                             </div>
@@ -867,22 +867,22 @@
                           <template v-else>
                             <!-- 样式2-->
                             <template
-                              v-if="(pros.product.price1TextFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
+                              v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                               <div class="price-tag">
                                 <span class="tag" 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 && PromotionsFormat(pros.product.promotions)">:￥{{pros.product.price | NumFormat}}</span>
                                 </span>
                               </div>
                               <div class="price" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
                                 <span>
-                                  ￥{{(PromotionsFormat(pros.product.promotions) ? pros.product.price1
-                                  : pros.product.retailPrice) | NumFormat }}
+                                  ￥{{(PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice
+                                  : pros.product.price) | NumFormat }}
                                 </span>
                               </div>
                             </template>
                             <!-- 样式3 -->
-                            <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-tag" v-if="pros.product.actStatus==1">
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
@@ -894,7 +894,7 @@
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
                               <div class="price"><span>￥</span>
-                                <span class="p-icon" :class="'i'+pros.product.price1Grade"></span>
+                                <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                               </div>
                             </template>
                           </template>
@@ -904,7 +904,7 @@
                           <div class="price-tag"></div>
                           <div class="price" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>
                           <div class="price" v-else>
-                            <span>￥{{ pros.product.retailPrice | NumFormat }}</span>
+                            <span>￥{{ pros.product.price | NumFormat }}</span>
                           </div>
                         </template>
                       </template>
@@ -916,7 +916,7 @@
                           </div>
                           <div class="price">
                             <span>￥</span>
-                            <span class="p-icon" :class="'i'+pros.product.price1Grade"></span>
+                            <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                           </div>
                         </template>
                         <!-- 样式7 -->
@@ -970,7 +970,7 @@
                       <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                         <template v-if="pros.product.productCategory==1">
                           <!-- 样式1 价格未公开-->
-                          <template v-if="pros.product.price1TextFlag==1">
+                          <template v-if="pros.product.priceFlag==1">
                             <div class="price-tag">
                               <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                             </div>
@@ -979,22 +979,22 @@
                           <template v-else>
                             <!-- 样式2-->
                             <template
-                              v-if="(pros.product.price1TextFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
+                              v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                               <div class="price-tag">
                                 <span class="tag" 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 && PromotionsFormat(pros.product.promotions)">:￥{{pros.product.price | NumFormat}}</span>
                                 </span>
                               </div>
                               <div class="price" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
                                 <span>
-                                  ￥{{(PromotionsFormat(pros.product.promotions) ? pros.product.price1
-                                  : pros.product.retailPrice) | NumFormat }}
+                                  ￥{{(PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice
+                                  : pros.product.price) | NumFormat }}
                                 </span>
                               </div>
                             </template>
                             <!-- 样式3 -->
-                            <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-tag" v-if="pros.product.actStatus==1">
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
@@ -1006,7 +1006,7 @@
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
                               <div class="price"><span>￥</span>
-                                <span class="p-icon" :class="'i'+pros.product.price1Grade"></span>
+                                <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                               </div>
                             </template>
                           </template>
@@ -1016,7 +1016,7 @@
                           <div class="price-tag"></div>
                           <div class="price" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>
                           <div class="price" v-else>
-                            <span>￥{{ pros.product.retailPrice | NumFormat }}</span>
+                            <span>￥{{ pros.product.price | NumFormat }}</span>
                           </div>
                         </template>
                       </template>
@@ -1028,7 +1028,7 @@
                           </div>
                           <div class="price">
                             <span>￥</span>
-                            <span class="p-icon" :class="'i'+pros.product.price1Grade"></span>
+                            <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                           </div>
                         </template>
                         <!-- 样式7 -->
@@ -1082,7 +1082,7 @@
                       <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                         <template v-if="pros.product.productCategory==1">
                           <!-- 样式1 价格未公开-->
-                          <template v-if="pros.product.price1TextFlag==1">
+                          <template v-if="pros.product.priceFlag==1">
                             <div class="price-tag">
                               <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                             </div>
@@ -1091,22 +1091,22 @@
                           <template v-else>
                             <!-- 样式2-->
                             <template
-                              v-if="(pros.product.price1TextFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
+                              v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                               <div class="price-tag">
                                 <span class="tag" 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 && PromotionsFormat(pros.product.promotions)">:￥{{pros.product.price | NumFormat}}</span>
                                 </span>
                               </div>
                               <div class="price" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
                                 <span>
-                                  ￥{{(PromotionsFormat(pros.product.promotions) ? pros.product.price1
-                                  : pros.product.retailPrice) | NumFormat }}
+                                  ￥{{(PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice
+                                  : pros.product.price) | NumFormat }}
                                 </span>
                               </div>
                             </template>
                             <!-- 样式3 -->
-                            <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-tag" v-if="pros.product.actStatus==1">
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
@@ -1118,7 +1118,7 @@
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
                               <div class="price"><span>￥</span>
-                                <span class="p-icon" :class="'i'+pros.product.price1Grade"></span>
+                                <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                               </div>
                             </template>
                           </template>
@@ -1128,7 +1128,7 @@
                           <div class="price-tag"></div>
                           <div class="price" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>
                           <div class="price" v-else>
-                            <span>￥{{ pros.product.retailPrice | NumFormat }}</span>
+                            <span>￥{{ pros.product.price | NumFormat }}</span>
                           </div>
                         </template>
                       </template>
@@ -1140,7 +1140,7 @@
                           </div>
                           <div class="price">
                             <span>￥</span>
-                            <span class="p-icon" :class="'i'+pros.product.price1Grade"></span>
+                            <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                           </div>
                         </template>
                         <!-- 样式7 -->
@@ -1189,7 +1189,7 @@
                       <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                         <template v-if="pros.product.productCategory==1">
                           <!-- 样式1 价格未公开-->
-                          <template v-if="pros.product.price1TextFlag==1">
+                          <template v-if="pros.product.priceFlag==1">
                             <div class="price-tag">
                               <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                             </div>
@@ -1198,22 +1198,22 @@
                           <template v-else>
                             <!-- 样式2-->
                             <template
-                              v-if="(pros.product.price1TextFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
+                              v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                               <div class="price-tag">
                                 <span class="tag" 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 && PromotionsFormat(pros.product.promotions)">:￥{{pros.product.price | NumFormat}}</span>
                                 </span>
                               </div>
                               <div class="price" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
                                 <span>
-                                  ￥{{(PromotionsFormat(pros.product.promotions) ? pros.product.price1
-                                  : pros.product.retailPrice) | NumFormat }}
+                                  ￥{{(PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice
+                                  : pros.product.price) | NumFormat }}
                                 </span>
                               </div>
                             </template>
                             <!-- 样式3 -->
-                            <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-tag" v-if="pros.product.actStatus==1">
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
@@ -1225,7 +1225,7 @@
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
                               <div class="price"><span>￥</span>
-                                <span class="p-icon" :class="'i'+pros.product.price1Grade"></span>
+                                <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                               </div>
                             </template>
                           </template>
@@ -1235,7 +1235,7 @@
                           <div class="price-tag"></div>
                           <div class="price" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>
                           <div class="price" v-else>
-                            <span>￥{{ pros.product.retailPrice | NumFormat }}</span>
+                            <span>￥{{ pros.product.price | NumFormat }}</span>
                           </div>
                         </template>
                       </template>
@@ -1247,7 +1247,7 @@
                           </div>
                           <div class="price">
                             <span>￥</span>
-                            <span class="p-icon" :class="'i'+pros.product.price1Grade"></span>
+                            <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                           </div>
                         </template>
                         <!-- 样式7 -->
@@ -1297,7 +1297,7 @@
                       <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                         <template v-if="pros.product.productCategory==1">
                           <!-- 样式1 价格未公开-->
-                          <template v-if="pros.product.price1TextFlag==1">
+                          <template v-if="pros.product.priceFlag==1">
                             <div class="price-tag">
                               <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                             </div>
@@ -1306,22 +1306,22 @@
                           <template v-else>
                             <!-- 样式2-->
                             <template
-                              v-if="(pros.product.price1TextFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
+                              v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                               <div class="price-tag">
                                 <span class="tag" 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 && PromotionsFormat(pros.product.promotions)">:￥{{pros.product.price | NumFormat}}</span>
                                 </span>
                               </div>
                               <div class="price" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
                                 <span>
-                                  ￥{{(PromotionsFormat(pros.product.promotions) ? pros.product.price1
-                                  : pros.product.retailPrice) | NumFormat }}
+                                  ￥{{(PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice
+                                  : pros.product.price) | NumFormat }}
                                 </span>
                               </div>
                             </template>
                             <!-- 样式3 -->
-                            <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-tag" v-if="pros.product.actStatus==1">
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
@@ -1333,7 +1333,7 @@
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
                               <div class="price"><span>￥</span>
-                                <span class="p-icon" :class="'i'+pros.product.price1Grade"></span>
+                                <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                               </div>
                             </template>
                           </template>
@@ -1343,7 +1343,7 @@
                           <div class="price-tag"></div>
                           <div class="price" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>
                           <div class="price" v-else>
-                            <span>￥{{ pros.product.retailPrice | NumFormat }}</span>
+                            <span>￥{{ pros.product.price | NumFormat }}</span>
                           </div>
                         </template>
                       </template>
@@ -1355,7 +1355,7 @@
                           </div>
                           <div class="price">
                             <span>￥</span>
-                            <span class="p-icon" :class="'i'+pros.product.price1Grade"></span>
+                            <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                           </div>
                         </template>
                         <!-- 样式7 -->
@@ -1398,7 +1398,7 @@
                       <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                         <template v-if="pros.product.productCategory==1">
                           <!-- 样式1 价格未公开-->
-                          <template v-if="pros.product.price1TextFlag==1">
+                          <template v-if="pros.product.priceFlag==1">
                             <div class="price-tag">
                               <span class="tag" v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
                             </div>
@@ -1407,22 +1407,22 @@
                           <template v-else>
                             <!-- 样式2-->
                             <template
-                              v-if="(pros.product.price1TextFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
+                              v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                               <div class="price-tag">
                                 <span class="tag" 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 && PromotionsFormat(pros.product.promotions)">:￥{{pros.product.price | NumFormat}}</span>
                                 </span>
                               </div>
                               <div class="price" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
                                 <span>
-                                  ￥{{(PromotionsFormat(pros.product.promotions) ? pros.product.price1
-                                  : pros.product.retailPrice) | NumFormat }}
+                                  ￥{{(PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice
+                                  : pros.product.price) | NumFormat }}
                                 </span>
                               </div>
                             </template>
                             <!-- 样式3 -->
-                            <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-tag" v-if="pros.product.actStatus==1">
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
@@ -1434,7 +1434,7 @@
                                 <span class="tag">{{pros.product.promotions.name}}</span>
                               </div>
                               <div class="price"><span>￥</span>
-                                <span class="p-icon" :class="'i'+pros.product.price1Grade"></span>
+                                <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                               </div>
                             </template>
                           </template>
@@ -1444,7 +1444,7 @@
                           <div class="price-tag"></div>
                           <div class="price" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊</div>
                           <div class="price" v-else>
-                            <span>￥{{ pros.product.retailPrice | NumFormat }}</span>
+                            <span>￥{{ pros.product.price | NumFormat }}</span>
                           </div>
                         </template>
                       </template>
@@ -1456,7 +1456,7 @@
                           </div>
                           <div class="price">
                             <span>￥</span>
-                            <span class="p-icon" :class="'i'+pros.product.price1Grade"></span>
+                            <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                           </div>
                         </template>
                         <!-- 样式7 -->
@@ -1509,7 +1509,7 @@
                             <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                               <template v-if="pros.product.productCategory==1">
                                 <!-- 样式1 价格未公开-->
-                                <template v-if="pros.product.price1TextFlag==1">
+                                <template v-if="pros.product.priceFlag==1">
                                   <div class="price-tag">
                                     <span class="tag"
                                       v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
@@ -1519,23 +1519,23 @@
                                 <template v-else>
                                   <!-- 样式2-->
                                   <template
-                                    v-if="(pros.product.price1TextFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
+                                    v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                                     <div class="price-tag">
                                       <span class="tag" v-if="pros.product.actStatus==1">
                                         {{pros.product.promotions.name}}
-                                        <span v-if="pros.priceFlag != 1">:￥{{pros.product.retailPrice |
+                                        <span v-if="pros.priceFlag != 1 && PromotionsFormat(pros.product.promotions)">:￥{{pros.product.price |
                                           NumFormat}}</span>
                                       </span>
                                     </div>
                                     <div class="price" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
                                       <span>
-                                        ￥{{(PromotionsFormat(pros.product.promotions) ? pros.product.price1
-                                        : pros.product.retailPrice) | NumFormat }}
+                                        ￥{{(PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice
+                                        : pros.product.price) | NumFormat }}
                                       </span>
                                     </div>
                                   </template>
                                   <!-- 样式3 -->
-                                  <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-tag" v-if="pros.product.actStatus==1">
                                       <span class="tag">{{pros.product.promotions.name}}</span>
                                     </div>
@@ -1547,7 +1547,7 @@
                                       <span class="tag">{{pros.product.promotions.name}}</span>
                                     </div>
                                     <div class="price"><span>￥</span>
-                                      <span class="p-icon" :class="'i'+pros.product.price1Grade"></span>
+                                      <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                                     </div>
                                   </template>
                                 </template>
@@ -1558,7 +1558,7 @@
                                 <div class="price" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊
                                 </div>
                                 <div class="price" v-else>
-                                  <span>￥{{ pros.product.retailPrice | NumFormat }}</span>
+                                  <span>￥{{ pros.product.price | NumFormat }}</span>
                                 </div>
                               </template>
                             </template>
@@ -1571,7 +1571,7 @@
                                 </div>
                                 <div class="price">
                                   <span>￥</span>
-                                  <span class="p-icon" :class="'i'+pros.product.price1Grade"></span>
+                                  <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                                 </div>
                               </template>
                               <!-- 样式7 -->
@@ -1615,7 +1615,7 @@
                             <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                               <template v-if="pros.product.productCategory==1">
                                 <!-- 样式1 价格未公开-->
-                                <template v-if="pros.product.price1TextFlag==1">
+                                <template v-if="pros.product.priceFlag==1">
                                   <div class="price-tag">
                                     <span class="tag"
                                       v-if="pros.product.actStatus==1">{{pros.product.promotions.name}}</span>
@@ -1625,23 +1625,23 @@
                                 <template v-else>
                                   <!-- 样式2-->
                                   <template
-                                    v-if="(pros.product.price1TextFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
+                                    v-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                                     <div class="price-tag">
                                       <span class="tag" v-if="pros.product.actStatus==1">
                                         {{pros.product.promotions.name}}
-                                        <span v-if="pros.priceFlag != 1">:￥{{pros.product.retailPrice |
+                                        <span v-if="pros.priceFlag != 1 && PromotionsFormat(pros.product.promotions)">:￥{{pros.product.price |
                                           NumFormat}}</span>
                                       </span>
                                     </div>
                                     <div class="price" :class="PromotionsFormat(pros.product.promotions) ? 'none' : ''">
                                       <span>
-                                        ￥{{(PromotionsFormat(pros.product.promotions) ? pros.product.price1
-                                        : pros.product.retailPrice) | NumFormat }}
+                                        ￥{{(PromotionsFormat(pros.product.promotions) ? pros.product.originalPrice
+                                        : pros.product.price) | NumFormat }}
                                       </span>
                                     </div>
                                   </template>
                                   <!-- 样式3 -->
-                                  <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-tag" v-if="pros.product.actStatus==1">
                                       <span class="tag">{{pros.product.promotions.name}}</span>
                                     </div>
@@ -1653,7 +1653,7 @@
                                       <span class="tag">{{pros.product.promotions.name}}</span>
                                     </div>
                                     <div class="price"><span>￥</span>
-                                      <span class="p-icon" :class="'i'+pros.product.price1Grade"></span>
+                                      <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                                     </div>
                                   </template>
                                 </template>
@@ -1664,7 +1664,7 @@
                                 <div class="price" v-if="pros.product.detailTalkFlag == '2'">￥价格详聊
                                 </div>
                                 <div class="price" v-else>
-                                  <span>￥{{ pros.product.retailPrice | NumFormat }}</span>
+                                  <span>￥{{ pros.product.price | NumFormat }}</span>
                                 </div>
                               </template>
                             </template>
@@ -1677,7 +1677,7 @@
                                 </div>
                                 <div class="price">
                                   <span>￥</span>
-                                  <span class="p-icon" :class="'i'+pros.product.price1Grade"></span>
+                                  <span class="p-icon" :class="'i'+pros.product.priceGrade"></span>
                                 </div>
                               </template>
                               <!-- 样式7 -->

src/main/resources/templates/components/foot-link.html

@@ -3,7 +3,7 @@
 <script charset="utf-8" type="text/javascript" src="/lib/swiper.min.js"></script>
 <script charset="utf-8" type="text/javascript" src="/lib/viewer.min.js"></script>
 <script charset="utf-8" type="text/javascript" src="/lib/jquery-confirm.min.js"></script>
-<script charset="utf-8" type="text/javascript" src="/lib/vue2.6.11.min.js"></script>
+<script charset="utf-8" type="text/javascript" src="/lib/vue2.6.12.min.js"></script>
 <script charset="utf-8" type="text/javascript" src="/lib/lazyload.js"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/ajax.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/utils.service.js(v=${version})}"></script>

src/main/resources/templates/document/components/document-link.html

@@ -3,7 +3,7 @@
 <script charset="utf-8" type="text/javascript" src="/lib/swiper.min.js"></script>
 <script charset="utf-8" type="text/javascript" src="/lib/viewer.min.js"></script>
 <script charset="utf-8" type="text/javascript" src="/lib/jquery-confirm.min.js"></script>
-<script charset="utf-8" type="text/javascript" src="/lib/vue2.6.11.min.js"></script>
+<script charset="utf-8" type="text/javascript" src="/lib/vue2.6.12.min.js"></script>
 <script charset="utf-8" type="text/javascript" src="/lib/lazyload.js"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/locallhostAjax.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/utils.js(v=${version})}"></script>

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

@@ -28,7 +28,7 @@
     <div v-else class="equipmentList">
         <ul class="clear mfw">
             <li class="equipmentItem" v-for="ins in listData">
-                <a :href="'/equipment/'+ins.id+'.html" target="_blank">
+                <a :href="'/equipment-'+ins.id+'.html'" target="_blank">
                     <img src="/img/base/placeholder.png" :data-original="ins.image">
                     <span class="name" v-html="ins.name"></span>
                 </a>

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

@@ -65,7 +65,7 @@
                             <span class="infotag sold" v-if="item.sold==1&&item.newAdded==1||item.sold==1&&item.newAdded==0">已售</span>
                             <span class="infotag other" v-if="item.brandID==161&&item.brandName!=''&&item.brandName!=null">{{item.brandName}}</span>
                         </div>
-                        <a class="productname" :href="'/flea-market-'+item.productID+'.html'">
+                        <a class="productname" :href="'/flea-market-'+item.productId+'.html'">
                             {{item.name}}
                         </a>
                         <div class="targetprice">

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

@@ -40,7 +40,7 @@
             </div>
             <div class="detailBox" th:object="${product}">
                 <div class="crumbs">
-                    <span>所属分类：{{ productTypeName }}</span>
+                    <span v-text="'所属分类：'+productTypeName"></span>
                 </div>
                 <div class="Beautyfair">
                     <span class="tag" v-if="beautyActFlag==1">美博会</span>
@@ -72,7 +72,7 @@
                     </div>
                     <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0 && priceObj.normalPrice>0 && ((priceObj.priceFlag==0 && priceObj.userIdentity!=3) || (priceObj.priceFlag==2 && priceObj.userIdentity==2) || (priceObj.userIdentity==3 && priceObj.shopId==GLOBAL_SHOP_ID))">
                         <div class="row"> <span class="l">市场价</span><i>：</i>
-                             <em><del>￥{{priceObj.normalPrice.toFixed(2)}}</del></em>
+                             <em><del v-text="'￥'+priceObj.normalPrice.toFixed(2)"></del></em>
                         </div>
                     </template>
                     <div class="row actStatus" v-if="priceObj.actStatus==1||priceObj.ladderPriceFlag==1" ><span class="l">促销</span><i>：</i>
@@ -131,8 +131,8 @@
                                         <p class="c"><a class="close" @click="hideThisLadder($event)" href="JavaScript:void(0);">了解</a></p>
                                     </div>
                                     <div v-else>
-                                        <p v-if="priceObj.ladderPriceFlag==1"><em @click="toLogin">升级会员</em>，享受阶梯价格优惠</p>
-                                        <p v-if="priceObj.actStatus==1"><em @click="toLogin">升级会员</em>，参与促销活动</p>
+                                        <p v-if="priceObj.ladderPriceFlag==1 && priceObj.userIdentity==4"><em @click="toUpgrade">升级会员</em>，享受阶梯价格优惠</p>
+                                        <p v-if="priceObj.actStatus==1 && priceObj.userIdentity==4"><em @click="toUpgrade">升级会员</em>，参与促销活动</p>
                                         <p class="c"><a class="close" @click="hideThisLadder($event)" href="JavaScript:void(0);">了解</a></p>
                                     </div>
                                 </div>

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

@@ -32,19 +32,19 @@
             <div class="classification">
                 <div class="class-title">分类</div>
                 <div class="class-nav-main">
-                    <div v-for="item in classify" @click="checkedClasslyFn(item,1)" :class="{'on':item.bigTypeId == bigTypeID}">{{item.name}}</div>
+                    <div v-for="item in classify" @click="checkedClasslyFn(item,1)" :class="{'on':item.bigTypeId == bigTypeId}">{{item.name}}</div>
                 </div>
             </div>
             <div class="classification" v-if="smalltypeList!='' && smalltypeList!=null">
                 <div class="class-title">二级</div>
                 <div class="class-nav-main">
-                    <div v-for="item in smalltypeList" @click="checkedClasslyFn(item,2)" :class="{'on':item.smallTypeId == smallTypeID}">{{item.name}}</div>
+                    <div v-for="item in smalltypeList" @click="checkedClasslyFn(item,2)" :class="{'on':item.smallTypeId == smallTypeId}">{{item.name}}</div>
                 </div>
             </div>
-            <div class="classification" v-if="params.smallTypeID!=''&& tinytypeList!=''&& tinytypeList!=null">
+            <div class="classification" v-if="params.smallTypeId!=''&& tinytypeList!=''&& tinytypeList!=null">
                 <div class="class-title">三级</div>
                 <div class="class-nav-main">
-                    <div v-for="item in tinytypeList" @click="checkedClasslyFn(item,3)" :class="{'on':item.tinyTypeId == tinyTypeID}">{{item.name}}</div>
+                    <div v-for="item in tinytypeList" @click="checkedClasslyFn(item,3)" :class="{'on':item.tinyTypeId == tinyTypeId}">{{item.name}}</div>
                 </div>
             </div>
         </template>

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

@@ -2,12 +2,12 @@
 <html lang="zh-CN" xmlns:th="https://www.thymeleaf.org" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="https://www.thymeleaf.org ">
 <head>
-    <title>采美365网-仪器</title>
+    <title th:text="'采美365网-'+${pageTitle}">采美365网-产品/仪器</title>
     <template th:replace="components/head-link"></template>
     <link th:href="@{/css/product/instruement.css(v=${version})}" rel="stylesheet" type="text/css">
     <template th:replace="components/analysis"></template>
 </head>
-<body >
+<body>
     <!-- 引用头部 -->
     <template th:replace="components/header"></template>
     <div id="container">

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

@@ -13,53 +13,59 @@
 
 <!-- 商品列表 -->
 <div id="productList">
-    <template v-if="isPC && listData && listData.length>0">
-        <!-- 面包屑 -->
-        <div v-if="searchFlag" class="crumbs">
-            <span>搜索结果</span>
-            <span>&gt;</span> <a href="javascript:void(0);" @click="toPagination(1)" v-text="params.keyword"></a>
-        </div>
-        <div v-else class="crumbs">
-            <a href="/">首页</a>
-            <template v-if="params.bid && params.bid>0">
-                <template v-if="params.sid && params.sid>0">
-                    <span>&gt;</span> <a :href="'/product/list.html?category='+params.bid+'-0-0'" v-text="bigType"></a>
-                    <template v-if="params.tid && params.tid>0">
-                        <span>&gt;</span> <a :href="'/product/list.html?category='+params.bid+'-'+params.sid+'-0'" v-text="smallType"></a>
-                        <span>&gt;</span> <span v-text="tinyType"></span>
-                    </template>
-                    <template v-else>
-                        <span>&gt;</span> <span v-text="smallType"></span>
-                    </template>
-                </template>
-                <template v-else>
-                    <span>&gt;</span> <span v-text="bigType"></span>
-                </template>
-            </template>
-        </div>
-        <!--分类-->
-        <div v-if="(!searchFlag)" id="listClassify" class="classifyBox">
-            <div class="clsTab">
-                <template v-for="(big,i) in classify">
-                    <a :class="{'on': params.bid==big.bigTypeID}" v-if="big.validFlag==1" href="javascript:void(0);" v-text="big.name"></a>
-                </template>
-            </div>
-            <div class="clsCon">
-                <div class="tabItem" v-for="big in classify" :bid="big.bigTypeID" style="display: none;">
-                    <div class="line" :class="{'on': params.sid==small.smallTypeID}" v-for="small in big.smalltypeList" v-if="small.validFlag==1">
-                        <div class="lft" :class="{'on': params.sid==small.smallTypeID}">
-                            <a :href="'/product/list.html?category='+big.bigTypeID+'-'+small.smallTypeID+'-0'" v-text="small.name"></a>
-                        </div>
-                        <div class="rgt">
-                            <template v-for="tiny in small.tinytypeList">
-                                <a v-if="tiny.validFlag==1" :class="{'on': params.tid==tiny.tinyTypeID}" :href="'/product/list.html?category='+big.bigTypeID+'-'+small.smallTypeID+'-'+tiny.tinyTypeID" v-text="tiny.name"></a>
-                            </template>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </template>
+    <!-- 面包屑 -->
+    <div v-if="isPC && listData && listData.length>0" class="crumbs">
+        <span>搜索结果</span>
+        <span>&gt;</span> <a href="javascript:void(0);" @click="toPagination(1)" v-text="params.keyword"></a>
+    </div>
+
+<!--    <template v-if="isPC && listData && listData.length>0">-->
+<!--        &lt;!&ndash; 面包屑 &ndash;&gt;-->
+<!--        <div v-if="searchFlag" class="crumbs">-->
+<!--            <span>搜索结果</span>-->
+<!--            <span>&gt;</span> <a href="javascript:void(0);" @click="toPagination(1)" v-text="params.keyword"></a>-->
+<!--        </div>-->
+<!--        <div v-else class="crumbs">-->
+<!--            <a href="/">首页</a>-->
+<!--            <template v-if="params.bid && params.bid>0">-->
+<!--                <template v-if="params.sid && params.sid>0">-->
+<!--                    <span>&gt;</span> <a :href="'/product/list.html?category='+params.bid+'-0-0'" v-text="bigType"></a>-->
+<!--                    <template v-if="params.tid && params.tid>0">-->
+<!--                        <span>&gt;</span> <a :href="'/product/list.html?category='+params.bid+'-'+params.sid+'-0'" v-text="smallType"></a>-->
+<!--                        <span>&gt;</span> <span v-text="tinyType"></span>-->
+<!--                    </template>-->
+<!--                    <template v-else>-->
+<!--                        <span>&gt;</span> <span v-text="smallType"></span>-->
+<!--                    </template>-->
+<!--                </template>-->
+<!--                <template v-else>-->
+<!--                    <span>&gt;</span> <span v-text="bigType"></span>-->
+<!--                </template>-->
+<!--            </template>-->
+<!--        </div>-->
+<!--        &lt;!&ndash;分类&ndash;&gt;-->
+<!--        <div v-if="(!searchFlag)" id="listClassify" class="classifyBox">-->
+<!--            <div class="clsTab">-->
+<!--                <template v-for="(big,i) in classify">-->
+<!--                    <a :class="{'on': params.bid==big.bigTypeID}" v-if="big.validFlag==1" href="javascript:void(0);" v-text="big.name"></a>-->
+<!--                </template>-->
+<!--            </div>-->
+<!--            <div class="clsCon">-->
+<!--                <div class="tabItem" v-for="big in classify" :bid="big.bigTypeID" style="display: none;">-->
+<!--                    <div class="line" :class="{'on': params.sid==small.smallTypeID}" v-for="small in big.smalltypeList" v-if="small.validFlag==1">-->
+<!--                        <div class="lft" :class="{'on': params.sid==small.smallTypeID}">-->
+<!--                            <a :href="'/product/list.html?category='+big.bigTypeID+'-'+small.smallTypeID+'-0'" v-text="small.name"></a>-->
+<!--                        </div>-->
+<!--                        <div class="rgt">-->
+<!--                            <template v-for="tiny in small.tinytypeList">-->
+<!--                                <a v-if="tiny.validFlag==1" :class="{'on': params.tid==tiny.tinyTypeID}" :href="'/product/list.html?category='+big.bigTypeID+'-'+small.smallTypeID+'-'+tiny.tinyTypeID" v-text="tiny.name"></a>-->
+<!--                            </template>-->
+<!--                        </div>-->
+<!--                    </div>-->
+<!--                </div>-->
+<!--            </div>-->
+<!--        </div>-->
+<!--    </template>-->
     <!--loading-->
     <div v-if="listLoading" class="loading">
         <img src="/img/base/loading.gif">

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

@@ -28,10 +28,10 @@
     <ul v-else class="supplierList">
         <li class="supplierItem clear" v-for="shop in listData">
             <div class="left">
-                <a :href="'/supplier-'+shop.id+'.html'" target="_blank" class="logo">
+                <a :href="'/supplier-'+shop.shopId+'.html'" target="_blank" class="logo">
                     <img :src="shop.logo" onerror="javascript:this.src='/img/default/suppliver.jpg';">
                 </a>
-                <h5><a :href="'/supplier-'+shop.id+'.html'" :title="shop.name" target="_blank">
+                <h5><a :href="'/supplier-'+shop.shopId+'.html'" :title="shop.name" target="_blank">
                     <span v-html="shop.name"></span>
                 </a>
                 <a v-if="shop.license" :href="shop.license" target="_blank" class="icon mIcon shop"></a>
@@ -55,7 +55,7 @@
                     </template>
                     <li v-else-if="isPC" v-for="i in 3"></li>
                 </ul>
-                <a v-if="isPC" :href="'/supplier-'+shop.id+'.html'" target="_blank" class="four">进入本店铺>>></a>
+                <a v-if="isPC" :href="'/supplier-'+shop.shopId+'.html'" target="_blank" class="four">进入本店铺>>></a>
             </div>
         </li>
     </ul>