Merge remote-tracking branch 'origin/jh_dev' into jh_dev

2024-09-11 18:38:00 +08:00 · 2024-09-11 18:38:00 +08:00 · e4da107e69
parent 646e627b16 c407f478af
commit e4da107e69
2 changed files with 2 additions and 1 deletions
--- a/pages/coupon/detail.vue
+++ b/pages/coupon/detail.vue
@ -36,7 +36,7 @@
              <text v-else>
                {{
                  state.coupon.status === 1
-                    ? '立即使用'
+                    ? '可使用'
                    : state.coupon.status === 2
                    ? '已使用'
                    : '已过期'
--- a/pages/goods/seckill.vue
+++ b/pages/goods/seckill.vue
@ -266,6 +266,7 @@
    });

    state.skeletonLoading = false;
+	console.log('shuju',state)
  };

  onLoad((options) => {