优惠券标题修改

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

@@ -288,7 +288,7 @@ li{list-style:none}
     .coupon-popup .popup-tabs-cell span{display: block;line-height: 57px;height: 57px;font-size: 16px;color: #333;cursor: pointer;box-sizing: border-box;text-align: center;}
     .coupon-popup .popup-tabs-cell.active span{color: #E15621;border-bottom: 1px solid #E15621;}
     .coupon-popup .coupon-popup-content{width:100%;height:385px;box-sizing:border-box;padding: 16px 0;float: left;}
-    .coupon-popup .coupon-popup-content .empty{padding: 60px 0;}
+    .coupon-popup .coupon-popup-content .empty{width: 100%;padding: 60px 0;}
     .coupon-popup .coupon-popup-content .empty img{width: 120px;height: 120px;}
     .coupon-popup .coupon-popup-content .empty .msg{color: #999;}
     .coupon-popup .coupon-popup-scroll{width:100%;height:100%;box-sizing:border-box;padding:0 45px;float:left;overflow:hidden;overflow-y:auto}

src/main/resources/static/js/flea-market/form.js

@@ -392,7 +392,7 @@ var fleaMarketForm = new Vue({
         SecondHandProduct:function(params){//提交发布
             var _this = this;
             SecondApi.SecondHandProduct(params,function (res) {
-                if (res.code==0){
+                if (res.code===0){
                     CAIMEI.Alert('发布成功！商品信息会在1-2个工作日内进行审核，采美官方人员也会联系您进行商品估价，审核通过后将立即上线到采美二手市场。', '确定', true,function () {
                         window.location.href = '/flea-market/list.html';
                     });

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

@@ -763,10 +763,10 @@
                                         </div>
                                         <div class="coupon-list-name">
                                             <p v-if="coupon.couponType == 0">
-                                                {{ coupon.productType && coupon.productType == 1 ? '全商城商品通用' : '仅可购买指定商品' }}
+                                                {{ coupon.productType && coupon.productType == 1 ? '全商城商品通用' : coupon.couponName }}
                                             </p>
                                             <p v-if="coupon.couponType == 1">
-                                                {{ coupon.categoryType == 1 ? '仅限购买产品类商品' : '仅限购买仪器类商品' }}
+                                                {{ coupon.categoryType == 1 ? coupon.couponName : coupon.couponName }}
                                             </p>
                                             <p v-if="coupon.couponType == 3">仅限购买店铺【{{ coupon.shopName }}】的商品</p>
                                             <p v-if="coupon.couponType == 4 || coupon.couponType == 2">全商城商品通用</p>

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

@@ -316,10 +316,10 @@
                                     </div>
                                     <div class="coupon-list-name">
                                         <p v-if="coupon.couponType == 0">
-                                            {{ coupon.productType && coupon.productType == 1 ? '全商城商品通用' : '仅可购买指定商品'  }}
+                                            {{ coupon.productType && coupon.productType == 1 ? '全商城商品通用' : coupon.couponName  }}
                                         </p>
                                         <p v-if="coupon.couponType == 1">
-                                            {{ coupon.categoryType == 1 ? '仅限购买产品类商品' : '仅限购买仪器类商品' }}
+                                            {{ coupon.categoryType == 1 ? coupon.couponName : coupon.couponName }}
                                         </p>
                                         <p v-if="coupon.couponType == 3">仅限购买店铺【{{ coupon.shopName }}】的商品</p>
                                         <p v-if="coupon.couponType == 4 || coupon.couponType == 2">全商城商品通用</p>

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

@@ -416,10 +416,10 @@
                     </div>
                     <div class="coupon-list-name">
                         <p v-if="coupon.couponType == 0">
-                            {{ coupon.productType && coupon.productType == 1 ? '全商城商品通用' : '仅可购买指定商品'  }}
+                            {{ coupon.productType && coupon.productType == 1 ? '全商城商品通用' : coupon.couponName  }}
                         </p>
                         <p v-if="coupon.couponType == 1">
-                            {{ coupon.categoryType == 1 ? '仅限购买产品类商品' : '仅限购买仪器类商品' }}
+                            {{ coupon.categoryType == 1 ? coupon.couponName : coupon.couponName }}
                         </p>
                         <p v-if="coupon.couponType == 3">仅限购买店铺【{{ coupon.shopName }}】的商品</p>
                         <p v-if="coupon.couponType == 4 || coupon.couponType == 2">全商城商品通用</p>

src/main/resources/templates/user-center/account/coupon-collection.html

@@ -1,118 +1,118 @@
-<!DOCTYPE html>
-<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>
-  <template th:replace="components/head-link"></template>
-  <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
-  <link th:href="@{/css/user-center/account/coupon-collection.css(v=${version})}" rel="stylesheet" type="text/css">
-  <template th:replace="components/analysis"></template>
-</head>
-<body>
-<!-- 引用头部 -->
-<template th:replace="components/header"></template>
-<!-- 采美豆明细 -->
-<div id="beansPage" v-cloak>
-  <div class="navLayout" v-cloak>
-    <div class="coupon-title">
-      <div class="coupon-name">领券中心</div>
-      <div class="coupon-name-use"  @click="myClickCoupon">我的优惠券</div>
-    </div>
-    <div class="wrap clear">
-        <!--loading-->
-        <div v-if="isRequset" class="loading">
-          <img src="/img/base/loading.gif">
-        </div>
-        <div class="coupon-container clear" v-else>
-          <div class="coupon-content-list clear" v-if="coupinList.length > 0">
-            <div class="coupon-list-cell" v-for="(coupon, index) in coupinList" :key="index">
-              <div class="coupon-list-le">
-                <div class="coupon-list-money">
-                  <p>￥<span class="maxMoney">{{ coupon.couponAmount }}</span><span class="minMoney">满{{ coupon.touchPrice }}可用</span></p>
-                </div>
-                <div class="coupon-list-name">
-                  <p v-if="coupon.couponType == 0">
-                    {{ coupon.productType && coupon.productType == 1 ? '全商城商品通用' : '仅可购买指定商品'  }}
-                  </p>
-                  <p v-if="coupon.couponType == 1">
-                    {{ coupon.categoryType == 1 ? '仅限购买产品类商品' : '仅限购买仪器类商品' }}
-                  </p>
-                  <p v-if="coupon.couponType == 3">仅限购买店铺【{{ coupon.shopName }}】的商品</p>
-                  <p v-if="coupon.couponType == 4 || coupon.couponType == 2">全商城商品通用</p>
-                </div>
-                <div class="coupon-list-time"> {{ coupon.startDate }} - {{ coupon.endDate }}</div>
-              </div>
-              <div class="coupon-list-ri">
-                <template v-if="coupon.couponPayWay == 2">
-                  <template  v-if="coupon.couponBtnType == 0">
-                    <div class="buy" @click="toDeductCoupon(coupon)"
-                         id="coupon-exchange-coupon"
-                         onclick="_czc.push(['_trackEvent','领券中心','优惠券采美豆兑换','优惠券兑换按钮点击',1,'coupon-exchange-coupon'])">
-                      <p>{{ coupon.moneyCouponPrice }}采美豆</p>
-                      <p>兑换</p>
-                    </div>
-                  </template>
-                  <template v-else>
-                      <span @click="toUseCoupon(coupon)"
-                            id="coupon-exchangeuse-coupon"
-                            onclick="_czc.push(['_trackEvent','领券中心','优惠券去使用按钮点击','优惠券去使用按钮点击',1,'coupon-use-coupon'])">去使用</span>
-                  </template>
-                </template>
-                <template v-else-if="coupon.couponPayWay == 1">
-                  <div class="buy" @click="toBuyCoupon(coupon)"
-                       id="coupon-buy-coupon"
-                       onclick="_czc.push(['_trackEvent','领券中心','优惠券购买按钮点击','优惠券购买按钮点击',1,'coupon-buy-coupon'])">
-                    <p>￥{{ coupon.moneyCouponPrice }}</p>
-                    <p>购买</p>
-                  </div>
-                </template>
-                <template v-else>
-                  <span class="none" v-if="coupon.couponBtnType == 0"
-                        @click="receiveCoupon(coupon)"
-                        id="coupon-receive"
-                        onclick="_czc.push(['_trackEvent','领券中心','优惠券领取按钮点击','优惠券领取按钮点击',1,'coupon-receive'])">领取</span>
-                  <span v-if="coupon.couponBtnType == 1"
-                        @click="toUseCoupon(coupon)"
-                        id="coupon-use-coupon"
-                        onclick="_czc.push(['_trackEvent','领券中心','优惠券去使用按钮点击','优惠券去使用按钮点击',1,'coupon-use-coupon'])">去使用</span>
-                </template>
-              </div>
-              <template v-if="coupon.moneyCouponFlag == 1">
-                <div class="coupon-tags" v-if="coupon.moneyCouponType == 1">意向{{ coupon.couponType | TypeFormat }}</div>
-                <div class="coupon-tags"  v-else>定向{{ coupon.couponType | TypeFormat }}</div>
-              </template>
-              <template v-else>
-                <div class="coupon-tags">{{ coupon.couponType | TypeFormat }}</div>
-              </template>
-            </div>
-          </div>
-          <div v-else class="empty">
-            <img src="/img/account/icon-coupon-empty@2x.png">
-            <div class="msg"><p>暂无可领的优惠券</p></div>
-          </div>
-        </div>
-        <!--分页-->
-        <div v-if="(!isPC) && noMore" class="noMore">---- 没有更多了 ----</div>
-        <div v-if="isPC && pageTotal>1" class="pageWrap clear">
-          <a v-if="listQuery.pageNum>1" class="prev" @click="toPagination(listQuery.pageNum*1-1)" href="javascript:void(0);"></a>
-          <template v-for="n in showPageBtn">
-            <a v-if="n" :class="{'on':(n==listQuery.pageNum)}" @click="toPagination(n)" href="javascript:void(0);" v-text="n"></a>
-            <span v-else>···</span>
-          </template>
-          <a v-if="listQuery.pageNum<pageTotal" class="next" @click="toPagination(listQuery.pageNum*1+1)" href="javascript:void(0);"></a>
-          <span>共<b v-text="pageTotal>1?pageTotal:1"></b>页</span>
-          <span>跳至</span>
-          <input v-model="pageInput" @blur="checkNum()"/>
-          <span>页</span>&nbsp;
-          <a class="btn" href="javascript:void(0);" @click="toPagination(pageInput)">点击跳转</a>
-        </div>
-    </div>
-  </div>
-</div>
-<!-- 引入底部 -->
-<template th:replace="components/footer"></template>
-<template th:replace="components/foot-link"></template>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/product.service.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/user-center/account/coupon-collection.js(v=${version})}"></script>
-</body>
-</html>
+<!DOCTYPE html>
+<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>
+  <template th:replace="components/head-link"></template>
+  <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
+  <link th:href="@{/css/user-center/account/coupon-collection.css(v=${version})}" rel="stylesheet" type="text/css">
+  <template th:replace="components/analysis"></template>
+</head>
+<body>
+<!-- 引用头部 -->
+<template th:replace="components/header"></template>
+<!-- 采美豆明细 -->
+<div id="beansPage" v-cloak>
+  <div class="navLayout" v-cloak>
+    <div class="coupon-title">
+      <div class="coupon-name">领券中心</div>
+      <div class="coupon-name-use"  @click="myClickCoupon">我的优惠券</div>
+    </div>
+    <div class="wrap clear">
+        <!--loading-->
+        <div v-if="isRequset" class="loading">
+          <img src="/img/base/loading.gif">
+        </div>
+        <div class="coupon-container clear" v-else>
+          <div class="coupon-content-list clear" v-if="coupinList.length > 0">
+            <div class="coupon-list-cell" v-for="(coupon, index) in coupinList" :key="index">
+              <div class="coupon-list-le">
+                <div class="coupon-list-money">
+                  <p>￥<span class="maxMoney">{{ coupon.couponAmount }}</span><span class="minMoney">满{{ coupon.touchPrice }}可用</span></p>
+                </div>
+                <div class="coupon-list-name">
+                  <p v-if="coupon.couponType == 0">
+                    {{ coupon.productType && coupon.productType == 1 ? '全商城商品通用' : coupon.couponName  }}
+                  </p>
+                  <p v-if="coupon.couponType == 1">
+                    {{ coupon.categoryType == 1 ? coupon.couponName : coupon.couponName }}
+                  </p>
+                  <p v-if="coupon.couponType == 3">仅限购买店铺【{{ coupon.shopName }}】的商品</p>
+                  <p v-if="coupon.couponType == 4 || coupon.couponType == 2">全商城商品通用</p>
+                </div>
+                <div class="coupon-list-time"> {{ coupon.startDate }} - {{ coupon.endDate }}</div>
+              </div>
+              <div class="coupon-list-ri">
+                <template v-if="coupon.couponPayWay == 2">
+                  <template  v-if="coupon.couponBtnType == 0">
+                    <div class="buy" @click="toDeductCoupon(coupon)"
+                         id="coupon-exchange-coupon"
+                         onclick="_czc.push(['_trackEvent','领券中心','优惠券采美豆兑换','优惠券兑换按钮点击',1,'coupon-exchange-coupon'])">
+                      <p>{{ coupon.moneyCouponPrice }}采美豆</p>
+                      <p>兑换</p>
+                    </div>
+                  </template>
+                  <template v-else>
+                      <span @click="toUseCoupon(coupon)"
+                            id="coupon-exchangeuse-coupon"
+                            onclick="_czc.push(['_trackEvent','领券中心','优惠券去使用按钮点击','优惠券去使用按钮点击',1,'coupon-use-coupon'])">去使用</span>
+                  </template>
+                </template>
+                <template v-else-if="coupon.couponPayWay == 1">
+                  <div class="buy" @click="toBuyCoupon(coupon)"
+                       id="coupon-buy-coupon"
+                       onclick="_czc.push(['_trackEvent','领券中心','优惠券购买按钮点击','优惠券购买按钮点击',1,'coupon-buy-coupon'])">
+                    <p>￥{{ coupon.moneyCouponPrice }}</p>
+                    <p>购买</p>
+                  </div>
+                </template>
+                <template v-else>
+                  <span class="none" v-if="coupon.couponBtnType == 0"
+                        @click="receiveCoupon(coupon)"
+                        id="coupon-receive"
+                        onclick="_czc.push(['_trackEvent','领券中心','优惠券领取按钮点击','优惠券领取按钮点击',1,'coupon-receive'])">领取</span>
+                  <span v-if="coupon.couponBtnType == 1"
+                        @click="toUseCoupon(coupon)"
+                        id="coupon-use-coupon"
+                        onclick="_czc.push(['_trackEvent','领券中心','优惠券去使用按钮点击','优惠券去使用按钮点击',1,'coupon-use-coupon'])">去使用</span>
+                </template>
+              </div>
+              <template v-if="coupon.moneyCouponFlag == 1">
+                <div class="coupon-tags" v-if="coupon.moneyCouponType == 1">意向{{ coupon.couponType | TypeFormat }}</div>
+                <div class="coupon-tags"  v-else>定向{{ coupon.couponType | TypeFormat }}</div>
+              </template>
+              <template v-else>
+                <div class="coupon-tags">{{ coupon.couponType | TypeFormat }}</div>
+              </template>
+            </div>
+          </div>
+          <div v-else class="empty">
+            <img src="/img/account/icon-coupon-empty@2x.png">
+            <div class="msg"><p>暂无可领的优惠券</p></div>
+          </div>
+        </div>
+        <!--分页-->
+        <div v-if="(!isPC) && noMore" class="noMore">---- 没有更多了 ----</div>
+        <div v-if="isPC && pageTotal>1" class="pageWrap clear">
+          <a v-if="listQuery.pageNum>1" class="prev" @click="toPagination(listQuery.pageNum*1-1)" href="javascript:void(0);"></a>
+          <template v-for="n in showPageBtn">
+            <a v-if="n" :class="{'on':(n==listQuery.pageNum)}" @click="toPagination(n)" href="javascript:void(0);" v-text="n"></a>
+            <span v-else>···</span>
+          </template>
+          <a v-if="listQuery.pageNum<pageTotal" class="next" @click="toPagination(listQuery.pageNum*1+1)" href="javascript:void(0);"></a>
+          <span>共<b v-text="pageTotal>1?pageTotal:1"></b>页</span>
+          <span>跳至</span>
+          <input v-model="pageInput" @blur="checkNum()"/>
+          <span>页</span>&nbsp;
+          <a class="btn" href="javascript:void(0);" @click="toPagination(pageInput)">点击跳转</a>
+        </div>
+    </div>
+  </div>
+</div>
+<!-- 引入底部 -->
+<template th:replace="components/footer"></template>
+<template th:replace="components/foot-link"></template>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/product.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/user-center/account/coupon-collection.js(v=${version})}"></script>
+</body>
+</html>

src/main/resources/templates/user-center/account/coupon.html

@@ -1,125 +1,125 @@
-<!DOCTYPE html>
-<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>
-  <template th:replace="components/head-link"></template>
-  <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
-  <link th:href="@{/css/user-center/account/coupon.css(v=${version})}" rel="stylesheet" type="text/css">
-  <template th:replace="components/analysis"></template>
-</head>
-<body>
-<!-- 引用头部 -->
-<template th:replace="components/header"></template>
-<!-- 采美豆明细 -->
-<div id="beansPage" v-cloak>
-  <div class="navLayout" v-cloak>
-    <div v-if="isPC" class="crumbs">
-      <span>我的采美</span>
-      <span>&gt;</span>
-      <span>优惠券</span>
-    </div>
-    <div class="wrap clear">
-      <!--左侧导航-->
-      <template th:replace="user-center/components/tableft"></template>
-      <div class="right">
-        <!--loading-->
-        <div v-if="isRequset" class="loading">
-          <img src="/img/base/loading.gif">
-        </div>
-        <div class="coupon-container clear" v-else>
-          <div class="coupon-content-tabs clear">
-            <div class="tabs-main">
-              <div class="time-tabs">
-                <div   class="time-tabs-cell"
-                       v-for="(tabs, index) in tabsList"
-                       :key="index"
-                       :class="tabsListIndex == index ? 'active' : ''"
-                       @click="tabClick(index)"
-                >
-                  {{ tabs.text }}
-                </div>
-              </div>
-              <div class="time-btn" v-if="isPC">
-                <a href="/user/coupon-exchange.html">兑换优惠券</a>
-                <a href="/user/coupon-collection.html">领取更多好券</a>
-              </div>
-              <div class="time-btn" v-else></div>
-            </div>
-          </div>
-          <!--数据为空-->
-          <div class="coupon-content-list clear" v-if="coupinList.length > 0">
-              <div class="coupon-list-cell" v-for="(coupon, index) in coupinList" :key="index" :class="coupon.useStatus == 2 || coupon.useStatus == 3 ? 'none' : 'used'">
-                <div class="coupon-list-le">
-                  <div class="coupon-list-money" :class="coupon.useStatus == 2 || coupon.useStatus == 3 ? 'none' : 'used'">
-                    <p>￥<span class="maxMoney">{{ coupon.couponAmount }}</span><span class="minMoney">满{{ coupon.touchPrice }}可用</span></p>
-                  </div>
-                  <div class="coupon-list-name" :class="coupon.useStatus == 2 || coupon.useStatus == 3 ? 'none' : 'used'">
-                    <p v-if="coupon.couponType == 0">
-                      {{ coupon.productType && coupon.productType == 1 ? '全商城商品通用' : '仅可购买指定商品'  }}
-                    </p>
-                    <p v-if="coupon.couponType == 1">
-                      {{ coupon.categoryType == 1 ? '仅限购买产品类商品' : '仅限购买仪器类商品' }}
-                    </p>
-                    <p v-if="coupon.couponType == 3">仅限购买店铺【{{ coupon.shopName }}】的商品</p>
-                    <p v-if="coupon.couponType == 4 || coupon.couponType == 2">全商城商品通用</p>
-                  </div>
-                  <div class="coupon-list-time" :class="coupon.useStatus == 2 || coupon.useStatus == 3 ? 'none' : 'used'">
-                    {{ coupon.startDate }} - {{ coupon.endDate }}
-                  </div>
-                </div>
-                <div class="coupon-list-ri" :class="coupon.useStatus == 2 || coupon.useStatus == 3 ? 'none' : 'used'"
-                     id="coupon-use-coupon"
-                     @click="toUseCoupon(coupon)"
-                     onclick="_czc.push(['_trackEvent','机构优惠券列表','优惠券去使用按钮点击','优惠券去使用按钮点击',1,'coupon-use-coupon'])">{{
-                  coupon.useStatus | TypeBtnFormat }}
-                </div>
-                <template v-if="coupon.moneyCouponFlag == 1">
-                  <div v-if="coupon.moneyCouponType == 1" class="coupon-tags"
-                       :class="coupon.useStatus == 2 || coupon.useStatus == 3 ? 'none' : 'used'">意向{{ coupon.couponType
-                    | TypeFormat }}
-                  </div>
-                  <div v-else class="coupon-tags"
-                       :class="coupon.useStatus == 2 || coupon.useStatus == 3 ? 'none' : 'used'">定向{{ coupon.couponType
-                    | TypeFormat }}
-                  </div>
-                </template>
-                <template v-else>
-                  <div class="coupon-tags" :class="coupon.useStatus == 2 || coupon.useStatus == 3 ? 'none' : 'used'">{{
-                    coupon.couponType | TypeFormat }}
-                  </div>
-                </template>
-              </div>
-          </div>
-          <div v-else class="empty">
-            <img src="/img/account/icon-coupon-empty@2x.png">
-            <div class="msg"><p>暂无优惠券数据~</p></div>
-          </div>
-        </div>
-        <!--分页-->
-        <div v-if="(!isPC) && noMore" class="noMore">---- 没有更多了 ----</div>
-        <div v-if="isPC && pageTotal>1" class="pageWrap clear">
-          <a v-if="listQuery.pageNum>1" class="prev" @click="toPagination(listQuery.pageNum*1-1)" href="javascript:void(0);"></a>
-          <template v-for="n in showPageBtn">
-            <a v-if="n" :class="{'on':(n==listQuery.pageNum)}" @click="toPagination(n)" href="javascript:void(0);" v-text="n"></a>
-            <span v-else>···</span>
-          </template>
-          <a v-if="listQuery.pageNum<pageTotal" class="next" @click="toPagination(listQuery.pageNum*1+1)" href="javascript:void(0);"></a>
-          <span>共<b v-text="pageTotal>1?pageTotal:1"></b>页</span>
-          <span>跳至</span>
-          <input v-model="pageInput" @blur="checkNum()"/>
-          <span>页</span>&nbsp;
-          <a class="btn" href="javascript:void(0);" @click="toPagination(pageInput)">点击跳转</a>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-<!-- 引入底部 -->
-<template th:replace="components/footer"></template>
-<template th:replace="components/foot-link"></template>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/product.service.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/user-center/account/coupon.js(v=${version})}"></script>
-</body>
-</html>
+<!DOCTYPE html>
+<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>
+  <template th:replace="components/head-link"></template>
+  <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
+  <link th:href="@{/css/user-center/account/coupon.css(v=${version})}" rel="stylesheet" type="text/css">
+  <template th:replace="components/analysis"></template>
+</head>
+<body>
+<!-- 引用头部 -->
+<template th:replace="components/header"></template>
+<!-- 采美豆明细 -->
+<div id="beansPage" v-cloak>
+  <div class="navLayout" v-cloak>
+    <div v-if="isPC" class="crumbs">
+      <span>我的采美</span>
+      <span>&gt;</span>
+      <span>优惠券</span>
+    </div>
+    <div class="wrap clear">
+      <!--左侧导航-->
+      <template th:replace="user-center/components/tableft"></template>
+      <div class="right">
+        <!--loading-->
+        <div v-if="isRequset" class="loading">
+          <img src="/img/base/loading.gif">
+        </div>
+        <div class="coupon-container clear" v-else>
+          <div class="coupon-content-tabs clear">
+            <div class="tabs-main">
+              <div class="time-tabs">
+                <div   class="time-tabs-cell"
+                       v-for="(tabs, index) in tabsList"
+                       :key="index"
+                       :class="tabsListIndex == index ? 'active' : ''"
+                       @click="tabClick(index)"
+                >
+                  {{ tabs.text }}
+                </div>
+              </div>
+              <div class="time-btn" v-if="isPC">
+                <a href="/user/coupon-exchange.html">兑换优惠券</a>
+                <a href="/user/coupon-collection.html">领取更多好券</a>
+              </div>
+              <div class="time-btn" v-else></div>
+            </div>
+          </div>
+          <!--数据为空-->
+          <div class="coupon-content-list clear" v-if="coupinList.length > 0">
+              <div class="coupon-list-cell" v-for="(coupon, index) in coupinList" :key="index" :class="coupon.useStatus == 2 || coupon.useStatus == 3 ? 'none' : 'used'">
+                <div class="coupon-list-le">
+                  <div class="coupon-list-money" :class="coupon.useStatus == 2 || coupon.useStatus == 3 ? 'none' : 'used'">
+                    <p>￥<span class="maxMoney">{{ coupon.couponAmount }}</span><span class="minMoney">满{{ coupon.touchPrice }}可用</span></p>
+                  </div>
+                  <div class="coupon-list-name" :class="coupon.useStatus == 2 || coupon.useStatus == 3 ? 'none' : 'used'">
+                    <p v-if="coupon.couponType == 0">
+                      {{ coupon.productType && coupon.productType == 1 ? '全商城商品通用' : coupon.couponName  }}
+                    </p>
+                    <p v-if="coupon.couponType == 1">
+                      {{ coupon.categoryType == 1 ? coupon.couponName : coupon.couponName }}
+                    </p>
+                    <p v-if="coupon.couponType == 3">仅限购买店铺【{{ coupon.shopName }}】的商品</p>
+                    <p v-if="coupon.couponType == 4 || coupon.couponType == 2">全商城商品通用</p>
+                  </div>
+                  <div class="coupon-list-time" :class="coupon.useStatus == 2 || coupon.useStatus == 3 ? 'none' : 'used'">
+                    {{ coupon.startDate }} - {{ coupon.endDate }}
+                  </div>
+                </div>
+                <div class="coupon-list-ri" :class="coupon.useStatus == 2 || coupon.useStatus == 3 ? 'none' : 'used'"
+                     id="coupon-use-coupon"
+                     @click="toUseCoupon(coupon)"
+                     onclick="_czc.push(['_trackEvent','机构优惠券列表','优惠券去使用按钮点击','优惠券去使用按钮点击',1,'coupon-use-coupon'])">{{
+                  coupon.useStatus | TypeBtnFormat }}
+                </div>
+                <template v-if="coupon.moneyCouponFlag == 1">
+                  <div v-if="coupon.moneyCouponType == 1" class="coupon-tags"
+                       :class="coupon.useStatus == 2 || coupon.useStatus == 3 ? 'none' : 'used'">意向{{ coupon.couponType
+                    | TypeFormat }}
+                  </div>
+                  <div v-else class="coupon-tags"
+                       :class="coupon.useStatus == 2 || coupon.useStatus == 3 ? 'none' : 'used'">定向{{ coupon.couponType
+                    | TypeFormat }}
+                  </div>
+                </template>
+                <template v-else>
+                  <div class="coupon-tags" :class="coupon.useStatus == 2 || coupon.useStatus == 3 ? 'none' : 'used'">{{
+                    coupon.couponType | TypeFormat }}
+                  </div>
+                </template>
+              </div>
+          </div>
+          <div v-else class="empty">
+            <img src="/img/account/icon-coupon-empty@2x.png">
+            <div class="msg"><p>暂无优惠券数据~</p></div>
+          </div>
+        </div>
+        <!--分页-->
+        <div v-if="(!isPC) && noMore" class="noMore">---- 没有更多了 ----</div>
+        <div v-if="isPC && pageTotal>1" class="pageWrap clear">
+          <a v-if="listQuery.pageNum>1" class="prev" @click="toPagination(listQuery.pageNum*1-1)" href="javascript:void(0);"></a>
+          <template v-for="n in showPageBtn">
+            <a v-if="n" :class="{'on':(n==listQuery.pageNum)}" @click="toPagination(n)" href="javascript:void(0);" v-text="n"></a>
+            <span v-else>···</span>
+          </template>
+          <a v-if="listQuery.pageNum<pageTotal" class="next" @click="toPagination(listQuery.pageNum*1+1)" href="javascript:void(0);"></a>
+          <span>共<b v-text="pageTotal>1?pageTotal:1"></b>页</span>
+          <span>跳至</span>
+          <input v-model="pageInput" @blur="checkNum()"/>
+          <span>页</span>&nbsp;
+          <a class="btn" href="javascript:void(0);" @click="toPagination(pageInput)">点击跳转</a>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+<!-- 引入底部 -->
+<template th:replace="components/footer"></template>
+<template th:replace="components/foot-link"></template>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/product.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/user-center/account/coupon.js(v=${version})}"></script>
+</body>
+</html>

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

@@ -1,219 +1,219 @@
-<!DOCTYPE html>
-<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>
-    <meta charset="UTF-8">
-    <title>采美365网-会员中心</title>
-    <template th:replace="components/head-link"></template>
-    <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
-    <link th:href="@{/css/user-center/member/member-page.css(v=${version})}" rel="stylesheet" type="text/css">
-</head>
-<body>
-<!-- 引用头部 -->
-<template th:replace="components/header"></template>
-<!--内容区域-->
-<!-- 采美豆明细 -->
-<div id="memberPage" v-cloak :style="{ marginBottom: GLOBAL_VIP_FLAG === 1 ? '0' : ''}">
-    <div class="navLayout">
-        <div class="crumbs" v-if="isPC">
-            <span>我的采美</span>
-            <span>&gt;</span>
-            <span>超级会员</span>
-        </div>
-        <div class="wrap clear">
-            <!--左侧导航-->
-            <template th:replace="user-center/components/tableft"></template>
-            <div class="right">
-                <!--会员信息-->
-                <div class="vip-bar">
-                    <div class="left-box" :class="isPC ? 'row1' : 'row2'" v-html="svipTips"></div>
-                    <div class="right-box">
-                        <template v-if="vipInfo.vipFlag !== 0">
-                            <a href="/user/member-record.html" class="link">购买记录</a>
-                            <a href="javascript:void(0)" @click="handleShowRenewPopup" class="btn" onclick="_czc.push(['_trackEvent','续费超级会员','超级会员','续费按钮','','Um_Event_RenewButton'])">续费</a>
-                        </template>
-                    </div>
-                </div>
-                <!--套餐价格 仅未开通和到期显示-->
-                <div class="section" v-if="vipInfo.vipFlag !== 1" id="vipPackage">
-                    <div class="section-title">超级会员套餐</div>
-                    <div class="content combo-list">
-                        <template v-if="comboInfo.length > 0">
-                            <div>
-                                <template v-for="(item, index) in comboInfo">
-                                    <div class="combo" :class="{active: index === currentIndex,recommend: index === 0}"
-                                         :key="index" @click="chooseCombo(index)">
-                                        <div class="how-mounts">{{ item.duration }}个月</div>
-                                        <div class="price"><i>￥</i>{{ item.price }}</div>
-                                        <div class="average">{{ item.price / item.duration }}元/月</div>
-                                    </div>
-                                </template>
-                            </div>
-<!--                            <div><p class="copy-p">使用微信扫描二维码，联系采美客服进行购买</p></div>-->
-<!--                            <div>-->
-<!--                                <div class="wechat-image">-->
-<!--                                    <img src="/img/base/Wecha.png" alt="">-->
-<!--                                </div>-->
-<!--                            </div>-->
-                            <div>
-                                <div class="pay-btn" onclick="_czc.push(['_trackEvent','开通超级会员','超级会员','支付1','','Um_Event_RegisterSuperPayOne'])">
-                                    <a href="javascript:void(0);" @click="payAction(1, 1)">
-                                        立即支付{{ comboInfo[currentIndex].price }}元开通
-                                    </a>
-                                </div>
-                                <div class="pay-btn plain" onclick="_czc.push(['_trackEvent','开通超级会员','超级会员','采美豆抵扣1','','Um_Event_RegisterSuperByBeansOne'])">
-                                    <a href="javascript:void(0);" @click="payAction(2, 1)">
-                                        或抵扣{{ comboInfo[currentIndex].price * comboInfo[currentIndex].proportion }}个采美豆开通
-                                    </a>
-                                </div>
-                            </div>
-                        </template>
-                        <span v-else>暂无可选套餐~</span>
-                    </div>
-                </div>
-                <!--服务列表-->
-                <div class="section">
-                    <div class="section-title">专属特权</div>
-                    <div class="content">
-                        <div class="service-list">
-                            <div v-for="(item, index) in serviceList" :key="index">
-                                <img :src="item.pcIcon"
-                                     v-if="isPC"/>
-                                <img :src="item.h5Icon"
-                                     v-else/>
-                                <span class="tit" v-html="item.name"></span>
-                                <span class="sub-tit" v-html="item.subTitle"></span>
-                                <span class="sub-tit" v-html="item.subTitle1"></span>
-                            </div>
-                        </div>
-                        <div class="service-list two">
-                            <div v-for="(item, index) in serviceList2" :key="index">
-                                <img :src="item.pcIcon"
-                                     v-if="isPC"/>
-                                <img :src="item.h5Icon"
-                                     v-else/>
-                                <span class="tit" v-html="item.name"></span>
-                                <span class="sub-tit" v-html="item.subTitle"></span>
-                                <span class="sub-tit" v-html="item.subTitle1"></span>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-                <!--优惠券列表-->
-                <div class="section" v-if="couponList.length > 0">
-                    <div class="section-title">专属优惠券<span>每三个月可领</span></div>
-                    <div class="content coupon-list clear">
-                        <template v-if="couponList.length > 0">
-                            <div v-for="(item, index) in couponList" :key="index" :class="{'un-received':item.useStatus === 1}">
-                                <span class="type" v-html="item.typeText"></span>
-                                <div class="amount"><i>￥</i>{{ item.couponAmount }}</div>
-                                <div class="condition">满{{ item.touchPrice }}可用</div>
-                                <template>
-                                    <div class="condition" v-if="item.couponType == 0">
-                                      {{ item.productType && item.productType == 1 ? '全商城商品通用' : '仅可购买指定商品'  }}
-                                    </div>
-                                    <div class="condition" v-if="item.couponType == 1">
-                                      {{ item.categoryType == 1 ? '仅限购买产品类商品' : '仅限购买仪器类商品' }}
-                                    </div>
-                                    <div class="condition" v-if="item.couponType == 3">
-                                        <abbr :title="'仅限购买店铺【' + item.shopName + '】的商品'">仅限购买店铺【...】的商品</abbr>
-                                    </div>
-                                    <div class="condition" v-if="item.couponType == 4 || item.couponType == 2">全商城商品通用</div>
-                                </template>
-                                <div class="receive-btn" v-if="!item.getFlag" @click="receiveCoupon(item.couponId)">立即领取</div>
-                                <div class="receive-btn" v-else-if="item.useStatus === 1"  @click="toUseCoupon(item)">去使用</div>
-                                <div class="receive-btn" v-else="item.useStatus === 2">已使用</div>
-                            </div>
-                        </template>
-                        <span v-else>暂无可领取优惠券~</span>
-                    </div>
-
-                </div>
-                <!--优惠商品-->
-                <div class="section" v-if="productList.length > 0">
-                    <div class="section-title clear">专享价商品<a href="/user/member-product.html">查看更多&gt;</a></div>
-                    <div class="content goods-list">
-                        <div class="goods" v-for="(product, index) in productList" :key="index">
-                            <a :href="'/product-' + product.productId + '.html'">
-                                <img src="/img/base/placeholder.png" :data-original="product.image"/>
-                                <div class="goods-title cm-text-ellipsis-2" v-html="product.name"></div>
-                                <div class="goods-tag">
-                                    <span class="tag styl1" v-if="product.couponsLogo">优惠券</span>
-                                    <div class="svip-tag" v-if="product.svipProductFlag === 1">
-                                        <div class="svip-icon ">SVIP</div>
-                                        <!-- 公开价格 && (个人机构 || 资质机构) && 开通SVIP 可查看价格-->
-                                        <template v-if="showVipPriceTag(product)">
-                                            <div class="svip-price">
-                                                <span v-html="product.svipPriceTag"></span>
-                                            </div>
-                                        </template>
-                                    </div>
-                                </div>
-                                <div class="goods-price" v-html="makePrice(product)"></div>
-                            </a>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <!--底部支付按钮 仅未开通和到期显示-->
-    <div class="pay-amount-bottom" id="pay-amount-bottom" v-if="showBottomBtns">
-        <div>
-            <div class="pay-btn plain" onclick="_czc.push(['_trackEvent','开通超级会员','超级会员','采美豆抵扣2','','Um_Event_RegisterSuperByBeansTwo'])">
-                <a href="javascript:void(0);" @click="payAction(2, 2)">
-                    抵扣{{ comboInfo[currentIndex].price * comboInfo[currentIndex].proportion }}个采美豆开通
-                </a>
-            </div>
-            <div class="pay-btn" onclick="_czc.push(['_trackEvent','开通超级会员','超级会员','支付2','','Um_Event_RegisterSuperPayTwo'])">
-                <a href="javascript:void(0);" @click="payAction(1, 2)">
-                    立即支付{{ comboInfo[currentIndex].price }}元开通
-                </a>
-            </div>
-        </div>
-    </div>
-    <!--遮罩-->
-    <div class="mask" v-if="showMask"></div>
-    <!--续费弹窗-->
-    <div class="renew-popup" v-if="showRenewPopup">
-        <div class="popup-title">续费超级会员套餐<span class="close" @click="handleCloseRenewPopup">&times;</span></div>
-        <div class="content combo-list">
-            <template v-if="comboInfo.length > 0">
-                <div>
-                    <template v-for="(item, index) in comboInfo">
-                        <div class="combo" :class="{active: index === currentIndex,recommend: index === 0}"
-                             :key="index" @click="chooseCombo(index)">
-                            <div class="how-mounts">{{ item.duration }}个月</div>
-                            <div class="price"><i>￥</i>{{ item.price }}</div>
-                            <div class="average">{{ item.price / item.duration }}元/月</div>
-                        </div>
-                    </template>
-                </div>
-                <div>
-                    <div class="pay-btn" onclick="_czc.push(['_trackEvent','续费超级会员','超级会员','支付','','Um_Event_RenewSuperPay'])">
-                        <a href="javascript:void(0);" @click="payAction(1, 3)">
-                            立即支付{{ comboInfo[currentIndex].price }}元开通
-                        </a>
-                    </div>
-                    <div class="pay-btn plain" onclick="_czc.push(['_trackEvent','续费超级会员','超级会员','采美豆抵扣','','Um_Event_RenewSuperPayByBeans'])">
-                        <a href="javascript:void(0);" @click="payAction(2, 3)">
-                            或抵扣{{ comboInfo[currentIndex].price * comboInfo[currentIndex].proportion }}个采美豆开通
-                        </a>
-                    </div>
-                </div>
-            </template>
-            <span v-else>暂无可选套餐~</span>
-        </div>
-    </div>
-</div>
-
-<!-- 引入底部 -->
-<template th:replace="components/footer"></template>
-<template th:replace="components/foot-link"></template>
-<script charset="utf-8" type="text/javascript" src="/lib/datapicker/moment-2.29.min.js"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/user.service.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/product.service.js(v=${version})}"></script>
-<script charset="utf-8" type="text/javascript" th:src="@{/js/user-center/member/memberPage.js(v=${version})}"></script>
-</body>
-</html>
+<!DOCTYPE html>
+<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>
+    <meta charset="UTF-8">
+    <title>采美365网-会员中心</title>
+    <template th:replace="components/head-link"></template>
+    <link th:href="@{/css/base/center.css(v=${version})}" rel="stylesheet" type="text/css">
+    <link th:href="@{/css/user-center/member/member-page.css(v=${version})}" rel="stylesheet" type="text/css">
+</head>
+<body>
+<!-- 引用头部 -->
+<template th:replace="components/header"></template>
+<!--内容区域-->
+<!-- 采美豆明细 -->
+<div id="memberPage" v-cloak :style="{ marginBottom: GLOBAL_VIP_FLAG === 1 ? '0' : ''}">
+    <div class="navLayout">
+        <div class="crumbs" v-if="isPC">
+            <span>我的采美</span>
+            <span>&gt;</span>
+            <span>超级会员</span>
+        </div>
+        <div class="wrap clear">
+            <!--左侧导航-->
+            <template th:replace="user-center/components/tableft"></template>
+            <div class="right">
+                <!--会员信息-->
+                <div class="vip-bar">
+                    <div class="left-box" :class="isPC ? 'row1' : 'row2'" v-html="svipTips"></div>
+                    <div class="right-box">
+                        <template v-if="vipInfo.vipFlag !== 0">
+                            <a href="/user/member-record.html" class="link">购买记录</a>
+                            <a href="javascript:void(0)" @click="handleShowRenewPopup" class="btn" onclick="_czc.push(['_trackEvent','续费超级会员','超级会员','续费按钮','','Um_Event_RenewButton'])">续费</a>
+                        </template>
+                    </div>
+                </div>
+                <!--套餐价格 仅未开通和到期显示-->
+                <div class="section" v-if="vipInfo.vipFlag !== 1" id="vipPackage">
+                    <div class="section-title">超级会员套餐</div>
+                    <div class="content combo-list">
+                        <template v-if="comboInfo.length > 0">
+                            <div>
+                                <template v-for="(item, index) in comboInfo">
+                                    <div class="combo" :class="{active: index === currentIndex,recommend: index === 0}"
+                                         :key="index" @click="chooseCombo(index)">
+                                        <div class="how-mounts">{{ item.duration }}个月</div>
+                                        <div class="price"><i>￥</i>{{ item.price }}</div>
+                                        <div class="average">{{ item.price / item.duration }}元/月</div>
+                                    </div>
+                                </template>
+                            </div>
+<!--                            <div><p class="copy-p">使用微信扫描二维码，联系采美客服进行购买</p></div>-->
+<!--                            <div>-->
+<!--                                <div class="wechat-image">-->
+<!--                                    <img src="/img/base/Wecha.png" alt="">-->
+<!--                                </div>-->
+<!--                            </div>-->
+                            <div>
+                                <div class="pay-btn" onclick="_czc.push(['_trackEvent','开通超级会员','超级会员','支付1','','Um_Event_RegisterSuperPayOne'])">
+                                    <a href="javascript:void(0);" @click="payAction(1, 1)">
+                                        立即支付{{ comboInfo[currentIndex].price }}元开通
+                                    </a>
+                                </div>
+                                <div class="pay-btn plain" onclick="_czc.push(['_trackEvent','开通超级会员','超级会员','采美豆抵扣1','','Um_Event_RegisterSuperByBeansOne'])">
+                                    <a href="javascript:void(0);" @click="payAction(2, 1)">
+                                        或抵扣{{ comboInfo[currentIndex].price * comboInfo[currentIndex].proportion }}个采美豆开通
+                                    </a>
+                                </div>
+                            </div>
+                        </template>
+                        <span v-else>暂无可选套餐~</span>
+                    </div>
+                </div>
+                <!--服务列表-->
+                <div class="section">
+                    <div class="section-title">专属特权</div>
+                    <div class="content">
+                        <div class="service-list">
+                            <div v-for="(item, index) in serviceList" :key="index">
+                                <img :src="item.pcIcon"
+                                     v-if="isPC"/>
+                                <img :src="item.h5Icon"
+                                     v-else/>
+                                <span class="tit" v-html="item.name"></span>
+                                <span class="sub-tit" v-html="item.subTitle"></span>
+                                <span class="sub-tit" v-html="item.subTitle1"></span>
+                            </div>
+                        </div>
+                        <div class="service-list two">
+                            <div v-for="(item, index) in serviceList2" :key="index">
+                                <img :src="item.pcIcon"
+                                     v-if="isPC"/>
+                                <img :src="item.h5Icon"
+                                     v-else/>
+                                <span class="tit" v-html="item.name"></span>
+                                <span class="sub-tit" v-html="item.subTitle"></span>
+                                <span class="sub-tit" v-html="item.subTitle1"></span>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <!--优惠券列表-->
+                <div class="section" v-if="couponList.length > 0">
+                    <div class="section-title">专属优惠券<span>每三个月可领</span></div>
+                    <div class="content coupon-list clear">
+                        <template v-if="couponList.length > 0">
+                            <div v-for="(item, index) in couponList" :key="index" :class="{'un-received':item.useStatus === 1}">
+                                <span class="type" v-html="item.typeText"></span>
+                                <div class="amount"><i>￥</i>{{ item.couponAmount }}</div>
+                                <div class="condition">满{{ item.touchPrice }}可用</div>
+                                <template>
+                                    <div class="condition" v-if="item.couponType == 0">
+                                      {{ item.productType && item.productType == 1 ? '全商城商品通用' : '仅可购买指定商品'  }}
+                                    </div>
+                                    <div class="condition" v-if="item.couponType == 1">
+                                      {{ item.categoryType == 1 ? '仅限购买产品类商品' : '仅限购买仪器类商品' }}
+                                    </div>
+                                    <div class="condition" v-if="item.couponType == 3">
+                                        <abbr :title="'仅限购买店铺【' + item.shopName + '】的商品'">仅限购买店铺【...】的商品</abbr>
+                                    </div>
+                                    <div class="condition" v-if="item.couponType == 4 || item.couponType == 2">全商城商品通用</div>
+                                </template>
+                                <div class="receive-btn" v-if="!item.getFlag" @click="receiveCoupon(item.couponId)">立即领取</div>
+                                <div class="receive-btn" v-else-if="item.useStatus === 1"  @click="toUseCoupon(item)">去使用</div>
+                                <div class="receive-btn" v-else="item.useStatus === 2">已使用</div>
+                            </div>
+                        </template>
+                        <span v-else>暂无可领取优惠券~</span>
+                    </div>
+
+                </div>
+                <!--优惠商品-->
+                <div class="section" v-if="productList.length > 0">
+                    <div class="section-title clear">专享价商品<a href="/user/member-product.html">查看更多&gt;</a></div>
+                    <div class="content goods-list">
+                        <div class="goods" v-for="(product, index) in productList" :key="index">
+                            <a :href="'/product-' + product.productId + '.html'">
+                                <img src="/img/base/placeholder.png" :data-original="product.image"/>
+                                <div class="goods-title cm-text-ellipsis-2" v-html="product.name"></div>
+                                <div class="goods-tag">
+                                    <span class="tag styl1" v-if="product.couponsLogo">优惠券</span>
+                                    <div class="svip-tag" v-if="product.svipProductFlag === 1">
+                                        <div class="svip-icon ">SVIP</div>
+                                        <!-- 公开价格 && (个人机构 || 资质机构) && 开通SVIP 可查看价格-->
+                                        <template v-if="showVipPriceTag(product)">
+                                            <div class="svip-price">
+                                                <span v-html="product.svipPriceTag"></span>
+                                            </div>
+                                        </template>
+                                    </div>
+                                </div>
+                                <div class="goods-price" v-html="makePrice(product)"></div>
+                            </a>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <!--底部支付按钮 仅未开通和到期显示-->
+    <div class="pay-amount-bottom" id="pay-amount-bottom" v-if="showBottomBtns">
+        <div>
+            <div class="pay-btn plain" onclick="_czc.push(['_trackEvent','开通超级会员','超级会员','采美豆抵扣2','','Um_Event_RegisterSuperByBeansTwo'])">
+                <a href="javascript:void(0);" @click="payAction(2, 2)">
+                    抵扣{{ comboInfo[currentIndex].price * comboInfo[currentIndex].proportion }}个采美豆开通
+                </a>
+            </div>
+            <div class="pay-btn" onclick="_czc.push(['_trackEvent','开通超级会员','超级会员','支付2','','Um_Event_RegisterSuperPayTwo'])">
+                <a href="javascript:void(0);" @click="payAction(1, 2)">
+                    立即支付{{ comboInfo[currentIndex].price }}元开通
+                </a>
+            </div>
+        </div>
+    </div>
+    <!--遮罩-->
+    <div class="mask" v-if="showMask"></div>
+    <!--续费弹窗-->
+    <div class="renew-popup" v-if="showRenewPopup">
+        <div class="popup-title">续费超级会员套餐<span class="close" @click="handleCloseRenewPopup">&times;</span></div>
+        <div class="content combo-list">
+            <template v-if="comboInfo.length > 0">
+                <div>
+                    <template v-for="(item, index) in comboInfo">
+                        <div class="combo" :class="{active: index === currentIndex,recommend: index === 0}"
+                             :key="index" @click="chooseCombo(index)">
+                            <div class="how-mounts">{{ item.duration }}个月</div>
+                            <div class="price"><i>￥</i>{{ item.price }}</div>
+                            <div class="average">{{ item.price / item.duration }}元/月</div>
+                        </div>
+                    </template>
+                </div>
+                <div>
+                    <div class="pay-btn" onclick="_czc.push(['_trackEvent','续费超级会员','超级会员','支付','','Um_Event_RenewSuperPay'])">
+                        <a href="javascript:void(0);" @click="payAction(1, 3)">
+                            立即支付{{ comboInfo[currentIndex].price }}元开通
+                        </a>
+                    </div>
+                    <div class="pay-btn plain" onclick="_czc.push(['_trackEvent','续费超级会员','超级会员','采美豆抵扣','','Um_Event_RenewSuperPayByBeans'])">
+                        <a href="javascript:void(0);" @click="payAction(2, 3)">
+                            或抵扣{{ comboInfo[currentIndex].price * comboInfo[currentIndex].proportion }}个采美豆开通
+                        </a>
+                    </div>
+                </div>
+            </template>
+            <span v-else>暂无可选套餐~</span>
+        </div>
+    </div>
+</div>
+
+<!-- 引入底部 -->
+<template th:replace="components/footer"></template>
+<template th:replace="components/foot-link"></template>
+<script charset="utf-8" type="text/javascript" src="/lib/datapicker/moment-2.29.min.js"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/center.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/user.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/common/serviceapi/product.service.js(v=${version})}"></script>
+<script charset="utf-8" type="text/javascript" th:src="@{/js/user-center/member/memberPage.js(v=${version})}"></script>
+</body>
+</html>