Эх сурвалжийг харах

fix:活动已抢空状态等

yangfeng 3 жил өмнө
parent
commit
011b9f545f

+ 2 - 5
src/components/coupon/BuySubmit.vue

@@ -88,10 +88,6 @@ export default {
     linkUnderline: {
       type: Boolean,
       default: false
-    },
-    submitText: {
-      type: String,
-      default: '确定支付'
     }
   },
   computed: {
@@ -117,7 +113,8 @@ export default {
           url: '/front/staticPage/serviceterms.html'
         }
       ],
-      agreement: false
+      agreement: false,
+      submitText: '确定支付'
     }
   },
   methods: {

+ 11 - 5
src/components/limited-banner/index.vue

@@ -7,10 +7,10 @@
         <LimitedCountDown :endTime="activityTime" :startText="startText" @curTime="getCurTime"></LimitedCountDown>
       </div>
       <div class="limited-handel">
-        <div class="cycle-running" v-if="isAppointment" @click.stop="$emit('sub')"></div>
+        <div class="cycle-running" v-if="unStatus" @click.stop="$emit('sub')"></div>
         <div v-else>
-          <div class="cycle-already" v-if="status === 1"></div>
-          <div class="cycle-empty" v-if="status === 0 && stockNumber === 0"></div>
+          <div class="cycle-already" v-if="alreadyStatus"></div>
+          <div class="cycle-empty" v-if="emptyStatus"></div>
         </div>
       </div>
     </div>
@@ -77,15 +77,21 @@ export default {
         0: '满减',
         1: '折扣券',
         2: '满赠',
-        3: '限时促销',
+        3: '限时特惠',
         4: '限时折扣',
         5: '限时减免'
       }
       return title[type]
     },
-    isAppointment () {
+    unStatus () {
       // 当前时间小于活动开始时间且未预约状态且还有库存
       return this.curTime < this.startTime && this.status === 0 && this.stockNumber > 0
+    },
+    alreadyStatus () {
+      return this.curTime < this.startTime && this.status === 1 && this.stockNumber > 0
+    },
+    emptyStatus () {
+      return this.stockNumber === 0
     }
   },
   watch: {

+ 8 - 8
vue.config.js

@@ -28,8 +28,8 @@ module.exports = {
       //   logLevel: 'debug'
       // },
       '^/bigmember': {
-        // target: 'https://jybx2-webtest.jydev.jianyu360.com',
-        target: 'http://192.168.3.240:814',
+        target: 'https://jybx2-webtest.jydev.jianyu360.com',
+        // target: 'http://192.168.3.240:814',
         changeOrigin: true,
         logLevel: 'debug',
         pathRewrite: {
@@ -37,20 +37,20 @@ module.exports = {
         }
       },
       '^/jypay': {
-        // target: 'https://jybx2-webtest.jydev.jianyu360.com',
-        target: 'http://192.168.3.240:86',
+        target: 'https://jybx2-webtest.jydev.jianyu360.com',
+        // target: 'http://192.168.3.240:86',
         changeOrigin: true,
         logLevel: 'debug'
       },
       '^/publicapply': {
-        // target: 'https://jybx2-webtest.jydev.jianyu360.com',
-        target: 'http://192.168.3.240:828',
+        target: 'https://jybx2-webtest.jydev.jianyu360.com',
+        // target: 'http://192.168.3.240:828',
         changeOrigin: true,
         logLevel: 'debug'
       },
       '^/subscribepay': {
-        // target: 'https://jybx2-webtest.jydev.jianyu360.com',
-        target: 'http://192.168.3.240:86',
+        target: 'https://jybx2-webtest.jydev.jianyu360.com',
+        // target: 'http://192.168.3.240:86',
         changeOrigin: true,
         logLevel: 'debug'
       },