feat: 秒杀信息调整

.env.development

@@ -1 +1 @@
-VITE_GLOB_API_URL = 'https://app.bjtdba.com'
+VITE_GLOB_API_URL = 'https://test.bjtdba.com'

.env.production

@@ -1 +1 @@
-VITE_GLOB_API_URL = 'https://app.bjtdba.com'
+VITE_GLOB_API_URL = 'https://test.bjtdba.com'

src/apis/model/dacang.model.ts

@@ -108,7 +108,7 @@ export interface DcSeckillProductDataModel {
      yanglao: number
      img: string
      img_text: string
-     //1-抢购中。2-即将开始。3-已结速
+     //1-抢购中。2-即将开始。3-已结束
      status: string
 }
 

src/components/CXBSkuPopup/CXBSkuPopup.vue

@@ -136,7 +136,9 @@ function handleCountChange(value) {
                   {{ (currentSku.price * 30).toFixed(2) }} 积分
                 </div>
                 <div class="flex items-end gap-2" v-else>
-                  <FPrice :price="currentSku.price"/>
+                  <FPrice :price="detail.dc_price" v-if="detail.seckill == 1"/>
+
+                  <FPrice :price="currentSku.price" v-else/>
                   <FPrice v-if="currentSku.ot_price" :price="currentSku.ot_price" :ex-class="'!text-black text-xs font-bold'" need-symbol strike-through/>
                 </div>
               </div>

src/pages/home/components/header.vue

@@ -51,8 +51,10 @@ function handleClick() {
       url: '/pages/annuity/index'
     })
   } else {
+    userStore.setRedirectPage(`/pages/home/index`, 'tab')
+
     uni.navigateTo({
-      url: '/pages/user/login/index?key=30'
+      url: '/pages/user/login/index'
     })
   }
 }

src/pages/miaosha/index.vue

@@ -73,9 +73,12 @@ function loadList(action: 'page' | 'reload', callback?: (items) => void) {
         }
 
         if (state.list.length > 0) {
+          state.list = orderBy(state.list, ['seckill_date'], ['asc'])
+
           // list.value = orderBy(list.value, )
           currentSeckillDate.value = state.list[0].seckill_date
           currentProductList.value = state.list[0].product_data
+
         }
       }
     }
@@ -136,10 +139,21 @@ function handleItemClick(seckillItem) {
                 <image :src="seckillItem.image" mode="widthFix" class="w-30"></image>
               </div>
               <div class="flex-1 flex flex-col gap-2">
-                <div class="bg-[#fe0032] rounded-tl-full rounded-tr-full rounded-br-full"></div>
-                <div>
+<!--                <div class="bg-[#fe0032] rounded-tl-full rounded-tr-full rounded-br-full"></div>-->
+                <div class="bg-[#fe0032] text-[#ffffff] rounded-t-lg rounded-br-lg text-10px leading-none px-1 flex items-center justify-center h-4 w-fit"
+                     v-if="seckillItem.status == 1 || seckillItem.status == 2"
+                >
+                  <div v-if="seckillItem.status == 1">
+                    抢购中
+                  </div>
+                  <div v-if="seckillItem.status == 2">
+                    大仓秒杀
+                  </div>
+                </div>
+                <div class="line-clamp-1">
                   {{ seckillItem.store_name }}
                 </div>
+
                 <div class="text-gray text-xs">
                   即将恢复原价￥{{ seckillItem.ot_price}}
                 </div>

src/pages/order_addcart/index.vue

@@ -43,15 +43,22 @@ const state = reactive({
 const shopping = ref<ShoppingResult>()
 
 onBeforeMount(() => {
+
   if (!userStore.uid) {
-    userStore.setRedirectPage(`/pages/user/index`, "tab");
 
     return uni.navigateTo({
       url: '/user/login/index'
     })
   }
 })
+
+// nextTick(() => {
+//   loadCartList()
+// })
 onLoad((options) => {
+  userStore.setRedirectPage(`/pages/order_addcart/index`, "tab");
+
+
   uni.$on('cart-reload', () => {
     // console.log('新商品添加...')
     state.cart_id = []
@@ -59,9 +66,12 @@ onLoad((options) => {
   })
 
   state.cart_id = []
-  loadCartList()
+  // loadCartList()
 })
 onShow(() => {
+  userStore.setRedirectPage(`/pages/order_addcart/index`, "tab");
+  loadCartList()
+
   // pageStore.setPageConfig({
   //   orderBack: {
   //     type: 'tab',

src/pages/payment/index.vue

@@ -101,8 +101,8 @@ function handleConfirm() {
       OrderLists: state.orderList,
       type: 'tdbaspzf'
     },
-    // envVersion: 'trial', // develop（开发版），trial（体验版），release（正式版）
-    envVersion: 'release', // develop（开发版），trial（体验版），release（正式版）
+    envVersion: 'trial', // develop（开发版），trial（体验版），release（正式版）
+    // envVersion: 'release', // develop（开发版），trial（体验版），release（正式版）
     success(res) {
       // 打开成功
       uni.showToast({

src/pages/store/product/detail.vue

@@ -107,6 +107,9 @@ onLoad((option: any) => {
 
   }
 
+  userStore.setRedirectPage(`/pages/store/product/detail?id=${state.id}`, 'page')
+
+
   // }
   getRecommendList({
     page: 1,