فهرست منبع

确认订单修改bug

zhengjinyi 4 سال پیش
والد
کامیت
97d3918925

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

@@ -109,7 +109,7 @@ li{list-style:none}
     /*.section-botton .inner{width: 1184px;margin: 0 auto;}*/
     .section-botton .btn{width: 88px;height: 34px;border-radius: 2px;border: 1px solid #FFF;float: right;margin-left: 16px;font-size: 14px;line-height: 34px;text-align: center;display: block;}
     .section-botton .btn.cancel{border-color: #9aa5b5;background-color: #FFFFFF;color: #22272e;}
-    .section-botton .btn.primary{border-color: #E15616;background-color: #E15616;color: #FFFFFF;}
+    .section-botton .btn.primary{border-color: #E15616;background-color: #E15616;color: #FFFFFF;position: relative;}
     .section-botton .btn.primary .tips{width: 44px;height: 19px;line-height: 19px;text-align: center;border-radius: 10px;background-color: #ffe6dc;font-size: 12px;color: #E15616;position: absolute;right:0px;top: -25px;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);}
     .section-botton .btn.primary.confirm{line-height: 17px;}

+ 2 - 2
src/main/resources/templates/user-center/account/beans.html

@@ -15,9 +15,9 @@
 <div id="beansPage" v-cloak>
     <div class="navLayout" v-cloak>
         <div v-if="isPC" class="crumbs">
-            <span>我的交易</span>
+            <span>我的采美</span>
             <span>&gt;</span>
-            <span>我的订单</span>
+            <span>采美豆</span>
         </div>
         <div class="wrap clear">
             <!--左侧导航-->

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

@@ -69,6 +69,7 @@
                                     <p v-if="orderInfo.freePostFlag == '0'">运费:<span class="none">包邮</span> </p>
                                     <p v-if="orderInfo.freePostFlag == '-1'">运费:<span class="none">到付</span> </p>
                                     <p v-if="orderInfo.freePostFlag == '1'">运费:<span class="none">¥{{orderInfo.freight | NumFormat}}</span> </p>
+                                    <p>采美豆抵用运费:<span class="none">{{orderInfo.userBeans }}</span> </p>
                                     <p v-if="orderInfo.discountFee!=0">经理折扣:<span class="none">¥{{orderInfo.discountFee | NumFormat}}</span> </p>
                                     <p>促销满减:<span class="none">¥{{orderInfo.promotionFullReduction | NumFormat}}</span> </p>
                                     <p>赠品数:<span class="none">{{orderInfo.presentCount}}</span></p>