接口调用

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

@@ -4,15 +4,15 @@ spring:
   #数据源连接--start
   datasource:
     #本地连接数据库
-    #driverClassName: com.mysql.jdbc.Driver
-    #url: jdbc:mysql://192.168.2.100:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
-    #username: developer
-    #password: 05bZ/OxTB:X+yd%1
-    #测试连接数据库
-    url: jdbc:mysql://120.79.25.27:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+    driverClassName: com.mysql.jdbc.Driver
+    url: jdbc:mysql://192.168.2.100:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
     username: developer
-    password: J5p3tgOVazNl4ydf
-    type: com.zaxxer.hikari.HikariDataSource
+    password: 05bZ/OxTB:X+yd%1
+    #测试连接数据库
+    #url: jdbc:mysql://120.79.25.27:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+    #username: developer
+    #password: J5p3tgOVazNl4ydf
+    #type: com.zaxxer.hikari.HikariDataSource
     hikari:
       minimum-idle: 5
       maximum-pool-size: 15
@@ -54,10 +54,10 @@ logging:
 # 服务域名
 caimei:
   siteEnv: 0 #网站环境，（2：正式环境，1：测试环境，0：开发环境）
-  spiServer: https://spi-b.caimei365.com
-#  spiServer: http://192.168.2.67:8008
-  coreServer: https://core-b.caimei365.com
-#  coreServer: http://192.168.2.67:18002
+  #spiServer: https://spi-b.caimei365.com
+  spiServer: http://192.168.2.68:8008
+  #coreServer: https://core-b.caimei365.com
+  coreServer: http://192.168.2.68:18002
   imageDomain: https://img-b.caimei365.com
   wwwDomain: http:localhost:8009
   destPath: D:/_PLAN_WORKSPACE/test/static

src/main/resources/static/css/base/floor.css

