فهرست منبع

特殊商品退货须知接口调试

yuwenjun1997 2 سال پیش
والد
کامیت
bef745313d

+ 6 - 1
src/main/resources/static/css/product/detail.h5.css

@@ -100,7 +100,7 @@ li{list-style:none}
 .productInfo .tabTit span{display:inline-block;height:7.5vw;line-height:7.5vw;border-bottom:2px solid transparent;color:#93979F;font-size:3.4vw;margin-left:8vw;}
 .productInfo .tabTit span.on{color:#E15621;border-color:#E15621}
 .productInfo .tabTit span:first-child{margin-left:0;}
-.productInfo .tabCon{padding:1.2vw 3.3vw 3.3vw;text-align:center;font-size:3.4vw;}
+.productInfo .tabCon{padding:1.2vw 3.3vw 3.3vw;text-align:center;font-size:3.4vw;word-break: break-all;}
 .productInfo .tabCon img{max-width:100%;height:auto!important;}
 .productInfo .tabCon table{width:100%;text-align:left}
 .productInfo .tabCon td{padding:1.5vw;line-height:5vw}
@@ -190,3 +190,8 @@ li{list-style:none}
 
 /*图片预览背景*/
 .viewer-backdrop{z-index:13140 !important;background:#000 !important}
+
+/* 特殊商品退货须知 */
+.return-instructions{ background: #fff; box-sizing: border-box;margin-bottom: 2.6vw; }
+.return-instructions .hd{font-size:3.4vw;color:#e15616;font-weight:bold;background:#ffe6dc; padding: 0 3.3vw; line-height: 12vw }
+.return-instructions .bd{font-size: 3.6vw; color: #22272E; padding: 4.2vw 3.3vw;line-height: 5.6vw;}

+ 1 - 1
src/main/resources/static/css/product/detail.pc.css

@@ -207,7 +207,7 @@ li{list-style:none;}
 .productInfo .tabTit span{display:inline-block;box-sizing:border-box;min-width:130px;text-align:center;height:100%;padding:0 32px;cursor:pointer}
 .productInfo .tabTit span:hover{color:#E15621}
 .productInfo .tabTit span.on,.productInfo .tabTit span.on:hover{background:#ffe6dc;color:#e15616;font-weight: bold;}
-.productInfo .tabCon{padding:16px;text-align:center}
+.productInfo .tabCon{padding:16px;text-align:center;word-break: break-all;}
 .productInfo .tabCon img{width:100%;height: auto;}
 .productInfo .tabCon table{width:100%;text-align:left}
 .productInfo .tabCon td{padding:10px 12px;line-height:20px}

+ 36 - 5
src/main/resources/static/css/shopping/shopping.css

@@ -3,6 +3,8 @@ 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;}
 [v-cloak]{display: none}
+#globalHead.fiexd{position: sticky !important;z-index: 996 !important;}
+/*.summaryWrap{position: sticky !important;top: calc(100vh - 117px) !important; left: 0 !important;}*/
 /**
  * PC端
  */
@@ -143,8 +145,13 @@ li{list-style:none}
     .couponWrap .coupon-list-cell .coupon-tags{height: 24px;line-height: 24px;text-align: center;border-radius: 8px 0 8px 0;position: absolute;top: 0;left: 0;padding: 0 10px;background-color: #f94b4b;color: #FFF;}
 
     /* 底部结算 */
-    .summaryWrap{width:100%;background:#FFF;margin:16px 0 -29px 0;position:relative}
-    .summaryWrap .summary{width:1184px;margin:0 auto;font-size:18px;padding:11px 0;height:50px;line-height:50px;text-align:right}
+    .summary-wrapper{height:117px;margin:8px 0 -30px}
+    .summaryWrap{width:100%;background:#FFF;position:relative}
+    .summaryWrap .agreement{background:#FFFAF8}
+    .summaryWrap .agreement .agreement-content{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:end;-ms-flex-pack:end;justify-content:flex-end;width:1184px;margin:0 auto;text-align:right;height:48px;color:#22272E}
+    .summaryWrap .agreement .agreement-content input{margin-right:8px;cursor:pointer}
+    .summaryWrap .agreement span{color:#1890F9;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}
+    .summaryWrap .summary{width:1184px;margin:0 auto;font-size:18px;padding:16px 0;height:50px;line-height:50px;text-align:right}
     .summaryWrap .summary em{font-style:normal;color: #f55c5c;}
     .summaryWrap .summary .left,.summaryWrap .summary .right{display:inline}
     .summaryWrap .summary .left .item:first-child{float:left}
@@ -162,7 +169,7 @@ li{list-style:none}
     .summaryWrap .summary .totalCoupon{font-size:14px;line-height:24px;color: #f55c5c;text-align: left;}
     .summaryWrap .summary .submit{display:inline-block;width:232px;height:50px;line-height:50px;text-align:center;background:linear-gradient(135deg,rgba(242,143,49,1) 0%,rgba(225,86,22,1) 100%);border-radius:2px;color:#FFF;float: right;}
     .summaryWrap .summary .submit.dis{background:#999;}
-    .summaryWrap.fixed{position:fixed;bottom:0;left:0;margin:0;z-index:99999;box-shadow:20px 20px 102px rgba(0,0,0,0.1)}
+    .summaryWrap.fixed{position:fixed;bottom:0;left:0;margin:0;z-index:996;box-shadow:20px 20px 102px rgba(0,0,0,0.1)}
     .summaryWrap .summary .back{color:#f55c5c}
     .summaryWrap .summary .back .icon:before{width:20px;height:20px;background-position:-345px 0;margin-right:15px}
     .priceTotal{position:relative;text-align:right;height: 50px;line-height: 50px;display:inline-block;}
@@ -171,6 +178,14 @@ li{list-style:none}
     .priceTotal .dl em{position:absolute;top:-12px;height:24px;white-space:nowrap;right:0;background:#ff4500;line-height:24px;color:#FFF;padding:0 12px;border-radius:2px;font-size:14px}
     .priceTotal .dl em:before{content:'';width:0;height:0;border-width:5px 5px 0 5px;border-style:solid;border-color:#ff4500 transparent;position:absolute;top:24px;left:50%}
 
+    /* 退货协议弹窗 */
+    .dialog-agreement-wrapper .mask{position:fixed;width:100vw;height:100vh;background:rgba(0,0,0,.7);left:0;top:0;z-index:998}
+    .dialog-agreement-wrapper .dialog-agreement{position:fixed;width:400px;background:#fff;left:50%;top:50%;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%);z-index:999;border-radius:2px}
+    .dialog-agreement-wrapper .dialog-agreement .dialog-title{font-size:16px;color:#4A4F58;font-weight:bold;text-align:center;padding:16px 24px}
+    .dialog-agreement-wrapper .dialog-agreement .dialog-content{font-size:14px;color:#22272E;text-align:justify;padding:16px 24px;line-height:24px;max-height: 160px;overflow-y: auto;}
+    .dialog-agreement-wrapper .dialog-agreement .dialog-footer{padding:16px 24px;text-align:right}
+    .dialog-agreement-wrapper .dialog-agreement .dialog-footer .confirm{width:88px;height:32px;color:#fff;background:#E15616;text-align:center;line-height:32px;border:0;cursor:pointer}
+
     /* 收货地址 */
     .addressWrap{padding:16px;position:relative;    box-sizing: border-box;
     text-align: center;
@@ -313,6 +328,9 @@ li{list-style:none}
 @media screen and (max-width:768px){
     footer{display: none;}
     h2.title>a{color: #E15621;margin-left: 2vw;}
+    #globalHead{z-index: 996 !important;}
+    .priceTag .tag:before{top: 0.2vw;transition:none;}
+    .priceTag .close{color: #e15616;}
     .pageTitle .step{width:100%;height:12.4vw;line-height:12.4vw;background:#FFF;color:#9AA5B5;font-size:3.1vw;text-align:center}
     .pageTitle .step span{display:inline-block;height:4.2vw;line-height:4.2vw;vertical-align:middle;position:relative;padding-right:6.4vw}
     .pageTitle .step span:before{font-style:normal;font-size:5.2vw;vertical-align:text-top;margin-right:1vw}
@@ -366,6 +384,7 @@ li{list-style:none}
     .listWrap .cartItem .c2{top:2.2vw;height:10vw;width:58vw}
     .listWrap .cartItem .c2 .name{color:#22272e;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-line-clamp:2;-webkit-box-orient:vertical}
     .listWrap .cartItem .c3{top:14vw;height:5vw}
+    .listWrap .cartItem .c3.confirm{top: 20.4vw;height: 5vw;left: 66.3vw;}
     .listWrap .cartItem .c4{bottom:2.2vw;height:5vw}
     .listWrap .cartItem .c5{position:absolute;right:3.3vw;bottom:2.2vw;height:6.4vw;line-height:6.4vw}
     .listWrap .cartItem .c10{color:#f94b4b;top:16vw;height:5vw}
@@ -435,7 +454,12 @@ li{list-style:none}
 
     /* 底部结算 */
     /*.listWrap{padding-bottom: 24vw;}*/
-    #shoppingConfirm .wrap{padding-bottom: 14vw;}
+    #shoppingConfirm .wrap{padding-bottom: 22.8vw;}
+    /* 底部结算 */
+    .summaryWrap .agreement{background:#FFFAF8}
+    .summaryWrap .agreement .agreement-content{display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-align:center;-ms-flex-align:center;align-items:center;width:100%;height:8.8vw;color:#22272E;-webkit-box-sizing:border-box;box-sizing:border-box;padding-left:4.6vw;font-size: 3.4vw;}
+    .summaryWrap .agreement .agreement-content input{margin-right:2.4vw}
+    .summaryWrap .agreement span{color:#1890F9;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}
     .summaryWrap{width:100%;background:#FFF;position: fixed;bottom: 0;left: 0;}
     .summaryWrap .summary{width:93vw;margin:0 auto;font-size:3.4vw;padding:1.5vw 0}
     .summaryWrap .summary em{font-style:normal}
@@ -454,7 +478,7 @@ li{list-style:none}
     .summaryWrap .summary .totalPrice span{color: #f55c5c;}
     .summaryWrap .summary .totalCoupon{font-size:3vw;line-height:5.1vw;color: #f55c5c;text-align: left;}
     .summaryWrap .summary .submit{display:inline-block;width:30.4vw;height:11.2vw;line-height:11.2vw;text-align:center;background-color:#e15616;border-radius:2px;color:#FFF;float: right;}
-    .summaryWrap.fixed{position:fixed;bottom:0;left:0;margin:0;z-index:99999;box-shadow:20px 20px 102px rgba(0,0,0,0.1)}
+    .summaryWrap.fixed{position:fixed;bottom:0;left:0;margin:0;z-index:996;box-shadow:20px 20px 102px rgba(0,0,0,0.1)}
     .priceTotal{position:relative;text-align:right;margin-left:6.8vw;height:10.6vw;line-height:18vw;display:inline-block;}
     .priceTotal em{color:#f55c5c}
     .priceTotal .dl{position:absolute;right:0;top:3vw;cursor:pointer;height:5vw;line-height:5vw;font-size:3.1vw}
@@ -556,5 +580,12 @@ li{list-style:none}
     .confirm-Model .model-content .button a.cancel{background: #FFFFFF;border-color: #B8BFCA;color: #333333;}
     .confirm-Model .model-content .button a.confirm{background: #E15616;margin-bottom: 2vw}
 
+    /* 退货协议弹窗 */
+    .dialog-agreement-wrapper .mask{position:fixed;width:100vw;height:100vh;background:rgba(0,0,0,.7);left:0;top:0;z-index:998}
+    .dialog-agreement-wrapper .dialog-agreement{position:fixed;width:74.6vw;background:#fff;left:50%;top:50%;-webkit-transform:translate(-50%,-50%);-ms-transform:translate(-50%,-50%);transform:translate(-50%,-50%);z-index:999;border-radius:1.6vw;}
+    .dialog-agreement-wrapper .dialog-agreement .dialog-title{font-size:3.6vw;color:#4A4F58;font-weight:bold;text-align:center;padding:4.8vw 6vw;}
+    .dialog-agreement-wrapper .dialog-agreement .dialog-content{font-size:3.4vw;color:#333333;text-align:justify;padding:2.4vw 6vw;line-height:6.4vw;max-height: 36vw;overflow-y: auto;}
+    .dialog-agreement-wrapper .dialog-agreement .dialog-footer{padding:4.8vw 6vw;text-align:right}
+    .dialog-agreement-wrapper .dialog-agreement .dialog-footer .confirm{display: block;width: 100%; height:9.9vw;color:#fff;background:#E15616;text-align:center;line-height:9.9vw;border:0;}
 }
 

+ 4 - 1
src/main/resources/static/css/user-center/order/detail.css

@@ -117,6 +117,8 @@ li{list-style:none}
     .section-botton .price-total{text-align: right;color: #22272e;font-size: 16px;float: right;padding-top: 0;line-height: 36px;}
     .section-botton.fiexd{position: fixed;bottom: 0;right: 0;}
     .section-botton.fiexd .inner{width: 1184px;margin: 0 auto;z-index: 9999;}
+    /* 特殊商品退货须知 */
+    .return-instructions{padding: 16px 24px;background: #FFFAF8; color: #E15616; font-size: 14px;margin-bottom: 8px;line-height: 24px}
 }
 
 /**
@@ -191,7 +193,8 @@ li{list-style:none}
     .section-botton .btn.primary.confirm{line-height: 4.5vw;}
     .section-botton .btn.primary .tips{width: 12.6vw;height: 4.8vw;line-height: 4.8vw;text-align: center;border-radius: 2.4vw;background-color: #ffe6dc;font-size: 2.8vw;color: #E15616;position: absolute;right: -2vw;top: -6.5vw;z-index: 99;}
     .section-botton .btn.primary .tips:before{content: '';width: 6px;height: 6px;background-color: #ffe6dc;position: absolute;bottom: -3px;left: 12px;z-index: -1;transform:rotate(45deg);}
-
+    /* 特殊商品退货须知 */
+    .return-instructions{padding: 4vw 3.3vw;background: #FFFAF8; color: #E15616; font-size: 3.4vw;margin-top: 1.5vw; line-height: 5.6vw;}
 
 
 

+ 5 - 1
src/main/resources/static/js/product/detail.js

@@ -70,7 +70,9 @@ var productDetail = new Vue({
         totalPrice:0,  // 勾选配套商品总价格
         totalNumber:0, // 勾选配套商品总数量
         isShowCaimeiShop:false,
-        isHideButton:false
+        isHideButton:false,
+        returnGoodsStutas: false, // 当前商品是否为特殊商品
+        helpContent: '' // 退货提示
     },
     filters: {
         TypeFormat: function (value) {
@@ -188,6 +190,8 @@ var productDetail = new Vue({
                     _self.recommendType = product.recommendType ? product.recommendType : 0;
                     _self.archiveId = product.archiveId; // 保存资料列表id
                     _self.productDetailChose = product.productDetailChose; // 同资质机构显示商品详情
+                    _self.returnGoodsStutas = product.returnGoodsStutas === 2 // 当前商品是否为特殊商品 1不是 2是
+                    _self.helpContent = product.helpContent
                     if(product.tinyTypeName){
                         $pageLabel = product.tinyTypeName
                     }else if(!product.tinyTypeName && product.smallTypeName){

+ 28 - 13
src/main/resources/static/js/shopping/confirm.js

@@ -126,7 +126,11 @@ var shoppingConfirm = new Vue({
         svipReducedPrice: 0, //超级会员优惠金额
         isModelAlert:false, // 订单不足提示弹窗
         isModelAlertText:'',
-        isShowConfirm:true
+        isShowConfirm:true,
+        showAgreement: false, // 特殊商品退货须知弹窗
+        returnGoodsStutas: false, // 当前商品是否为特殊商品
+        helpContent: '', // 退货提示
+        agreementActive: false
     },
     computed: {
 
@@ -161,6 +165,9 @@ var shoppingConfirm = new Vue({
         }
     },
     methods: {
+        handleCheckboxChange: function(){
+            console.log(this.agreementActive)
+        },
         blurHandle: function(event) {
             var el = event.currentTarget;
             verifyHandle(el);
@@ -211,6 +218,8 @@ var shoppingConfirm = new Vue({
             _self.svipReducedPrice = data.svipReducedPrice;
             _self.postageParam.skuIds =  _self.getProductIds(data.list); // 获取订单商品id列表 以 , 隔开
             _self.getAddressList(_self.userId,20);
+            _self.returnGoodsStutas = data.returnGoodsStutas === 2 // 当前商品是否为特殊商品 1不是 2是
+            _self.helpContent = data.helpContent
             console.log('邮费接口数据',  _self.postageParam)
             if( data.couponList &&  data.couponList.length>0){
                 _self.isCouponShow = true;
@@ -660,10 +669,12 @@ var shoppingConfirm = new Vue({
         },
         submitOrder: function(){// 提交按钮点击
             var _self = this;
-            if( _self.totalPrice<1000){
+            if (_self.returnGoodsStutas && !_self.agreementActive) {
+                CAIMEI.Alert('请先阅读《特殊商品退货须知》并勾选后再提交订单~', '确定', false);
+            } else if (_self.totalPrice < 1000) {
                 _self.isModelAlert = true;
                 _self.isModelAlertText = '采购金额过小,将扣除500采美豆。建议您使用微信扫描 以下二维码,进入采美旗下“颜选美学”小程序购买小额 商品。';
-            }else{
+            } else {
                 _self.handleClickOrderSubmitMit()
             }
         },
@@ -837,16 +848,20 @@ var shoppingConfirm = new Vue({
         }
     },
     mounted: function () {
-        var _self = this;
-        var minAwayBtm = $("footer").height();
-        //处理滚动条控制底部提交fixed
-        $(window).scroll(function() {
-            var awayBtm = $(document).height() - $(window).scrollTop() - $(window).height();
-            if(minAwayBtm <= awayBtm){
-                $(".summaryWrap").addClass('fixed');
-            }else{
-                $(".summaryWrap").removeClass("fixed");
+        // 底部导航栏悬浮
+        $(window).on('scroll', function(){
+            if($(window).scrollTop() + window.innerHeight > $('footer').offset().top){
+                $("#shoppingConfirm .summaryWrap").removeClass('fixed');
+            } else{
+                $("#shoppingConfirm .summaryWrap").addClass("fixed");
             }
-        });
+        })
+        // 底部导航栏高度不一致问题
+        var height = $('#shoppingConfirm .summaryWrap').height() + 'px'
+        if(isPC){
+            $('#shoppingConfirm .summary-wrapper').css('height', height)
+        }else{
+            $('#shoppingConfirm .wrap').css('padding-bottom', height)
+        }
     }
 });

+ 5 - 1
src/main/resources/static/js/user-center/order/detail.js

@@ -18,7 +18,9 @@ var orderPage = new Vue({
         isShowBeansAlet:false,
         bgImagePath:'',//根据类型显示图片标记
         beanNumber:100,
-        beansType:7
+        beansType:7,
+        returnGoodsStutas: false, // 当前商品是否为特殊商品 1是 2不是
+        helpContent: '' // 退货提示
     },
     filters: {
         NumFormat:function(text) {//处理金额
@@ -83,6 +85,8 @@ var orderPage = new Vue({
                     _self.returnedPurchaseList = data.returnedPurchaseList;
                     _self.orderIdentificationId = '#'+ _self.orderInfo.orderId+'#';
                     _self.isRequset = false;
+                    _self.returnGoodsStutas = data.returnGoodsStutas === 2 // 当前商品是否为特殊商品 1不是 2是
+                    _self.helpContent = data.helpContent
                 }else{
                     CAIMEI.Alert(response.msg, '确定', true,function () {
                         location.href = '/user/dashboard.html';

+ 9 - 5
src/main/resources/templates/product/detail.html

@@ -578,6 +578,11 @@
                 <span>满意度:<em><i th:each="i:${#numbers.sequence(1,5)}" class="mIcon heart"></i></em></span>
             </a>
         </div>
+        <!-- 特殊商品退货须知 -->
+        <div class="return-instructions" v-if="!isPC && returnGoodsStutas">
+            <div class="hd">特殊商品退货须知</div>
+            <div class="bd" v-html="helpContent"></div>
+        </div>
         <div class="productInfo">
             <div class="tabTit">
                 <span :class="tabsIndex == 0 ? 'on' : ''" @click="detailsClicktab(0)">商品详情</span>
@@ -780,11 +785,10 @@
                     <div>153-3885-1365</div>
                 </div>
             </div>
-            <div class="return-instructions section">
-                <div class="hd">提货须知</div>
-                <div class="bd">
-                    为保障会员权益,特殊类商品(包括耗材/配件/私密商品等),除外观跟质量问题之外,其他原因均不支持退货!
-                </div>
+            <!-- 特殊商品退货须知 -->
+            <div class="return-instructions section" v-if="returnGoodsStutas">
+                <div class="hd">特殊商品退货须知</div>
+                <div class="bd" v-html="helpContent"></div>
             </div>
         </div>
         <!--优惠券弹窗-->

+ 29 - 12
src/main/resources/templates/shopping/confirm.html

@@ -145,7 +145,7 @@
                             <span v-text="cart.name"></span>
                         </a>
                     </div>
-                    <div class="c5">{{cart.unit}}</div>
+                    <div class="c3 confirm">{{cart.unit}}</div>
                     <div class="c4">
                         <div class="price">
                             <template v-if="cart.svipProductFlag == 1">
@@ -361,19 +361,24 @@
             </p>
         </div>
     </div>
-    <div class="summaryWrap">
-        <div class="summary">
-            <div v-if="isPC" class="left">
-                <div class="item">
-                    <a href="/shopping/cart.html" class="back" rel="nofollow"><i class="icon mIcon"></i>返回购物车</a>
-                </div>
+    <div class="summary-wrapper">
+        <div class="summaryWrap fixed">
+            <div class="agreement" v-if="returnGoodsStutas">
+                <div class="agreement-content"><input type="checkbox" v-model="agreementActive" @change="handleCheckboxChange"/>提交订单前,请先阅读<span  @click="showAgreement = true">《特殊商品退货须知》</span></div>
             </div>
-            <div class="right mfbt">
-                <div class="totalMoney">
-                    <div class="totalPrice" :class="totalDiscountAmount == 0 ? 'none' : ''">总价:<span>¥{{hanldShouldPayFee | NumFormat}}</span></div>
-                    <div class="totalCoupon" v-if="totalDiscountAmount > 0">共减:¥{{ totalDiscountAmount | NumFormat }}</div>
+            <div class="summary">
+                <div v-if="isPC" class="left">
+                    <div class="item">
+                        <a href="/shopping/cart.html" class="back" rel="nofollow"><i class="icon mIcon"></i>返回购物车</a>
+                    </div>
+                </div>
+                <div class="right mfbt">
+                    <div class="totalMoney">
+                        <div class="totalPrice" :class="totalDiscountAmount == 0 ? 'none' : ''">总价:<span>¥{{hanldShouldPayFee | NumFormat}}</span></div>
+                        <div class="totalCoupon" v-if="totalDiscountAmount > 0">共减:¥{{ totalDiscountAmount | NumFormat }}</div>
+                    </div>
+                    <a :class="submitLoading?'submit dis':'submit'" href="javascript:void(0);" @click="submitOrder()" onclick="_czc.push(['_trackEvent','确认订单','点击','用户提交订单','','Um_Event_ConfirmOrder'])">提交订单</a>
                 </div>
-                <a :class="submitLoading?'submit dis':'submit'" href="javascript:void(0);" @click="submitOrder()" onclick="_czc.push(['_trackEvent','确认订单','点击','用户提交订单','','Um_Event_ConfirmOrder'])">提交订单</a>
             </div>
         </div>
     </div>
@@ -429,6 +434,18 @@
             </div>
         </div>
     </div>
+
+    <!--  退货协议弹窗  -->
+    <div class="dialog-agreement-wrapper" v-if="showAgreement">
+        <div class="mask"></div>
+        <div class="dialog-agreement">
+            <div class="dialog-title">特殊商品退货须知</div>
+            <div class="dialog-content" v-html="helpContent"></div>
+            <div class="dialog-footer">
+                <button class="confirm" @click="showAgreement = false">确定</button>
+            </div>
+        </div>
+    </div>
 </div>
 <!-- 引入底部 -->
 <template th:replace="components/footer"></template>

+ 2 - 0
src/main/resources/templates/user-center/order/detail.html

@@ -78,6 +78,8 @@
                                 </div>
                             </div>
                         </div>
+                        <!-- 特殊商品退货须知 -->
+                        <div class="return-instructions shadow" v-if="returnGoodsStutas" v-html="helpContent"></div>
                         <div class="section-list shadow">
                             <div class="section-shopinfo" v-for="(shop, index) in shopOrderList" :key="index">
                                 <div class="title">