ソースを参照

线上支付开关,删除入驻咨询弹窗,优化二手商品详情放大镜

zhengjinyi 4 年 前
コミット
96cd0d69e5

+ 4 - 3
src/main/resources/templates/shopping/confirm.html

@@ -209,8 +209,9 @@
         <h2 class="title">发票信息</h2>
         <div class="invoiceWrap">
             <div class="formLine">
-                <label class="diyBox"><input type="radio" name="invoice" v-model="invoice.type" value="0" checked><i class="icon mIcon">不要发票</i></label>
-                <label class="diyBox"><input type="radio" name="invoice" v-model="invoice.type" value="2"><i class="icon mIcon">要发票</i></label>
+                <label class="diyBox"><input type="radio" name="invoice" v-model="invoice.type" value="0" checked><i class="icon mIcon">不开发票</i></label>
+                <label class="diyBox"><input type="radio" name="invoice" v-model="invoice.type" value="1"><i class="icon mIcon">普通发票</i></label>
+                <label class="diyBox"><input type="radio" name="invoice" v-model="invoice.type" value="2"><i class="icon mIcon">增值税发票</i></label>
             </div>
             <div class="invoiceForm" v-show="invoice.type==1"><!--普通发票-->
                 <div class="formLine">
@@ -352,4 +353,4 @@
 <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/shopping/confirm.js(v=${version})}"></script>
 </body>
-</html>
+</html>

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

@@ -40,7 +40,7 @@
                         <div class="message">
                             <a href="/user/message/list.html">
                                 <i class="icon mIcon">
-                                    <span  v-if="unReadMessageCount>0" :class="[unReadMessageCount < 10 ? 'circular':'ellipse']">{{unReadMessageCount == 99 ? '99+' : unReadMessageCount}}</span>
+                                    <span  v-if="unReadMessageCount>0" :class="[unReadMessageCount < 10 ? 'circular':'ellipse']">{{unReadMessageCount >= 99 ? '99+' : unReadMessageCount}}</span>
                                 </i>
                             </a>
                         </div>
@@ -58,7 +58,7 @@
                                     <div class="item">
                                         <a href="javascript:void(0);" @click="orderListPath(1)">
                                             <i class="icon icon-1">
-                                                <span v-if="confirmedCount>0" :class="[confirmedCount < 10 ? 'circular':'ellipse']">{{confirmedCount == 99 ? '99+' : confirmedCount}}</span>
+                                                <span v-if="confirmedCount>0" :class="[confirmedCount < 10 ? 'circular':'ellipse']">{{confirmedCount >= 99 ? '99+' : confirmedCount}}</span>
                                             </i>
                                             <span class="p">待确认</span>
                                         </a>
@@ -66,7 +66,7 @@
                                     <div class="item">
                                         <a href="javascript:void(0);" @click="orderListPath(2)">
                                             <i class="icon icon-2">
-                                                <span v-if="paymentCount>0" :class="[paymentCount < 10 ? 'circular':'ellipse']">{{paymentCount == 99 ? '99+' : paymentCount}}</span>
+                                                <span v-if="paymentCount>0" :class="[paymentCount < 10 ? 'circular':'ellipse']">{{paymentCount >= 99 ? '99+' : paymentCount}}</span>
                                             </i>
                                             <span class="p">待付款</span>
                                         </a>
@@ -74,7 +74,7 @@
                                     <div class="item">
                                         <a href="javascript:void(0);" @click="orderListPath(3)">
                                             <i class="icon icon-3">
-                                                <span v-if="waitShipmentsCount>0" :class="[waitShipmentsCount < 10 ? 'circular':'ellipse']">{{waitShipmentsCount == 99 ? '99+' : waitShipmentsCount}}</span>
+                                                <span v-if="waitShipmentsCount>0" :class="[waitShipmentsCount < 10 ? 'circular':'ellipse']">{{waitShipmentsCount >= 99 ? '99+' : waitShipmentsCount}}</span>
                                             </i>
                                             <span class="p">待发货</span>
                                         </a>
@@ -82,7 +82,7 @@
                                     <div class="item">
                                         <a href="javascript:void(0);" @click="orderListPath(4)">
                                             <i class="icon icon-4">
-                                                <span v-if="shipmentsCount>0" :class="[shipmentsCount < 10 ? 'circular':'ellipse']">{{shipmentsCount == 99 ? '99+' : shipmentsCount}}</span>
+                                                <span v-if="shipmentsCount>0" :class="[shipmentsCount < 10 ? 'circular':'ellipse']">{{shipmentsCount >= 99 ? '99+' : shipmentsCount}}</span>
                                             </i>
                                             <span class="p">已发货</span>
                                         </a>
@@ -90,7 +90,7 @@
                                     <div class="item">
                                         <a href="javascript:void(0);" @click="orderListPath(5)">
                                             <i class="icon icon-5">
-                                                <span v-if="salesReturnCount>0" :class="[salesReturnCount < 10 ? 'circular':'ellipse']">{{salesReturnCount == 99 ? '99+' : salesReturnCount}}</span>
+                                                <span v-if="salesReturnCount>0" :class="[salesReturnCount < 10 ? 'circular':'ellipse']">{{salesReturnCount >= 99 ? '99+' : salesReturnCount}}</span>
                                             </i>
                                             <span class="p">退货/款</span>
                                         </a>