@@ -32,6 +32,7 @@
 .section_page .page_main_price .main_price_text{width:100%;height:54px;float:left;box-sizing:border-box}
 .section_page .page_main_price .main_price_unde{width:100%;height:31px;line-height:31px;font-size:14px;color:#4a4f58;text-align:left;float:left}
 .section_page .page_main_price .main_price_show{width:100%;height:30px;line-height:30px;font-size:14px;color:#f94b4b;text-align:left;float:left}
+.section_page .page_main_price .main_price_show del{color: #B8BFCA}
 .section_page .page_main_price .main_price_show.none{color:#999999;text-decoration:line-through}
 .section_page .page_main_price .section_page .page_main_price .main_price_show.none{display:none}
 .section_page .page_main_price .price_text_tag{width:100%;height:22px;box-sizing:border-box;float:left;margin-top:0px}
@@ -49,6 +50,10 @@
 .section_page .page_main_price .price_grade_3:before{background-position:0 -774px}
 .section_page .page_main_price .price_grade_4:before{background-position:0 -804px}
 .section_page .page_main_price .price_grade_5:before{background-position:0 -834px}
+/*标签缩小*/
+.section_page .page_main_price .price_text_tag {-webkit-transform: scale(0.8) translateX(-18px);-ms-transform: scale(0.8) translateX(-18px);transform: scale(0.8) translateX(-18px)}
+.section_page .page_main_price .price_text_tag .svip-tag,
+.section_page .page_main_price .price_text_tag .listTag{-webkit-transform: translateX(4px);-ms-transform: translateX(4px);transform: translateX(4px)}
 /*会员标签*/
 .section_page .page_main_price .price_text_tag .svip-tag{width:100%;height:22px;letter-spacing:0}
 .section_page .page_main_price .price_text_tag .svip-tag .svip-icon{position:relative;z-index:9;display:inline-block;width:30px;height:22px;text-align:center;line-height:22px;font-size:12px;font-weight:400;color:#F0CB72;opacity:1;background:#333333}
@@ -91,6 +96,7 @@
 .section_page .page_main_price{width:100%;box-sizing:border-box;padding:0 1.5vw}
 .section_page .page_main_price .price_text_tag{width:100%;box-sizing:border-box;float:left;margin-top: 1.2vw}
 .section_page .page_main_price .main_price_show{color:#f94b4b}
+.section_page .page_main_price .main_price_show del{color: #B8BFCA}
 .section_page .page_main_price .section_page .page_main_price .main_price_show.none{display:none}
 .section_page .page_main_price .main_price_unde{width:100%;height:6.5vw;line-height:6.5vw;font-size:3.4vw;color:#4a4f58;text-align:left;float:left}
 .section_page .page_main_price .price_text_tag .couponTag{padding:0 0.5vw;border:.27vw solid #f94b4b;background:#fff1eb;font-size:2.8vw;float:left;height:4.2vw;line-height:4.2vw;color: #f94b4b;border-radius: 0.2vw;margin-right: 0.8vw;}
@@ -139,6 +145,9 @@
 .section_page .page_main_tag{color:#9aa5b5;margin:1vw 3.2vw;border:.27vw solid #e3ebf7;display:inline-block;padding:0 1.3vw;border-radius:.54vw}
 .section_page .page_main_price .bold{font-weight:bold}
 /*会员标签*/
+.section_page .page_main_price .price_text_tag {-webkit-transform: scale(0.8) translateX(-4.2vw);-ms-transform: scale(0.8) translateX(-4.2vw);transform: scale(0.8) translateX(-4.2vw)}
+.section_page .page_main_price .price_text_tag .svip-tag,
+.section_page .page_main_price .price_text_tag .listTag{-webkit-transform: translateX(1.2vw);-ms-transform: translateX(1.2vw);transform: translateX(1.2vw)}
 .section_page .page_main_price .price_text_tag .svip-tag{float: left; height:4.74vw;letter-spacing:0;overflow: hidden}
 .section_page .page_main_price .price_text_tag .svip-tag .svip-icon{position:relative;z-index:9;float: left; width:9.8vw;height:4.74vw;text-align:center;line-height:4.74vw;font-size:2.8vw;font-weight:400;color:#F0CB72;opacity:1;background:#333333}
 .section_page .page_main_price .price_text_tag .svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}
@@ -146,6 +155,7 @@
 .section_page .page_main_price .price_text_tag .svip-tag .svip-price span{color: #333}
 .section_page .page_main_price .price_text_tag .svip-tag .svip-price span:nth-child(2){margin-left: -0.4vw}
 
+
 #recommendBox{width: calc(100%);height:150vw;overflow:hidden;position:relative;}
 #recommendBox .swiper-pagination{width:100%;height:2.6vw;z-index:1;text-align:center;font-size:0;position:absolute;bottom:2.6vw;left:0}
 #recommendBox .swiper-pagination .swiper-pagination-bullet{display:block;width:2vw;border-width:1vw 1px;border-color:transparent;cursor:pointer;background:none;font-size:0;opacity:.2}

src/main/resources/static/css/product/detail.h5.css

@@ -25,6 +25,7 @@ li{list-style:none}
 .productBox .detailBox .row>i{font-style:normal;margin-right:2vw}
 .productBox .detailBox .row>em{font-style:normal;color:#4A4F58}
 .productBox .detailBox .row>em.p{font-weight:bold;}
+.productBox .detailBox .row>em del{color: #93979F}
 .productBox .detailBox .row>em.ser{color:#93979F;display:inline-block;width: 24%}
 .productBox .detailBox .row>em.ser:before{content:'\2713';display:inline-block;width:3.4vw;height:3.4vw;text-align:center;line-height:3.4vw;font-size:3.4vw;background:#E15616;border-radius:1.7vw;color:#FFF;margin-right:1.4vw}
 .productBox .detailBox .row .coupon-tags{display: inline-block;box-sizing: border-box;line-height: 5vw;}

src/main/resources/static/css/product/detail.pc.css

@@ -36,6 +36,7 @@ li{list-style:none;}
 .productBox .detailBox .row .l:after{content:'';display:inline-block;width:100%}
 .productBox .detailBox .row>i{font-style:normal;}
 .productBox .detailBox .row>em{font-style:normal;color:#333333;margin-left: 15px}
+.productBox .detailBox .row>em del{color: #93979F}
 .productBox .detailBox .row>em.p{font-weight:bold;}
 .productBox .detailBox .row>em.ser{color:#93979F;display:inline-block;margin-right:20px;}
 .productBox .detailBox .row>em.ser:before{width:20px;height:20px;margin-right:5px;background-position:-60px 0;vertical-align:text-top;}
@@ -59,7 +60,7 @@ li{list-style:none;}
 .productBox .detailBox .price .svip-tag .svip-icon{position:relative;z-index:9;display:inline-block;width:36px;height:22px;text-align:center;line-height:22px;font-size:12px;font-weight:400;color:#F0CB72;opacity:1;background:#333333}
 .productBox .detailBox .price .svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}
 .productBox .detailBox .price .svip-tag .svip-price{z-index:1;position:relative;display:inline-block;padding-left:22px;padding-right:4px;margin-left:-27px;line-height:22px;background:#F0CB72;opacity:1;border-radius:2px;font-size:14px}
-.productBox .detailBox .price .svip-tag .svip-price span{color: #333}
+.productBox .detailBox .price .svip-tag .svip-price span{color: #333;margin-left: 4px}
 
 .productBox .detailBox .number{display:inline-block;width:96px;line-height:24px;height:24px;box-sizing:border-box;border:1px solid #FFE6DC;border-radius:2px;font-size:0;white-space:nowrap;text-align:center;overflow:hidden;vertical-align:top;}
 .productBox .detailBox .number>em{display:inline-block;width:24px;height:22px;background:#FFE6DC;font-size:20px;font-style:normal;line-height:20px;vertical-align:top;cursor:pointer}

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

@@ -1,3 +1,5 @@
+.productItem .price .price_text_tag{-webkit-transform: scale(0.8) translateX(-20px);-ms-transform: scale(0.8) translateX(-20px);transform: scale(0.8) translateX(-20px)}
+
 @media screen and (min-width:768px){
     #productList{width: 1184px;margin:32px auto}
     .crumbs-nav{height: 40px}
@@ -47,6 +49,9 @@
     .productItem .price .main_price_show.none { color: #999999; text-decoration: line-through;}
     .productItem .name .tag{width: 44px;height: 18px;line-height: 18px;font-size: 12px;display: inline-block;margin-right: 5px;text-align: center;color: #FFFFFF !important;background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);border-radius: 0px 10px 0px 0px;}
     /*会员标签*/
+    .productItem .price .price_text_tag {-webkit-transform: scale(0.8) translateX(-18px);-ms-transform: scale(0.8) translateX(-18px);transform: scale(0.8) translateX(-18px)}
+    .productItem .price .price_text_tag .svip-tag,
+    .productItem .price .price_text_tag .listTag{-webkit-transform: translateX(4px);-ms-transform: translateX(4px);transform: translateX(4px)}
     .productItem .price .price_text_tag .svip-tag{width:100%;height:22px;letter-spacing:0}
     .productItem .price .price_text_tag .svip-tag .svip-icon{position:relative;z-index:9;display:inline-block;width:30px;height:22px;text-align:center;line-height:22px;font-size:12px;font-weight:400;color:#F0CB72;opacity:1;background:#333333}
     .productItem .price .price_text_tag .svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}
@@ -90,6 +95,9 @@
     .productItem .price .main_price_show{color: #f94b4b}
     .productItem .name span.tag{width: 11.3vw;height: 4.3vw;line-height: 4.3vw;font-size: 2.8vw;display: inline-block;margin-right: 1.3vw;text-align: center;color: #FFFFFF !important;background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);border-radius: 0px 10px 0px 0px;margin-top: .25vw;}
     /*会员标签*/
+    .productItem .price .price_text_tag {-webkit-transform: scale(0.8) translateX(-4.2vw);-ms-transform: scale(0.8) translateX(-4.2vw);transform: scale(0.8) translateX(-4.2vw)}
+    .productItem .price .price_text_tag .svip-tag,
+    .productItem .price .price_text_tag .listTag{-webkit-transform: translateX(1.2vw);-ms-transform: translateX(1.2vw);transform: translateX(1.2vw)}
     .productItem .price .price_text_tag .svip-tag{float: left; height:4.74vw;letter-spacing:0;overflow: hidden}
     .productItem .price .price_text_tag .svip-tag .svip-icon{position:relative;z-index:9;float: left; width:9.8vw;height:4.74vw;text-align:center;line-height:4.74vw;font-size:2.8vw;font-weight:400;color:#F0CB72;opacity:1;background:#333333}
     .productItem .price .price_text_tag .svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}

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

@@ -50,6 +50,9 @@ li{list-style:none}
     .listTitle p em{color:#e15616;font-style:normal;display:inline-block;height:24px;line-height:24px;padding:0 10px;background:#FFF}
     .productItem .name span.tag{width: 44px;height: 18px;line-height: 18px;font-size: 12px;display: inline-block;margin-right: 5px;text-align: center;color: #FFFFFF !important;background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);border-radius: 0px 10px 0px 0px;margin-top: 2px;}
     /*会员标签*/
+    .productItem .price .price_text_tag {-webkit-transform: scale(0.8) translateX(-18px);-ms-transform: scale(0.8) translateX(-18px);transform: scale(0.8) translateX(-18px)}
+    .productItem .price .price_text_tag .svip-tag,
+    .productItem .price .price_text_tag .listTag{-webkit-transform: translateX(4px);-ms-transform: translateX(4px);transform: translateX(4px)}
     .productItem .price .svip-tag{width:100%;height:22px;letter-spacing:0}
     .productItem .price .svip-tag .svip-icon{position:relative;z-index:9;display:inline-block;width:30px;height:22px;text-align:center;line-height:22px;font-size:12px;font-weight:400;color:#F0CB72;opacity:1;background:#333333}
     .productItem .price .svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}
@@ -100,6 +103,9 @@ li{list-style:none}
     .listTitle p em{color:#e15616;font-style:normal;display:inline-block;height:4.8vw;line-height:4.8vw;padding:0 1.5vw;background:#FFF}
 
     /*会员标签*/
+    .productItem .price .price_text_tag {-webkit-transform: scale(0.8) translateX(-4.2vw);-ms-transform: scale(0.8) translateX(-4.2vw);transform: scale(0.8) translateX(-4.2vw)}
+    .productItem .price .price_text_tag .svip-tag,
+    .productItem .price .price_text_tag .listTag{-webkit-transform: translateX(1.2vw);-ms-transform: translateX(1.2vw);transform: translateX(1.2vw)}
     .productItem .price .svip-tag{float: left; height:4.74vw;letter-spacing:0;overflow: hidden}
     .productItem .price .svip-tag .svip-icon{position:relative;z-index:9;float: left; width:9.8vw;height:4.74vw;text-align:center;line-height:4.74vw;font-size:2.8vw;font-weight:400;color:#F0CB72;opacity:1;background:#333333}
     .productItem .price .svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}

src/main/resources/static/css/shopping/shopping.css

@@ -2,6 +2,7 @@
 li{list-style:none}
 .addressWrap input[type=checkbox]:after{color:#1890f9;border-color:#1890f9;}
 .addressWrap input[type=checkbox]:checked:after{background:#1890f9;border-color:#1890f9;color:#FFF;}
+
 /**
  * PC端
  */

src/main/resources/static/css/supplier/index.css

@@ -1,9 +1,12 @@
 @charset "utf-8";
 li{list-style:none}
+
+
 /**
  * PC端
  */
 @media screen and (min-width:768px){
+
     #supplierBanner{width:100%;height:358px;margin-top:10px;background:#FFF;overflow:hidden;position:relative}
     #supplierBanner .swiper-wrapper{position:relative;height:100%;z-index:0}
     #supplierBanner .swiper-wrapper li{position:relative;zoom:1;vertical-align:middle;width:100%;overflow:hidden}
@@ -70,6 +73,16 @@ li{list-style:none}
     .productItem .price .price_text_tag{width: 100%;height: 22px;box-sizing: border-box;float: left;margin-top: 3px;}
     .productItem .price .price_text_tag .listTag{margin: 0;float: left}
     .productItem .price .price_text_tag .couponTag{margin: 0 8px 0 0;float: left}
+
+    /*标签缩小*/
+    .productItem .price .price_text_tag {-webkit-transform: scale(0.8) translateX(-18px);-ms-transform: scale(0.8) translateX(-18px);transform: scale(0.8) translateX(-18px)}
+    /*会员标签*/
+    .productItem .price .price_text_tag .svip-tag{width:100%;height:22px;letter-spacing:0}
+    .productItem .price .price_text_tag .svip-tag .svip-icon{position:relative;z-index:9;display:inline-block;width:30px;height:22px;text-align:center;line-height:22px;font-size:12px;font-weight:400;color:#F0CB72;opacity:1;background:#333333}
+    .productItem .price .price_text_tag .svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}
+    .productItem .price .price_text_tag .svip-tag .svip-price{z-index:1;position:relative;display:inline-block;padding-left:22px;padding-right:4px;margin-left:-27px;line-height:22px;background:#F0CB72;opacity:1;border-radius:2px;font-size:12px}
+    .productItem .price .price_text_tag .svip-tag .svip-price span{color: #333}
+
     .productItem .price .main_price_unde { width: 100%;height: 31px;line-height: 31px;font-size: 14px;color: #4a4f58;text-align: left;float: left;}
     .productItem .price .main_price_show { width: 100%;height: 30px;line-height: 30px;font-size: 14px;color: #f94b4b;text-align: left;float: left;}
     .productItem .price .main_price_show.none { color: #999999; text-decoration: line-through;}
@@ -124,13 +137,23 @@ li{list-style:none}
     .productItem .price .mIcon.i4:before {background-position: -84vw -90.7vw;}
     .productItem .price .mIcon {display: inline-block;font-size: 0;height: 5vw;line-height: 5vw;vertical-align: text-bottom;}
     .productItem img {width: 45.6vw;height: 45.6vw;}
-    .productItem .name {display: block;padding: 0 3.2vw;height: 9.3vw;line-height: 4.8vw;font-size: 3.4vw;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;}
-    .price {padding: 2vw 3.2vw;overflow: hidden;}
-    .couponTag{padding:0 2vw;border:.27vw solid #f94b4b;background:#fff1eb;font-size:2.8vw;float:left;height:4.2vw;line-height:4.2vw;color: #f94b4b;border-radius: 0.2vw;margin-right: 1vw;}
+    .productItem .name {display: block;padding: 0 1.6vw;height: 9.3vw;line-height: 4.8vw;font-size: 3.4vw;vertical-align: middle;word-break: break-all;overflow: hidden;text-overflow: ellipsis;display: -webkit-inline-box;-webkit-line-clamp: 2;-webkit-box-orient: vertical;}
+    .price {padding: 2vw 1.6vw;overflow: hidden;}
+    .couponTag{padding:0 0.4vw;border:.27vw solid #f94b4b;background:#fff1eb;font-size:2.8vw;float:left;height:4.2vw;line-height:4.2vw;color: #f94b4b;border-radius: 0.2vw;margin-right: 1.2vw;}
     .listTag{padding:0 2vw;border:.27vw solid #ffe6dc;background:none;font-size:2.8vw;float:left;height:4.2vw;line-height:4.2vw;border-radius: 0.2vw;}
     .price_grade{width: 100%;float: left;margin-top: 2vw;}
     .productItem .price .main_price_unde {width: 100%;height: 6.5vw;line-height: 6.5vw;font-size: 3.4vw;color: #4a4f58;text-align: left;float: left;}
     .productItem .price .price_text_tag {width: 100%;box-sizing: border-box;}
+    /*标签缩小*/
+    .productItem .price .price_text_tag {-webkit-transform: scale(0.8) translateX(-4.2vw);-ms-transform: scale(0.8) translateX(-4.2vw);transform: scale(0.8) translateX(-4.2vw)}
+    /*会员标签*/
+    .productItem .price .price_text_tag .svip-tag{float: left; height:4.74vw;letter-spacing:0;overflow: hidden}
+    .productItem .price .price_text_tag .svip-tag .svip-icon{position:relative;z-index:9;float: left; width:9.8vw;height:4.74vw;text-align:center;line-height:4.74vw;font-size:2.8vw;font-weight:400;color:#F0CB72;opacity:1;background:#333333}
+    .productItem .price .price_text_tag .svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}
+    .productItem .price .price_text_tag .svip-tag .svip-price{z-index:1;position:relative;float: left;padding-left:5.4vw;padding-right:0.6vw;margin-left:-6vw;line-height:4.74vw;height: 4.74vw; background:#F0CB72;opacity:1;border-radius:2px;font-size:2.8vw}
+    .productItem .price .price_text_tag .svip-tag .svip-price span{color: #333}
+    .productItem .price .price_text_tag .svip-tag .svip-price span:nth-child(2){margin-left: -0.4vw}
+
     .productItem .price .main_price_show{color: #f94b4b}
     .productItem .name span.tag{width: 11.3vw;height: 4.3vw;line-height: 4.3vw;font-size: 2.8vw;display: inline-block;margin-right: 1.3vw;text-align: center;color: #FFFFFF !important;background-image: linear-gradient(270deg, #f9c023 0%, #f83600 100%);border-radius: 0px 10px 0px 0px;margin-top: .25vw;}
 }

src/main/resources/static/css/user-center/member/member-product.css

@@ -8,7 +8,7 @@
 .goods-list .goods a:hover{color:unset}
 .goods-list .goods{width:184px;margin-right:16px;margin-bottom:16px;padding-bottom:16px;background:#fff;overflow:hidden;-webkit-transition:all .4s;-o-transition:all .4s;transition:all .4s}
 .goods-list .goods:nth-child(6n){margin-right:0}
-.goods-list .goods .goods-title,.goods-list .goods .goods-tag,.goods-list .goods .page_main_price,.goods-list .goods .svip-price{padding-left:16px !important;padding-right:16px !important}
+.goods-list .goods .goods-title,.goods-list .goods .goods-tag,.goods-list .goods .page_main_price{padding-left:16px !important;padding-right:16px !important}
 .goods-list .goods .page_main_price{width:100%;height:54px;float:left;-webkit-box-sizing:border-box;box-sizing:border-box;padding:0 8px}
 .goods-list .goods .page_main_price .main_price_text{width:100%;height:54px;float:left;-webkit-box-sizing:border-box;box-sizing:border-box}
 .goods-list .goods .page_main_price .main_price_unde{width:100%;height:31px;line-height:31px;font-size:14px;color:#4a4f58;text-align:left;float:left}
@@ -35,21 +35,28 @@
 .goods-list .goods .goods-tag .tag{line-height:20px;font-size:12px;padding:0 2px}
 .goods-list .goods .goods-tag .tag.styl1{color:#F94B4B;background:#FFF1EB;border:1px solid #F94B4B}
 .goods-list .goods .goods-tag .tag.styl2{color:#E15616;background:#FFF1EB;border:1px solid #F94B4B}
-.goods-list .goods .svip-price{position:relative;height:20px;-webkit-box-sizing:border-box;box-sizing:border-box}
-.goods-list .goods .svip-price > span{display:block}
-.goods-list .goods .svip-price .amount{display:inline-block;font-size:14px;font-weight:400;line-height:20px;color:#333333;background:#F0CB72;padding-left:40px;padding-right:6px;-webkit-box-sizing:border-box;box-sizing:border-box;border-radius:2px}
-.goods-list .goods .svip-price .svip-icon{position:absolute;left:16px;top:0;width:36px;height:20px;background:#333333;font-size:12px;line-height:20px;color:#F0CB72;border-radius:2px;text-align:center}
+/*标签缩小*/
+.section_page .page_main_price .price_text_tag {-webkit-transform: scale(0.8) translateX(-18px);-ms-transform: scale(0.8) translateX(-18px);transform: scale(0.8) translateX(-18px)}
+.section_page .page_main_price .price_text_tag .svip-tag,
+.section_page .page_main_price .price_text_tag .listTag{-webkit-transform: translateX(4px);-ms-transform: translateX(4px);transform: translateX(4px)}
+/*会员标签*/
+.svip-tag{width:100%;height:22px;letter-spacing:0}
+.svip-tag .svip-icon{position:relative;z-index:9;display:inline-block;width:30px;height:22px;text-align:center;line-height:22px;font-size:12px;font-weight:400;color:#F0CB72;opacity:1;background:#333333}
+.svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}
+.svip-tag .svip-price{z-index:1;position:relative;display:inline-block;padding-left:22px;padding-right:4px;margin-left:-27px;line-height:22px;background:#F0CB72;opacity:1;border-radius:2px;font-size:12px}
+.svip-tag .svip-price span{color: #333}
+
 .goods-list .goods:hover{-webkit-transform:translateY(-6px);-ms-transform:translateY(-6px);transform:translateY(-6px);-webkit-box-shadow:0 0 16px rgba(0,0,0,.2);box-shadow:0 0 16px rgba(0,0,0,.2)}
 .goods-list .goods:hover .goods-title{color:#E15616}
 }/*h5端*/
-@media screen and (max-width:768px){.banner-box{position:relative;width:93.6vw;height:36vw;margin:3.2vw;overflow:hidden}
+@media screen and (max-width:768px){.banner-box{position:relative;width:95.2vw;height:36vw;margin:2.4vw;overflow:hidden}
 .banner-box img{position:absolute;left:50%;top:50%;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%);border:none;vertical-align:auto;max-width:unset;height:36vw}
-.container{width:100vw;margin:2.4vw 0;-webkit-box-sizing:border-box;box-sizing:border-box;padding:0 3.2vw}
+.container{width:100vw;margin:2.4vw 0;-webkit-box-sizing:border-box;box-sizing:border-box}
 .goods-list{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-pack:justify;-ms-flex-pack:justify;justify-content:flex-start;-webkit-box-align:start;-ms-flex-align:start;align-items:flex-start;-ms-flex-wrap:wrap;flex-wrap:wrap}
 .goods-list .goods a:hover{color:unset}
-.goods-list .goods{width:45.6vw;margin-right:2.4vw;margin-bottom:2.4vw;padding-bottom:3.2vw;background:#fff;overflow:hidden}
-.goods-list .goods:nth-child(2n){margin-right:0}
-.goods-list .goods .goods-title,.goods-list .goods .goods-tag,.goods-list .goods .page_main_price,.goods-list .goods .svip-price{padding-left:3.2vw !important;padding-right:3.2vw !important}
+.goods-list .goods{width: 46.4vw; margin:0 2.4vw 2.4vw;background:#fff;overflow:hidden}
+.goods-list .goods:nth-child(2n){margin-left: 0}
+.goods-list .goods .goods-title,.goods-list .goods .goods-tag,.goods-list .goods .page_main_price{padding-left:1.6vw !important;padding-right:1.6vw !important}
 .goods-list .goods .page_main_price{width:100%;-webkit-box-sizing:border-box;box-sizing:border-box;padding:0 3.2vw}
 .goods-list .goods .page_main_price .price_text_tag{width:100%;-webkit-box-sizing:border-box;box-sizing:border-box;float:left}
 .goods-list .goods .page_main_price .main_price_show{color:#f94b4b}
@@ -63,10 +70,17 @@
 .goods-list .goods .goods-tag .tag{line-height:4.2vw;font-size:2.8vw;border-radius:2px;-webkit-box-sizing:border-box;box-sizing:border-box;padding:0 0.5vw}
 .goods-list .goods .goods-tag .tag.styl1{color:#F94B4B;background:#FFF1EB;border:1px solid #F94B4B}
 .goods-list .goods .goods-tag .tag.styl2{color:#E15616;background:#FFF1EB;border:1px solid #F94B4B}
-.goods-list .goods .svip-price{position:relative;height:4.8vw;-webkit-box-sizing:border-box;box-sizing:border-box}
-.goods-list .goods .svip-price > span{display:block}
-.goods-list .goods .svip-price .amount{display:inline-block;font-size:3.4vw;font-weight:400;line-height:4.9vw;color:#333333;background:#F0CB72;padding-left:8vw;padding-right:0.8vw;-webkit-box-sizing:border-box;box-sizing:border-box;border-radius:2px}
-.goods-list .goods .svip-price .svip-icon{position:absolute;left:3.2vw;top:0;width:8vw;height:4.8vw;background:#333333;font-size:3vw;line-height:4.8vw;color:#F0CB72;border-radius:2px;text-align:center}
+/*会员标签*/
+.section_page .page_main_price .price_text_tag {-webkit-transform: scale(0.8) translateX(-4.2vw);-ms-transform: scale(0.8) translateX(-4.2vw);transform: scale(0.8) translateX(-4.2vw)}
+.section_page .page_main_price .price_text_tag .svip-tag,
+.section_page .page_main_price .price_text_tag .listTag{-webkit-transform: translateX(1.2vw);-ms-transform: translateX(1.2vw);transform: translateX(1.2vw)}
+.svip-tag{float: left; height:4.74vw;letter-spacing:0;overflow: hidden}
+.svip-tag .svip-icon{position:relative;z-index:9;float: left; width:9.8vw;height:4.74vw;text-align:center;line-height:4.74vw;font-size:2.8vw;font-weight:400;color:#F0CB72;opacity:1;background:#333333}
+.svip-tag .svip-icon.btr{border-radius:2px 8px 0px 2px}
+.svip-tag .svip-price{z-index:1;position:relative;float: left;padding-left:5.4vw;padding-right:0.6vw;margin-left:-6vw;line-height:4.74vw;height: 4.74vw; background:#F0CB72;opacity:1;border-radius:2px;font-size:2.8vw}
+.svip-tag .svip-price span{color: #333}
+.svip-tag .svip-price span:nth-child(2){margin-left: -0.4vw}
+
 .show-more{width:100vw;margin:2.4vw 0 4.8vw;text-align:center}
 .show-more .more-btn{display:inline-block;width:20vw;height:6vw;font-size:3vw;line-height:6vw;border:1px solid #ccc}
 .show-more .more-btn::after{content:'';width:4vw;height:2.4vw;display:inline-block;background:url(/img/base/icon_m.png) no-repeat;background-size:100vw auto;background-position:-51.5vw -2vw}

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

@@ -97,6 +97,7 @@ var productList = new Vue({
                 console.log(res);
                 if (res.code === 0 && res.data ) {
                     var result = JSON.parse(res.data);
+                    console.log(result.items);
                     _self.listRecord = result.total;
                     var resultData = setSearchProductList(result.items, _self.userId, function(){
                         _self.$forceUpdate();

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

@@ -42,6 +42,7 @@ var productList = new Vue({
                if( res.code==0){
                      _self.listData=[];
                      var result = JSON.parse(res.data);
+                     console.log(result)
                       _self.listRecord = result.total;
                        var resultData = setSearchProductList(result.items, _self.userId, function(){
                             _self.$forceUpdate();

src/main/resources/templates/account/register-club.html

@@ -148,12 +148,21 @@
                     <label class="diyBox"><input type="radio" name="firstShopType" v-model="clubUpgradeUser.firstClubType" value="2" checked  @change="ChangeFirstClubType"><i class="icon mIcon">生美</i></label>
                     <span class="errTips icon mIcon" tips="请选择公司类型"></span>
                 </div>
+                <!-- 医美 -->
                 <div v-show="clubUpgradeUser.firstClubType == 1" class="formLine">
                     <label class="diyBox second"><input type="radio" name="secondClubType" v-model="clubUpgradeUser.secondClubType" value="1" checked><i class="icon mIcon">诊所</i></label>
                     <label class="diyBox second"><input type="radio" name="secondClubType" v-model="clubUpgradeUser.secondClubType" value="2" ><i class="icon mIcon">门诊</i></label>
                     <label class="diyBox second"><input type="radio" name="secondClubType" v-model="clubUpgradeUser.secondClubType" value="3" ><i class="icon mIcon">医院</i></label>
+                    <label class="diyBox second"><input type="radio" name="secondClubType" v-model="clubUpgradeUser.secondClubType" value="4" ><i class="icon mIcon">其他</i></label>
                     <span class="errTips icon mIcon" tips="请选择公司类型"></span>
                 </div>
+                <!-- 生美 -->
+                <div v-show="clubUpgradeUser.firstClubType == 2" class="formLine">
+                    <label class="diyBox second"><input type="radio" name="secondClubType" v-model="clubUpgradeUser.secondClubType" value="5" checked><i class="icon mIcon">美容院</i></label>
+                    <label class="diyBox second"><input type="radio" name="secondClubType" v-model="clubUpgradeUser.secondClubType" value="6" ><i class="icon mIcon">养生馆</i></label>
+                    <label class="diyBox second"><input type="radio" name="secondClubType" v-model="clubUpgradeUser.secondClubType" value="7" ><i class="icon mIcon">其他</i></label>
+                    <span class="errTips icon mIcon" tips="请选择公司类型">请选择公司类型</span>
+                </div>
                 <div v-show="clubUpgradeUser.firstClubType == 1" class="formLine">
                     <div class="form-upload">
                         <p>资质：</p>

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

@@ -81,12 +81,21 @@
                     <label class="diyBox"><input type="radio" name="firstShopType" v-model="clubUser.firstShopType" value="2" checked><i class="icon mIcon">生美</i></label>
                     <span class="errTips icon mIcon mIcon" tips="请选择公司类型"></span>
                 </div>
+                <!-- 医美 -->
                 <div v-show="clubUser.firstShopType == 1" class="formLine">
                     <label class="diyBox second"><input type="radio" name="department" v-model="clubUser.department" value="1" checked><i class="icon mIcon">诊所</i></label>
                     <label class="diyBox second"><input type="radio" name="department" v-model="clubUser.department" value="2" ><i class="icon mIcon">门诊</i></label>
                     <label class="diyBox second"><input type="radio" name="department" v-model="clubUser.department" value="3" ><i class="icon mIcon">医院</i></label>
+                    <label class="diyBox second"><input type="radio" name="secondClubType" v-model="clubUpgradeUser.secondClubType" value="7" ><i class="icon mIcon">其他</i></label>
                     <span class="errTips icon mIcon mIcon" tips="请选择公司类型"></span>
                 </div>
+                <!-- 生美 -->
+                <div v-show="clubUpgradeUser.firstClubType == 2" class="formLine">
+                    <label class="diyBox second"><input type="radio" name="secondClubType" v-model="clubUpgradeUser.secondClubType" value="5" checked><i class="icon mIcon">美容院</i></label>
+                    <label class="diyBox second"><input type="radio" name="secondClubType" v-model="clubUpgradeUser.secondClubType" value="6" ><i class="icon mIcon">养生馆</i></label>
+                    <label class="diyBox second"><input type="radio" name="secondClubType" v-model="clubUpgradeUser.secondClubType" value="7" ><i class="icon mIcon">其他</i></label>
+                    <span class="errTips icon mIcon" tips="请选择公司类型" ></span>
+                </div>
                 <div v-show="clubUser.firstShopType == 1" class="formLine">
                     <p>资质：</p>
                     <div v-if="clubUser.businessLicenseImage!=''">

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

@@ -807,7 +807,7 @@
     </div>
 </div>
 <!-- 引入js文件 -->
-<script charset="utf-8" type="text/javascript" src="/lib/jquery-3.5.1.min.js"></script>
+<script charset="utf-8" type="text/javascript" src="/lib/jquery-3.6.0.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"

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

@@ -1,4 +1,4 @@
-<script charset="utf-8" type="text/javascript" src="/lib/jquery-3.5.1.min.js"></script>
+<script charset="utf-8" type="text/javascript" src="/lib/jquery-3.6.0.min.js"></script>
 <script charset="utf-8" type="text/javascript" src="/lib/jquery.slide-2.1.3.js"></script>
 <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>

src/main/resources/templates/document/beauty-archive-detail.html

@@ -144,8 +144,8 @@
     </template>
 </div>
 <script charset="utf-8" type="text/javascript" src="/lib/vue2.6.12.min.js"></script>
-<script charset="utf-8" type="text/javascript" src="/lib/jquery-3.5.1.min.js"></script>
-<script src="https://cdn.bootcdn.net/ajax/libs/moment.js/2.29.1/moment.min.js"></script>
+<script charset="utf-8" type="text/javascript" src="/lib/jquery-3.6.0.min.js"></script>
+<script src="https://cdn.bootcdn.net/ajax/libs/moment.js/2.29.1/moment-2.29.min.js"></script>
 <script charset="utf-8" type="text/javascript" src="/lib/lazyload.js"></script>
 <script charset="utf-8" type="text/javascript" src="/lib/viewer.min.js"></script>
 <template th:replace="components/foot-link"></template>

src/main/resources/templates/document/beauty-archive.html

@@ -97,7 +97,7 @@
 <template th:replace="document/components/beautyIndustry-footer"></template>
 
 <script charset="utf-8" type="text/javascript" src="/lib/vue2.6.12.min.js"></script>
-<script charset="utf-8" type="text/javascript" src="/lib/jquery-3.5.1.min.js"></script>
+<script charset="utf-8" type="text/javascript" src="/lib/jquery-3.6.0.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"

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

@@ -1,4 +1,4 @@
-<script charset="utf-8" type="text/javascript" src="/lib/jquery-3.5.1.min.js"></script>
+<script charset="utf-8" type="text/javascript" src="/lib/jquery-3.6.0.min.js"></script>
 <script charset="utf-8" type="text/javascript" src="/lib/jquery.slide-2.1.3.js"></script>
 <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>

src/main/resources/templates/index.html

@@ -166,13 +166,16 @@
                                                 <template v-if="pros.product.productCategory == 1">
                                                     <div class="price_text_tag">
                                                         <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
-                                                        <!--超级会员价格标签-->
-                                                        <template v-if="pros.product.actStatus==1 && true">
+                                                        <!--超级会员价格标签 svipProductFlag 1:超级会员优惠商品 0 不是商超级会员优惠商品-->
+                                                        <template v-if="pros.product.svipProductFlag === 1">
                                                             <div class="svip-tag">
                                                                 <div class="svip-icon btr">SVIP</div>
-                                                                <div class="svip-price">
-                                                                    <span>￥</span><span>9999999.00</span>
-                                                                </div>
+                                                                <!-- 公开价格 && (个人机构 || 资质机构) && 开通SVIP 可查看价格-->
+                                                                <template v-if="pros.product.priceFlag != 1 && [2, 4].includes(pros.product.userIdentity) && true">
+                                                                    <div class="svip-price">
+                                                                        <span v-html="pros.product.svipPriceTag"></span>
+                                                                    </div>
+                                                                </template>
                                                             </div>
                                                         </template>
                                                         <template v-else>
@@ -199,7 +202,8 @@
                                                             </template>
                                                             <template v-else-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                                                                 <!--机构价-->
-                                                                <div class="main_price_show">￥<span class="price_num">{{ pros.product.price | NumFormat }}</span></div>
+                                                                <!--机构价划线：有sivp优惠价格 && 开通SVIP && 价格可见-->
+                                                                <div class="main_price_show" :class="{none:pros.product.svipProductFlag == 1 && true}">￥<span class="price_num">{{ pros.product.price | NumFormat }}</span></div>
                                                             </template>
                                                             <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
                                                                 <em class="price_grade_club">
@@ -302,6 +306,11 @@
                                                             <!-- 正常商品 -->
                                                             <th:block th:if="*{productCategory}==1">
                                                                 <div class="price_text_tag">
+                                                                    <p class="couponTag" th:if="*{couponsLogo}">优惠券</p>
+                                                                    <!--超级会员价格标签 svipProductFlag 1:超级会员优惠商品 0 不是商超级会员优惠商品-->
+                                                                    <div class="svip-tag" th:if="*{svipProductFlag}==1">
+                                                                        <div class="svip-icon btr">SVIP</div>
+                                                                    </div>
                                                                     <p class="listTag" th:if="*{actStatus}==1 and ${pros.get('product').get('promotions')}!=null">
                                                                         <template th:text="*{promotions.name}"></template>
                                                                         <th:block th:if="*{promotions.type}==1 and *{promotions.mode}==1">

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

@@ -65,30 +65,29 @@
                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                             <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
                             <em v-if="priceObj.priceFlag==1" v-text="'￥价格未公开'"></em>
+                            <!--SVIP时的划线价格-->
+                            <!--满足条件：公开价格 && (个人机构 || 资质机构) && 开通SVIP && SVIP优惠商品-->
+                            <em v-else-if="priceObj.priceFlag != 1 && priceObj.svipProductFlag == 1 && [2, 4].includes(priceObj.userIdentity)">
+                                <del v-text="'￥'+parseFloat(priceObj.originalPrice).toFixed(2)"></del>
+                            </em>
+                            <!--仅会员可见 -->
                             <em v-else-if="priceObj.priceFlag==2 && priceObj.userIdentity==4" v-text="'￥会员可见'"></em>
+                            <!--可见价格 -->
                             <template v-else-if="(priceObj.priceFlag==0 && priceObj.userIdentity!=3) || priceObj.userIdentity==2 || (priceObj.userIdentity==3 && priceObj.shopId==GLOBAL_SHOP_ID)">
-                                <!--SVIP会员标签价格 有svip会员价 && 价格可见-->
-                                <template v-if="true">
+                                <em v-if="priceObj.actStatus==1 && promotions && promotions.type==1 && promotions.mode==1"class="p">
                                     <del v-text="'￥'+parseFloat(priceObj.originalPrice).toFixed(2)"></del>
-                                    <div class="svip-tag">
-                                        <div class="svip-icon btr">SVIP</div>
-                                        <div class="svip-price">
-                                            <span>￥</span><span>9999999.00</span>
-                                        </div>
-                                    </div>
-                                </template>
-                                <template v-else>
-                                    <em v-if="priceObj.actStatus==1 && promotions && promotions.type==1 && promotions.mode==1"
-                                        class="p">
-                                        <del v-text="'￥'+parseFloat(priceObj.originalPrice).toFixed(2)"></del>
-                                    </em>
-                                    <em v-else class="p" v-text="'￥'+parseFloat(priceObj.price).toFixed(2)"></em>
-                                </template>
+                                </em>
+                                <em v-else class="p" v-text="'￥'+parseFloat(priceObj.price).toFixed(2)"></em>
                             </template>
+                            <!--隐藏价格 -->
                             <em v-else>￥<i th:attr="class=${'icon mIcon i'+product.priceGrade}"></i></em>
-                            <!--SVIP会员标签 有svip会员价 && 价格不可见-->
-                            <div class="svip-tag" v-if="true && priceObj.actStatus==1 && !((priceObj.priceFlag==0 && priceObj.userIdentity!=3) || priceObj.userIdentity==2 || (priceObj.userIdentity==3 && priceObj.shopId==GLOBAL_SHOP_ID))">
+                            <!--SVIP会员标签-->
+                            <div class="svip-tag" v-if="priceObj.svipProductFlag == 1">
                                 <div class="svip-icon">SVIP</div>
+                                <!-- 公开价格 && (个人机构 || 资质机构) && 开通SVIP 可查看价格-->
+                                <div class="svip-price" v-if="priceObj.priceFlag != 1 && [2, 4].includes(priceObj.userIdentity) && true">
+                                    <span v-html="priceObj.svipPriceTag"></span>
+                                </div>
                             </div>
                         </template>
                         <!--未登录-->
@@ -508,7 +507,7 @@
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
-<script src="https://cdn.bootcdn.net/ajax/libs/moment.js/2.29.1/moment.min.js"></script>
+<script src="https://cdn.bootcdn.net/ajax/libs/moment.js/2.29.1/moment-2.29.min.js"></script>
 <script charset="utf-8" type="text/javascript" src="/lib/magnifier.js"></script>
 <script charset="utf-8" type="text/javascript" src="/lib/viewer.min.js"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/product.service.js(v=${version})}"></script>

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

@@ -114,7 +114,15 @@
                                     <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
                                     <template v-if="p.priceFlag==1">
                                         <div class="price_text_tag">
-                                            <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                            <!--超级会员价格标签 svipProductFlag 1:超级会员优惠商品 0 不是商超级会员优惠商品-->
+                                            <template v-if="p.svipProductFlag === 1">
+                                                <div class="svip-tag">
+                                                    <div class="svip-icon btr">SVIP</div>
+                                                </div>
+                                            </template>
+                                            <template v-else>
+                                                <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                            </template>
                                         </div>
                                         <div class="main_price_unde">￥价格未公开</div>
                                     </template>
@@ -122,13 +130,16 @@
                                         <template v-if="(p.priceFlag==0 && p.userIdentity!=3) || p.userIdentity==2 || (p.userIdentity==3 && p.shopId==GLOBAL_SHOP_ID)">
                                            <div class="price_text_tag">
                                                 <p class="couponTag"v-if="p.couponsLogo">优惠券</p>
-                                                <!--超级会员价格标签-->
-                                                <template v-if="p.actStatus==1 && true">
+                                                <!--超级会员价格标签 svipProductFlag 1:超级会员优惠商品 0 不是商超级会员优惠商品-->
+                                                <template v-if="p.svipProductFlag === 1">
                                                     <div class="svip-tag">
                                                         <div class="svip-icon btr">SVIP</div>
-                                                        <div class="svip-price">
-                                                            <span>￥</span><span>9999999.00</span>
-                                                        </div>
+                                                        <!-- 公开价格 && (个人机构 || 资质机构) && 开通SVIP 可查看价格-->
+                                                        <template v-if="p.priceFlag != 1 && [2, 4].includes(p.userIdentity) && true">
+                                                            <div class="svip-price">
+                                                                <span v-html="p.svipPriceTag"></span>
+                                                            </div>
+                                                        </template>
                                                     </div>
                                                 </template>
                                                 <template v-else>
@@ -138,20 +149,18 @@
                                                     </p>
                                                 </template>
                                             </div>
-                                            <div class="main_price_show" :class="PromotionsFormat(p.promotions) ? 'none' : ''">
+                                            <div class="main_price_show"
+                                                :class="{none: PromotionsFormat(p.promotions) || ([2, 4].includes(p.userIdentity) && true)}">
                                                 ￥{{ (PromotionsFormat(p.promotions) ? p.originalPrice : p.price ) | NumFormat }}
                                             </div>
                                         </template>
                                         <template v-else-if="p.priceFlag==2 && p.userIdentity==4">
                                              <div class="price_text_tag">
                                                 <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
-                                                <!--超级会员价格标签-->
-                                                <template v-if="p.actStatus==1 && true">
+                                                <!--超级会员价格标签 svipProductFlag 1:超级会员优惠商品 0 不是商超级会员优惠商品-->
+                                                <template v-if="p.svipProductFlag === 1">
                                                     <div class="svip-tag">
                                                         <div class="svip-icon btr">SVIP</div>
-                                                        <div class="svip-price">
-                                                            <span>￥</span><span>9999999.00</span>
-                                                        </div>
                                                     </div>
                                                 </template>
                                                 <template v-else>
@@ -163,13 +172,10 @@
                                         <template v-else>
                                          <div class="price_text_tag">
                                             <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
-                                            <!--超级会员价格标签-->
-                                            <template v-if="p.actStatus==1 && true">
+                                            <!--超级会员价格标签 svipProductFlag 1:超级会员优惠商品 0 不是商超级会员优惠商品-->
+                                            <template v-if="p.svipProductFlag === 1">
                                                 <div class="svip-tag">
                                                     <div class="svip-icon btr">SVIP</div>
-                                                    <div class="svip-price">
-                                                        <span>￥</span><span>9999999.00</span>
-                                                    </div>
                                                 </div>
                                             </template>
                                             <template v-else>
@@ -183,13 +189,10 @@
                                 <template v-else>
                                      <div class="price_text_tag ">
                                          <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
-                                         <!--超级会员价格标签-->
-                                         <template v-if="p.actStatus==1 && true">
+                                         <!--超级会员价格标签 svipProductFlag 1:超级会员优惠商品 0 不是商超级会员优惠商品-->
+                                         <template v-if="p.svipProductFlag === 1">
                                              <div class="svip-tag">
                                                  <div class="svip-icon btr">SVIP</div>
-                                                 <div class="svip-price">
-                                                     <span>￥</span><span>9999999.00</span>
-                                                 </div>
                                              </div>
                                          </template>
                                          <template v-else>

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

@@ -119,13 +119,16 @@
                                             <template v-if="pros.product.productCategory == 1">
                                                 <div class="price_text_tag">
                                                     <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>
-                                                    <!--超级会员价格标签-->
-                                                    <template v-if="pros.product.actStatus==1 && true">
+                                                    <!--超级会员价格标签 svipProductFlag 1:超级会员优惠商品 0 不是商超级会员优惠商品-->
+                                                    <template v-if="pros.product.svipProductFlag === 1">
                                                         <div class="svip-tag">
                                                             <div class="svip-icon btr">SVIP</div>
-                                                            <div class="svip-price">
-                                                                <span>￥</span><span>9999999.00</span>
-                                                            </div>
+                                                            <!-- 公开价格 && (个人机构 || 资质机构) && 开通SVIP 可查看价格-->
+                                                            <template v-if="pros.product.priceFlag != 1 && [2, 4].includes(pros.product.userIdentity) && true">
+                                                                <div class="svip-price">
+                                                                    <span v-html="pros.product.svipPriceTag"></span>
+                                                                </div>
+                                                            </template>
                                                         </div>
                                                     </template>
                                                     <template v-else>
@@ -152,7 +155,7 @@
                                                         </template>
                                                         <template v-else-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
                                                             <!--机构价-->
-                                                            <div class="main_price_show">￥<span class="price_num">{{ pros.product.price | NumFormat }}</span></div>
+                                                            <div class="main_price_show" :class="{none:pros.product.svipProductFlag == 1}">￥<span class="price_num">{{ pros.product.price | NumFormat }}</span></div>
                                                         </template>
                                                         <template v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
                                                             <em class="price_grade_club">
@@ -256,23 +259,16 @@
                                                             <div class="price_text_tag">
                                                                 <p class="couponTag" th:if="*{couponsLogo}">优惠券</p>
                                                                 <!--超级会员价格标签-->
-                                                                <template v-if="pros.product.actStatus==1 && true">
-                                                                    <div class="svip-tag">
-                                                                        <div class="svip-icon btr">SVIP</div>
-                                                                        <div class="svip-price">
-                                                                            <span>￥</span><span>9999999.00</span>
-                                                                        </div>
-                                                                    </div>
-                                                                </template>
-                                                                <template v-else>
-                                                                    <p class="listTag" th:if="*{actStatus}==1 and ${pros.get('product').get('promotions')}!=null">
-                                                                        <template th:text="*{promotions.name}"></template>
-                                                                        <th:block th:if="*{promotions.type}==1 and *{promotions.mode}==1">
-                                                                            <!--单品优惠:优惠价-->
-                                                                            <span class="price_unit" style="display:none;">:￥</span><span class="price_num"></span>
-                                                                        </th:block>
-                                                                    </p>
-                                                                </template>
+                                                                <div class="svip-tag" th:if="*{svipProductFlag}==1">
+                                                                    <div class="svip-icon btr">SVIP</div>
+                                                                </div>
+                                                                <p class="listTag" th:if="*{actStatus}==1 and ${pros.get('product').get('promotions')}!=null">
+                                                                    <template th:text="*{promotions.name}"></template>
+                                                                    <th:block th:if="*{promotions.type}==1 and *{promotions.mode}==1">
+                                                                        <!--单品优惠:优惠价-->
+                                                                        <span class="price_unit" style="display:none;">:￥</span><span class="price_num"></span>
+                                                                    </th:block>
+                                                                </p>
                                                             </div>
                                                             <div class="main_price_none">
                                                                 <em class="price_grade"><span class="bold">￥</span><i th:attr="class=*{'icon mIcon price_grade_'+priceGrade}"></i></em>

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

@@ -115,9 +115,19 @@
                     <div class="price">
                         <template v-if="GLOBAL_USER_ID && GLOBAL_USER_ID>0">
                             <!--用户身份 0、个人 1、协销 2、会员机构 3、供应商 4,普通机构-->
+                            <!--0公开价格 1不公开价格 2仅对会员机构公开-->
                             <template v-if="p.priceFlag==1">
                                 <div class="price_text_tag clear">
-                                    <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                    <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
+                                    <!--超级会员价格标签 svipProductFlag 1:超级会员优惠商品 0 不是商超级会员优惠商品-->
+                                    <template v-if="p.svipProductFlag === 1">
+                                        <div class="svip-tag">
+                                            <div class="svip-icon btr">SVIP</div>
+                                        </div>
+                                    </template>
+                                    <template v-else>
+                                        <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                    </template>
                                 </div>
                                 <div class="main_price_unde">￥价格未公开</div>
                             </template>
@@ -125,13 +135,16 @@
                                 <template v-if="(p.priceFlag==0 && p.userIdentity!=3) || p.userIdentity==2 || (p.userIdentity==3 && p.shopId==GLOBAL_SHOP_ID)">
                                     <div class="price_text_tag clear">
                                         <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
-                                        <!--超级会员价格标签-->
-                                        <template v-if="p.actStatus==1 && true">
+                                        <!--超级会员价格标签 svipProductFlag 1:超级会员优惠商品 0 不是商超级会员优惠商品-->
+                                        <template v-if="p.svipProductFlag === 1">
                                             <div class="svip-tag">
                                                 <div class="svip-icon btr">SVIP</div>
-                                                <div class="svip-price">
-                                                    <span>￥</span><span>3000</span>
-                                                </div>
+                                                <!-- 公开价格 && (个人机构 || 资质机构) && 开通SVIP 可查看价格-->
+                                                <template v-if="p.priceFlag != 1 && [2, 4].includes(p.userIdentity) && true">
+                                                    <div class="svip-price">
+                                                        <span v-html="p.svipPriceTag"></span>
+                                                    </div>
+                                                </template>
                                             </div>
                                         </template>
                                         <template v-else>
@@ -141,20 +154,18 @@
                                             </p>
                                         </template>
                                     </div>
-                                    <div class="main_price_show" :class="PromotionsFormat(p.promotions) ? 'none' : ''">
+                                    <div class="main_price_show"
+                                        :class="{none: PromotionsFormat(p.promotions) || ([2, 4].includes(p.userIdentity) && true)}">
                                         ￥{{ (PromotionsFormat(p.promotions) ? p.originalPrice : p.price ) | NumFormat }}
                                     </div>
                                 </template>
                                 <template v-else-if="p.priceFlag==2 && p.userIdentity==4">
                                     <div class="price_text_tag clear">
                                         <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
-                                        <!--超级会员价格标签-->
-                                        <template v-if="p.actStatus==1 && true">
+                                        <!--超级会员价格标签 svipProductFlag 1:超级会员优惠商品 0 不是商超级会员优惠商品-->
+                                        <template v-if="p.svipProductFlag === 1">
                                             <div class="svip-tag">
                                                 <div class="svip-icon">SVIP</div>
-                                                <div class="svip-price">
-                                                    <span>￥</span><span>9999999.99</span>
-                                                </div>
                                             </div>
                                         </template>
                                         <template v-else>
@@ -166,8 +177,8 @@
                                 <template v-else>
                                     <div class="price_text_tag clear">
                                         <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
-                                        <!--超级会员价格标签-->
-                                        <template v-if="p.actStatus==1 && true">
+                                        <!--超级会员价格标签 svipProductFlag 1:超级会员优惠商品 0 不是商超级会员优惠商品-->
+                                        <template v-if="p.svipProductFlag === 1">
                                             <div class="svip-tag">
                                                 <div class="svip-icon">SVIP</div>
                                             </div>
@@ -183,8 +194,8 @@
                         <template v-else>
                             <div class="price_text_tag clear ">
                                 <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
-                                <!--超级会员价格标签-->
-                                <template v-if="p.actStatus==1 && true">
+                                <!--超级会员价格标签 svipProductFlag 1:超级会员优惠商品 0 不是商超级会员优惠商品-->
+                                <template v-if="p.svipProductFlag === 1">
                                     <div class="svip-tag">
                                         <div class="svip-icon">SVIP</div>
                                     </div>
@@ -195,7 +206,6 @@
                             </div>
                             <div class="price_grade "><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
                         </template>
-
                     </div>
                 </a>
             </li>

src/main/resources/templates/shopping/cart.html

@@ -105,10 +105,10 @@
                             <template v-if="true">
                                 <div class="priceTag">
                                     <!--超级会员价格标签-->
-                                    <div class="svip-tag">
+                                    <div class="svip-tag" v-if="cart.svipProductFlag == 1">
                                         <div class="svip-icon btr">SVIP</div>
                                         <div class="svip-price">
-                                            <span>￥</span><span>9999999.00</span>
+                                            <span v-html="cart.svipPriceTag"></span>
                                         </div>
                                     </div>
                                 </div>

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

@@ -72,11 +72,21 @@
                                         <template v-else>
                                             <template v-if="(p.priceFlag==0 && p.userIdentity!=3) || p.userIdentity==2 || (p.userIdentity==3 && p.shopId==GLOBAL_SHOP_ID)">
                                                 <div class="price_text_tag">
-<!--                                                    <p class="couponTag" v-if="p.couponsLogo">优惠券</p>-->
-                                                    <p class="listTag" v-if="p.actStatus==1">
-                                                        {{p.promotions.name}}
-                                                        <span v-if="p.priceFlag != 1 && PromotionsFormat(p.promotions)">:￥{{p.price | NumFormat}}</span>
-                                                    </p>
+                                                    <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
+                                                    <template v-if="true">
+                                                        <div class="svip-tag">
+                                                            <div class="svip-icon btr">SVIP</div>
+                                                            <div class="svip-price">
+                                                                <span>￥</span><span>9999999.00</span>
+                                                            </div>
+                                                        </div>
+                                                    </template>
+                                                    <template v-else>
+                                                        <p class="listTag" v-if="p.actStatus==1">
+                                                            {{p.promotions.name}}
+                                                            <span v-if="p.priceFlag != 1 && PromotionsFormat(p.promotions)">:￥{{p.price | NumFormat}}</span>
+                                                        </p>
+                                                    </template>
                                                 </div>
                                                 <div class="main_price_show" :class="PromotionsFormat(p.promotions) ? 'none' : ''">
                                                     ￥{{ (PromotionsFormat(p.promotions) ? p.originalPrice : p.price ) | NumFormat }}
@@ -84,15 +94,29 @@
                                             </template>
                                             <template v-else-if="p.priceFlag==2 && p.userIdentity==4">
                                                 <div class="price_text_tag">
-<!--                                                    <p class="couponTag" v-if="p.couponsLogo">优惠券</p>-->
-                                                    <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                                    <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
+                                                    <template v-if="true">
+                                                        <div class="svip-tag">
+                                                            <div class="svip-icon btr">SVIP</div>
+                                                        </div>
+                                                    </template>
+                                                    <template v-else>
+                                                        <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                                    </template>
                                                 </div>
                                                 <div class="main_price_unde">￥会员可见</div>
                                             </template>
                                             <template v-else>
                                                 <div class="price_text_tag">
-<!--                                                    <p class="couponTag" v-if="p.couponsLogo">优惠券</p>-->
-                                                    <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                                    <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
+                                                    <template v-if="true">
+                                                        <div class="svip-tag">
+                                                            <div class="svip-icon btr">SVIP</div>
+                                                        </div>
+                                                    </template>
+                                                    <template v-else>
+                                                         <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                                    </template>
                                                 </div>
                                                 <div class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
                                             </template>
@@ -100,8 +124,15 @@
                                     </template>
                                     <template v-else>
                                         <div class="price_text_tag ">
-<!--                                            <p class="couponTag" v-if="p.couponsLogo">优惠券</p>-->
-                                            <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                            <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
+                                            <template v-if="true">
+                                                <div class="svip-tag">
+                                                    <div class="svip-icon btr">SVIP</div>
+                                                </div>
+                                            </template>
+                                            <template v-else>
+                                                <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                            </template>
                                         </div>
                                         <div class="price_grade "><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
                                     </template>
@@ -131,11 +162,21 @@
                                         <template v-else>
                                             <template v-if="(p.priceFlag==0 && p.userIdentity!=3) || p.userIdentity==2 || (p.userIdentity==3 && p.shopId==GLOBAL_SHOP_ID)">
                                                 <div class="price_text_tag">
-<!--                                                    <p class="couponTag" v-if="p.couponsLogo">优惠券</p>-->
-                                                    <p class="listTag" v-if="p.actStatus==1">
-                                                        {{p.promotions.name}}
-                                                        <span v-if="p.priceFlag != 1 && PromotionsFormat(p.promotions)">:￥{{p.price | NumFormat}}</span>
-                                                    </p>
+                                                    <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
+                                                    <template v-if="true">
+                                                        <div class="svip-tag">
+                                                            <div class="svip-icon btr">SVIP</div>
+                                                            <div class="svip-price">
+                                                                <span>￥</span><span>9999999.00</span>
+                                                            </div>
+                                                        </div>
+                                                    </template>
+                                                    <template v-else>
+                                                        <p class="listTag" v-if="p.actStatus==1">
+                                                            {{p.promotions.name}}
+                                                            <span v-if="p.priceFlag != 1 && PromotionsFormat(p.promotions)">:￥{{p.price | NumFormat}}</span>
+                                                        </p>
+                                                    </template>
                                                 </div>
                                                 <div class="main_price_show" :class="PromotionsFormat(p.promotions) ? 'none' : ''">
                                                     ￥{{ (PromotionsFormat(p.promotions) ? p.originalPrice : p.price ) | NumFormat }}
@@ -143,15 +184,29 @@
                                             </template>
                                             <template v-else-if="p.priceFlag==2 && p.userIdentity==4">
                                                 <div class="price_text_tag">
-<!--                                                    <p class="couponTag" v-if="p.couponsLogo">优惠券</p>-->
-                                                    <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                                    <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
+                                                    <template v-if="true">
+                                                        <div class="svip-tag">
+                                                            <div class="svip-icon btr">SVIP</div>
+                                                        </div>
+                                                    </template>
+                                                    <template v-else>
+                                                        <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                                    </template>
                                                 </div>
                                                 <div class="main_price_unde">￥会员可见</div>
                                             </template>
                                             <template v-else>
                                                 <div class="price_text_tag">
-<!--                                                    <p class="couponTag" v-if="p.couponsLogo">优惠券</p>-->
-                                                    <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                                    <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
+                                                    <template v-if="true">
+                                                        <div class="svip-tag">
+                                                            <div class="svip-icon btr">SVIP</div>
+                                                        </div>
+                                                    </template>
+                                                    <template v-else>
+                                                        <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                                    </template>
                                                 </div>
                                                 <div class="price_grade"><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
                                             </template>
@@ -159,8 +214,15 @@
                                     </template>
                                     <template v-else>
                                         <div class="price_text_tag ">
-<!--                                            <p class="couponTag" v-if="p.couponsLogo">优惠券</p>-->
-                                            <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                            <p class="couponTag" v-if="p.couponsLogo">优惠券</p>
+                                            <template v-if="true">
+                                                <div class="svip-tag">
+                                                    <div class="svip-icon btr">SVIP</div>
+                                                </div>
+                                            </template>
+                                            <template v-else>
+                                                <p class="listTag" v-if="p.actStatus==1">{{p.promotions.name}}</p>
+                                            </template>
                                         </div>
                                         <div class="price_grade "><span class="bold">￥</span><i :class="'icon mIcon i'+p.priceGrade"></i></div>
                                     </template>

src/main/resources/templates/user-center/dashboard.html

@@ -36,13 +36,9 @@
                         <div class="account">
                             <div class="name user-info">
                                 <span class="username">{{userInfo.name}}</span>
-                                <!-- 资质机构 -->
-                                <template v-if="false">
-                                    <span class="agency vip">个人机构</span>
-                                    <span class="vip-icon vip">VIP</span>
-                                </template>
-                                <!-- 超级会员 -->
+                                <span class="agency vip">个人机构</span>
                                 <span class="agency svip">资质机构</span>
+                                <span class="vip-icon vip">VIP</span>
                                 <span class="vip-icon svip">SVIP</span>
                                 <!-- 升级 -->
                                 <a class="update" href="/user/setting/upgrade.html" v-if="userInfo.userIdentity === 4" onclick="_czc.push(['_trackEvent','个人中心','升级入口','点击','','Um_Event_ClubUpgrade'])">

src/main/resources/templates/user-center/member/member-product.html

@@ -24,75 +24,13 @@
                     <span class="tag styl1">优惠券</span>
                     <span class="tag styl2">单品满赠</span>
                 </div>
-                <!-- v-if="pros.listType == 1" -->
-                <div class="page_main_price" v-if="false">
-                    <!-- 商品价格 -->
-                    <div class="main_price_text">
-                        <!-- 正常商品 -->
-                        <template v-if="pros.product.productCategory == 1">
-                            <div class="price_text_tag">
-                                <!--                                                        <p class="couponTag" v-if="pros.product.couponsLogo">优惠券</p>-->
-                                <p class="listTag"
-                                   v-if="pros.product.actStatus ==1 && pros.product.promotions">
-                                    <span v-text="pros.product.promotions.name"></span>
-                                    <template v-if="PromotionsFormat(pros.product.promotions)">
-                                        <!--单品优惠:优惠价-->
-                                        <span class="price_unit">:￥</span><span class="price_num">{{ pros.product.price | NumFormat }}</span>
-                                    </template>
-                                </p>
-                            </div>
-                            <div class="main_price_login">
-                                <!--0公开价格 1不公开价格 2仅对会员机构公开-->
-                                <template v-if="pros.product.priceFlag == 1">
-                                    <em class="price_grade"><span>￥</span>价格未公开</em>
-                                </template>
-                                <template v-else>
-                                    <template v-if="PromotionsFormat(pros.product.promotions)">
-                                        <!--单品优惠时的划线价-->
-                                        <div class="main_price_show none">
-                                            ￥<span
-                                                class="price_o_num">{{ pros.product.originalPrice | NumFormat }}</span>
-                                        </div>
-                                    </template>
-                                    <template
-                                            v-else-if="(pros.product.priceFlag==0 && pros.product.userIdentity!=3) || pros.product.userIdentity==2 || (pros.product.userIdentity==3 && pros.product.shopID==GLOBAL_SHOP_ID)">
-                                        <!--机构价-->
-                                        <div class="main_price_show">￥<span class="price_num">{{ pros.product.price | NumFormat }}</span>
-                                        </div>
-                                    </template>
-                                    <template
-                                            v-else-if="pros.product.priceFlag==2 && pros.product.userIdentity==4">
-                                        <em class="price_grade_club">
-                                            <span>￥</span>会员可见
-                                        </em>
-                                    </template>
-                                    <template v-else>
-                                        <!--供应商除自己的商品外，也显示价格等级-->
-                                        <em class="price_grade_shop">
-                                            <span class="bold">￥</span><i
-                                                :class="'icon mIcon price_grade_'+pros.product.priceGrade"></i>
-                                        </em>
-                                    </template>
-                                </template>
-                            </div>
-                        </template>
-                        <!-- 二手商品 -->
-                        <template v-else>
-                            <div class="main_price_login">
-                                <div class="price_text_tag"></div>
-                                <div v-if="pros.product.detailTalkFlag==2" class="main_price_show">￥价格祥聊
-                                </div>
-                                <div v-else class="main_price_show">
-                                    ￥<span class="price_num">{{ pros.product.price | NumFormat }}</span>
-                                </div>
-                            </div>
-                        </template>
+                <!--价格区域-->
+                <div class="svip-tag">
+                    <div class="svip-icon btr">SVIP</div>
+                    <div class="svip-price">
+                        <span>￥</span><span>9999999.00</span>
                     </div>
                 </div>
-                <div class="svip-price">
-                    <span class="svip-icon">SVIP</span>
-                    <span class="amount">￥99999</span>
-                </div>
             </a>
         </div>
     </div>

src/main/resources/templates/user-center/order/list.html

@@ -163,7 +163,7 @@
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" src="/lib/datapicker/moment.min.js"></script>
+<script charset="utf-8" type="text/javascript" src="/lib/datapicker/moment-2.29.min.js"></script>
 <script charset="utf-8" type="text/javascript" src="/lib/datapicker/jquery.daterangepicker.js"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/order.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/user-center/order/list.js(v=${version})}"></script>

src/main/resources/templates/user-center/repair/list.html

@@ -121,7 +121,7 @@
 <template th:replace="components/footer"></template>
 <template th:replace="components/foot-link"></template>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" src="/lib/datapicker/moment.min.js"></script>
+<script charset="utf-8" type="text/javascript" src="/lib/datapicker/moment-2.29.min.js"></script>
 <script charset="utf-8" type="text/javascript" src="/lib/datapicker/jquery.daterangepicker.js"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/repair.service.js(v=${version})}"></script>
 <script charset="utf-8" type="text/javascript" th:src="@{/js/user-center/repair/list.js(v=${version})}"></script>