Bladeren bron

优惠券

zhengjinyi 3 jaren geleden
bovenliggende
commit
36c43f8cba

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

@@ -53,10 +53,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.67:8008
+  coreServer: https://core-b.caimei365.com
+#  coreServer: http://192.168.2.67:18002
   imageDomain: https://img-b.caimei365.com
   wwwDomain: http:localhost:8009
   destPath: D:/_PLAN_WORKSPACE/test/static

+ 1 - 1
src/main/resources/templates/product/detail.html

@@ -330,7 +330,7 @@
                                         <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.endDate }}</div>
+                                    <div class="coupon-list-time"> {{ coupon.startDate }} - {{ coupon.endDate }}</div>
                                 </div>
                                 <div class="coupon-list-ri">
                                     <span class="none" v-if="currentTab == 1" @click="receiveCoupon(coupon)">领取</span>

+ 1 - 1
src/main/resources/templates/shopping/cart.html

@@ -239,7 +239,7 @@
                                     <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.endDate }}</div>
+                                <div class="coupon-list-time"> {{ coupon.startDate }} - {{ coupon.endDate }} </div>
                             </div>
                             <div class="coupon-list-ri">
                                 <span class="none" v-if="currentTab == 1" @click="receiveCoupon(coupon)">领取</span>

+ 1 - 1
src/main/resources/templates/shopping/confirm.html

@@ -307,7 +307,7 @@
                         <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.endDate }}</div>
+                    <div class="coupon-list-time"> {{ coupon.startDate }} - {{ coupon.endDate }}</div>
                     <span class="coupon-list-checked" :class="[coupon.ischecked ?'checked':'']"></span>
                 </div>
                 <div class="coupon-list-ri"><span>已领取</span></div>

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

@@ -40,7 +40,7 @@
                   <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.endDate }}</div>
+                <div class="coupon-list-time"> {{ coupon.startDate }} - {{ coupon.endDate }}</div>
               </div>
               <div class="coupon-list-ri">
                 <span class="none" v-if="coupon.couponBtnType == 0" @click="receiveCoupon(coupon)">领取</span>

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

@@ -60,7 +60,7 @@
                 <p v-if="coupon.couponType == 3">仅限购买店铺【{{ coupon.shopName }}】的商品</p>
                 <p v-if="coupon.couponType == 4 || coupon.couponType == 2">全商城商品通用</p>
               </div>
-              <div class="list-cell-time">有效期:{{ coupon.endDate }}</div>
+              <div class="list-cell-time">有效期: {{ coupon.startDate }} - {{ coupon.endDate }}</div>
             </div>
           </div>
           <div class="coupon-btn" @click.stop="handleClickCancel">立即收下</div>

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

@@ -64,7 +64,9 @@
                     <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.endDate }}</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'" @click="toUseCoupon(coupon)">{{ coupon.useStatus | TypeBtnFormat }}</div>
                 <div class="coupon-tags" :class="coupon.useStatus == 2 || coupon.useStatus == 3 ? 'none' : 'used'">{{ coupon.couponType | TypeFormat }}</div>