fix: 提现提示逻辑

components.d.ts

@@ -46,6 +46,7 @@ declare module '@vue/runtime-core' {
     NutCell: typeof import('nutui-uniapp/components/cell/cell.vue')['default']
     NutCellGroup: typeof import('nutui-uniapp/components/cellgroup/cellgroup.vue')['default']
     NutCheckbox: typeof import('nutui-uniapp/components/checkbox/checkbox.vue')['default']
+    NutCountdown: typeof import('nutui-uniapp/components/countdown/countdown.vue')['default']
     NutDatePicker: typeof import('nutui-uniapp/components/datepicker/datepicker.vue')['default']
     NutDialog: typeof import('nutui-uniapp/components/dialog/dialog.vue')['default']
     NutForm: typeof import('nutui-uniapp/components/form/form.vue')['default']

src/apis/dacang.ts

@@ -27,9 +27,19 @@ enum API {
 	DC_HOME_PRODUCT_LIST = '/api/dacang/nologin/dc_home_product',
 	// 大仓商品列表分类
 	DC_CLASSIFY = '/api/dacang/nologin/classify',
+
+	SECKILL_LIST = '/api/store/product/seckill/lst',
 }
 
 
+export function getSeckillList(params: {page: number, limit: number, start_time: number, end_time: number}) {
+	return defHttp.get({
+		url: API.SECKILL_LIST,
+		data: {
+			...params
+		}
+	})
+}
 export function getSeckillIndexTime() {
 	return defHttp.get({
 		url: API.DC_SECKILL_INDEX_TIME
@@ -76,9 +86,12 @@ export function getDcProductList(params: QueryDcProductListParams): Promise<Arra
 /**
  * 大仓秒杀商品
  */
-export function getDcSeckill(): Promise<Array<DcSeckillModel>> {
+export function getDcSeckill(params: { page: number, limit: number }): Promise<Array<DcSeckillModel>> {
 	return defHttp.get({
 		url: API.DC_SECKILL,
+		data: {
+			...params
+		}
 	})
 }
 

src/pages/home/index.vue

@@ -177,7 +177,7 @@ page {
   background-color: #f8f8f8;
 }
 </style>
-<route lang="yaml" >
+<route lang="yaml" type="home">
 style:
   navigationStyle: custom
   navigationBarTitleText: 储蓄保

src/pages/immediate-withdrawal/index.vue

@@ -41,13 +41,13 @@ onLoad(async () => {
   userBrokeragePrice.value = userSpreadInfo.value?.brokerage_price ? parseFloat(userSpreadInfo.value?.brokerage_price) : 0
   console.log(userBrokeragePrice.value)
   // if (userSpreadInfo.value?.brokerage_price) {
-    if (userBrokeragePrice.value < widthdrawalConfig.value.withdrawal_money) {
-      isDisabled.value = true
-      return uni.showToast({
-        title: '满' + widthdrawalConfig.value.withdrawal_money + '才可以提现~',
-        icon: 'none'
-      })
-    }
+  if (userBrokeragePrice.value < widthdrawalConfig.value.withdrawal_money) {
+    isDisabled.value = true
+    return uni.showToast({
+      title: '满' + widthdrawalConfig.value.withdrawal_money + '才可以提现~',
+      icon: 'none'
+    })
+  }
   // }
 })
 
@@ -100,13 +100,15 @@ function handleImmediateWithdrawal() {
     })
   }
 
-    if (userBrokeragePrice.value < widthdrawalConfig.value.withdrawal_money) {
-      return uni.showToast({
-        title: '满' + widthdrawalConfig.value.withdrawal_money + '才可以提现~',
-        icon: 'none'
-      })
-    }
+  // 1.用户可提现余额≤最低提现额
+  if (userBrokeragePrice.value < widthdrawalConfig.value.withdrawal_money) {
+    return uni.showToast({
+      title: '满' + widthdrawalConfig.value.withdrawal_money + '才可以提现~',
+      icon: 'none'
+    })
+  }
 
+  // 2 当输入金额≤可提现余额＜最低提现额度
   if (Number.parseFloat(cashWithdrawalAmount.value) <= Number.parseFloat(userBrokeragePrice.value) < widthdrawalConfig.value.withdrawal_money) {
     // 1 判断是否需要实名
     if (!yanglaojin.value?.is_certification == 1) {
@@ -115,14 +117,14 @@ function handleImmediateWithdrawal() {
       })
     }
 
-
     return uni.showToast({
       title: '满' + widthdrawalConfig.value.withdrawal_money + '才可以提现~',
       icon: 'none'
     })
   }
 
-  if (Number.parseFloat(cashWithdrawalAmount.value) >= Number.parseFloat(userBrokeragePrice.value) >= widthdrawalConfig.value.withdrawal_money) {
+  // 当输入金额＞可提现余额且输入金额≥最低提现额度
+  if ((Number.parseFloat(cashWithdrawalAmount.value) > Number.parseFloat(userBrokeragePrice.value)) && (Number.parseFloat(cashWithdrawalAmount.value) >= widthdrawalConfig.value.withdrawal_money)) {
     // 1 判断是否需要实名
     if (!yanglaojin.value?.is_certification == 1) {
       return uni.navigateTo({
@@ -138,8 +140,6 @@ function handleImmediateWithdrawal() {
   }
 
 
-
-
   getApplicationWithdrawal({extract_price: cashWithdrawalAmount.value, extract_type: 1}).then(res => {
     // uni.showToast({
     //   title: res,

src/pages/miaosha/index-bak-old.vue

@@ -0,0 +1,176 @@
+<script setup lang="ts">
+import {getDcSeckill, getSeckillIndexTime, getSeckillList} from "~/apis/dacang";
+import {DcSeckillModel} from "~/apis/model/dacang.model";
+import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
+import CXBYaojinTag from "~/components/CXBYaojinTag/CXBYaojinTag.vue";
+import FPrice from "~/components/FPrice/FPrice.vue";
+import FButton from "~/components/FButton/FButton.vue";
+import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+import {CDN_URL} from "~/config/app";
+const currentSeckillDate = ref()
+const status1Icon = CDN_URL + '/static/assets/mashangqiang.png'
+const status2Icon = CDN_URL + '/static/assets/jijiangkaiqiang.png'
+const status3Icon = CDN_URL + '/static/assets/miaosha_yijieshu_220908.png'
+
+const list = ref<Array<DcSeckillModel>>()
+const currentProductList = ref([])
+
+const state = reactive({
+  // seckillTime
+  timeList: [],
+  // seckillTimeIndex
+  endTime: '',
+  // 倒计时
+  //seckillEndTime
+  active: 1,
+
+  scrollLeft: 0,
+  loading: false,
+
+  seckillList: [],
+  currentPage: 1,
+  pageSize: 10,
+  totalPage: 1,
+
+  status: 1
+})
+onLoad((options) => {
+  loadSeckillConfig()
+})
+
+function loadSeckillConfig() {
+  getSeckillIndexTime().then(res => {
+    console.log(res)
+    state.timeList = res.seckillTime
+    state.active = res.seckillTimeIndex
+    state.endTime = res.seckillEndTime
+
+    let time
+    state.timeList.map((item) => {
+      time = item.start_time > 9 ? item.start_time + ':00' : '0' + item.start_time + ':00';
+      item.time = time;
+    })
+
+    //
+    if (state.timeList.length) {
+      state.scrollLeft = (state.active - 1.37) * 100
+      // setTimeout(() => {
+      //   state.loading = true
+      // }, 2000)
+      //
+      state.seckillList = []
+      state.page = 1
+      state.status = state.timeList[state.active].status
+      loadList('reload')
+
+    }
+  })
+}
+
+function loadStoreSeckillList(action: 'page' | 'reload', callback?: (items) => void) {
+  if (action === 'reload') {
+    state.currentPage = 1
+  }
+  const params = {
+    page: state.currentPage,
+    limit: state.pageSize,
+    start_time: state.timeList[state.active].start_time,
+    end_time: state.timeList[state.active].end_time
+  }
+  getSeckillList({
+    ...params
+  }).then(res => {
+    console.log(res)
+  })
+}
+function handleSeckillDateClick(seckill) {
+  currentProductList.value = seckill.product_data
+  currentSeckillDate.value = seckill.seckill_date
+}
+
+function handleItemClick(seckillItem) {
+  uni.navigateTo({
+    url: `/pages/store/product/detail?id=${seckillItem.product_id}`
+  })
+}
+</script>
+<template>
+  <CXBBasePage>
+    <div
+        v-if="list && list.length > 0"
+
+    >
+      <scroll-view
+          class=" whitespace-nowrap  w-screen  text-sm py-3"
+          :scroll-with-animation="true"
+          :scroll-x="true"
+          :show-scrollbar="false"
+      >
+        <div
+            @tap="handleSeckillDateClick(item)"
+            v-for="(item, index) in list"
+            :key="index"
+            class="flex inline-flex items-center justify-center relative pl-5"
+            :class="currentSeckillDate === item.seckill_date ? 'text-[#fe0032]' : ''"
+        >
+          {{item.seckill_date}}
+        </div>
+        <!--      </div>-->
+      </scroll-view>
+      <div class="p-3 pb-safe">
+        <div class="flex flex-col gap-3">
+          <div
+              @tap="handleItemClick(seckillItem)"
+              v-for="(seckillItem, itemIndex) in currentProductList"
+              :key="itemIndex"
+              class="bg-white rounded p-3"
+          >
+            <div
+                class="bg-white flex gap-3"
+            >
+              <div>
+                <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>
+                  {{ seckillItem.store_name }}
+                </div>
+                <div class="text-gray text-xs">
+                  即将恢复原价￥{{ seckillItem.ot_price}}
+                </div>
+                <CXBYaojinTag :amount="Number.parseFloat(seckillItem.yanglao)" />
+                <div class="flex items-center justify-between">
+                  <FPrice :price="seckillItem.seckill_price"/>
+                  <image
+                      v-if="seckillItem.status == 1"
+                      :src="status1Icon" mode="widthFix" class="w-16 h-7" ></image>
+                  <image
+                      v-if="seckillItem.status == 2"
+                      :src="status2Icon" mode="widthFix" class="w-16 h-7" ></image>
+                  <image
+                      v-if="seckillItem.status == 3"
+                      :src="status3Icon" mode="widthFix" class="w-16 h-7" ></image>
+                </div>
+              </div>
+
+            </div>
+          </div>
+
+        </div>
+      </div>
+    </div>
+    <CXBEmpty v-else/>
+
+  </CXBBasePage>
+
+</template>
+<route lang="yaml">
+style:
+  navigationBarTitleText: 限时秒杀
+</route>
+<style>
+page {
+  background: #f8f8f8;
+}
+</style>

src/pages/miaosha/index-bak.vue

@@ -0,0 +1,118 @@
+<script setup lang="ts">
+import {getDcSeckill} from "~/apis/dacang";
+import {DcSeckillModel} from "~/apis/model/dacang.model";
+import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
+import CXBYaojinTag from "~/components/CXBYaojinTag/CXBYaojinTag.vue";
+import FPrice from "~/components/FPrice/FPrice.vue";
+import FButton from "~/components/FButton/FButton.vue";
+import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
+import {CDN_URL} from "~/config/app";
+const currentSeckillDate = ref()
+const status1Icon = CDN_URL + '/static/assets/mashangqiang.png'
+const status2Icon = CDN_URL + '/static/assets/jijiangkaiqiang.png'
+const status3Icon = CDN_URL + '/static/assets/miaosha_yijieshu_220908.png'
+
+const list = ref<Array<DcSeckillModel>>()
+const currentProductList = ref([])
+onLoad((options) => {
+  getDcSeckill().then(res => {
+    list.value = res
+    if (list.value && list.value?.length > 0) {
+      currentSeckillDate.value = list.value[0].seckill_date
+      currentProductList.value = list.value[0].product_data
+
+    }
+  })
+})
+
+function handleSeckillDateClick(seckill) {
+  currentProductList.value = seckill.product_data
+  currentSeckillDate.value = seckill.seckill_date
+}
+
+function handleItemClick(seckillItem) {
+  uni.navigateTo({
+    url: `/pages/store/product/detail?id=${seckillItem.product_id}`
+  })
+}
+</script>
+<template>
+  <CXBBasePage>
+    <div
+        v-if="list && list.length > 0"
+
+    >
+      <scroll-view
+          class=" whitespace-nowrap  w-screen  text-sm py-3"
+          :scroll-with-animation="true"
+          :scroll-x="true"
+          :show-scrollbar="false"
+      >
+        <div
+            @tap="handleSeckillDateClick(item)"
+            v-for="(item, index) in list"
+            :key="index"
+            class="flex inline-flex items-center justify-center relative pl-5"
+            :class="currentSeckillDate === item.seckill_date ? 'text-[#fe0032]' : ''"
+        >
+          {{item.seckill_date}}
+        </div>
+        <!--      </div>-->
+      </scroll-view>
+      <div class="p-3 pb-safe">
+        <div class="flex flex-col gap-3">
+          <div
+              @tap="handleItemClick(seckillItem)"
+              v-for="(seckillItem, itemIndex) in currentProductList"
+              :key="itemIndex"
+              class="bg-white rounded p-3"
+          >
+            <div
+                class="bg-white flex gap-3"
+            >
+              <div>
+                <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>
+                  {{ seckillItem.store_name }}
+                </div>
+                <div class="text-gray text-xs">
+                  即将恢复原价￥{{ seckillItem.ot_price}}
+                </div>
+                <CXBYaojinTag :amount="Number.parseFloat(seckillItem.yanglao)" />
+                <div class="flex items-center justify-between">
+                  <FPrice :price="seckillItem.seckill_price"/>
+                  <image
+                      v-if="seckillItem.status == 1"
+                      :src="status1Icon" mode="widthFix" class="w-16 h-7" ></image>
+                  <image
+                      v-if="seckillItem.status == 2"
+                      :src="status2Icon" mode="widthFix" class="w-16 h-7" ></image>
+                  <image
+                      v-if="seckillItem.status == 3"
+                      :src="status3Icon" mode="widthFix" class="w-16 h-7" ></image>
+                </div>
+              </div>
+
+            </div>
+          </div>
+
+        </div>
+      </div>
+    </div>
+    <CXBEmpty v-else/>
+
+  </CXBBasePage>
+
+</template>
+<route lang="yaml">
+style:
+navigationBarTitleText: 限时秒杀
+</route>
+<style>
+page {
+  background: #f8f8f8;
+}
+</style>

src/pages/miaosha/index.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import {getDcSeckill, getSeckillIndexTime} from "~/apis/dacang";
+import {getDcSeckill} from "~/apis/dacang";
 import {DcSeckillModel} from "~/apis/model/dacang.model";
 import CXBBasePage from "~/components/CXBBasePage/CXBBasePage.vue";
 import CXBYaojinTag from "~/components/CXBYaojinTag/CXBYaojinTag.vue";
@@ -7,68 +7,77 @@ import FPrice from "~/components/FPrice/FPrice.vue";
 import FButton from "~/components/FButton/FButton.vue";
 import CXBEmpty from "~/components/CXBEmpty/CXBEmpty.vue";
 import {CDN_URL} from "~/config/app";
+import {filter, orderBy} from "lodash-es";
 const currentSeckillDate = ref()
 const status1Icon = CDN_URL + '/static/assets/mashangqiang.png'
 const status2Icon = CDN_URL + '/static/assets/jijiangkaiqiang.png'
 const status3Icon = CDN_URL + '/static/assets/miaosha_yijieshu_220908.png'
 
-const list = ref<Array<DcSeckillModel>>()
+// const list = ref<Array<DcSeckillModel>>()
 const currentProductList = ref([])
 
 const state = reactive({
-  // seckillTime
-  timeList: [],
-  // seckillTimeIndex
-  endTime: '',
-  // 倒计时
-  //seckillEndTime
-  active: '',
+  currentPage: 1,
+  pageSize: 10,
+  totalPage: 1,
+  statue: 'noMore',
 
-  scrollLeft: 0,
-  loading: false,
-
-  seckillList: [],
-  page: 1,
-  limit: 10,
-  status: ''
+  list: []
 })
 onLoad((options) => {
-  getSeckillIndexTime().then(res => {
-    console.log(res)
-    state.timeList = res.seckillTime
-    state.active = res.seckillTimeIndex
-    state.endTime = res.seckillEndTime
-
-    let time
-    state.timeList.map((item) => {
-      time = item.start_time > 9 ? item.start_time + ':00' : '0' + item.start_time + ':00';
-      item.time = time;
-    })
-
-    if (state.timeList.length) {
-      state.scrollLeft = (state.active = 1.37) * 100
-      setTimeout(() => {
-        state.loading = true
-      }, 2000)
-
-      state.seckillList = []
-      state.page = 1
-      state.status = state.timeList[state.active].status
-      loadSeckillList()
-
-    }
-  })
-
+  loadList('reload')
 })
 
-function loadSeckillList() {
-  getDcSeckill().then(res => {
-    list.value = res
-    if (list.value && list.value?.length > 0) {
-      currentSeckillDate.value = list.value[0].seckill_date
-      currentProductList.value = list.value[0].product_data
-    }
 
+function loadList(action: 'page' | 'reload', callback?: (items) => void) {
+  if (action === 'reload') {
+    state.currentPage = 1
+  }
+  const params = {
+    page: state.currentPage,
+    limit: state.pageSize
+  }
+
+  getDcSeckill({
+    ...params
+  }).then( res => {
+    if (action === 'reload') {
+      if (res && res.length > 0) {
+        console.log(res)
+        const resList = res
+        // const status3List = orderBy(list.value, (val) => {
+        //   return val.status == 3
+        // })
+        let status3FilterList = filter(resList, (val) => {
+          return val.status == 3
+        })
+        let status2FilterList = filter(resList, (val) => {
+          return val.status == 2
+        })
+        let status1FilterList = filter(resList, (val) => {
+          return val.status == 1
+        })
+        if (status3FilterList.length >= 3) {
+          status3FilterList = orderBy(status3FilterList,  ['ctime'], ['desc'])
+          console.log(status3FilterList)
+          state.list.push(status3FilterList[0])
+          console.log(state.list)
+        } else {
+          state.list.push(status3FilterList)
+        }
+        if (status2FilterList.length > 0) {
+          state.list.push(status2FilterList)
+        }
+        if (status1FilterList.length > 0) {
+          state.list.push(status1FilterList)
+        }
+        if (state.list.length > 0) {
+          // list.value = orderBy(list.value, )
+          currentSeckillDate.value = state.list[0].seckill_date
+          currentProductList.value = state.list[0].product_data
+        }
+      }
+    }
   })
 }
 function handleSeckillDateClick(seckill) {
@@ -85,7 +94,7 @@ function handleItemClick(seckillItem) {
 <template>
   <CXBBasePage>
     <div
-        v-if="list && list.length > 0"
+        v-if="state.list.length > 0"
 
     >
       <scroll-view
@@ -96,7 +105,7 @@ function handleItemClick(seckillItem) {
       >
         <div
             @tap="handleSeckillDateClick(item)"
-            v-for="(item, index) in list"
+            v-for="(item, index) in state.list"
             :key="index"
             class="flex inline-flex items-center justify-center relative pl-5"
             :class="currentSeckillDate === item.seckill_date ? 'text-[#fe0032]' : ''"
@@ -153,7 +162,7 @@ function handleItemClick(seckillItem) {
   </CXBBasePage>
 
 </template>
-<route lang="yaml" type="home">
+<route lang="yaml">
 style:
   navigationBarTitleText: 限时秒杀
 </route>

src/pages/store/product/detail.vue

@@ -16,6 +16,7 @@ import {
 import {DcProductModel} from "~/apis/model/dacang.model";
 import {CDN_URL} from "~/config/app";
 import {debounce} from "lodash-es";
+import dayjs from "dayjs";
 
 const usePageStore = usePageStoreWidthOut()
 
@@ -25,6 +26,7 @@ const shangpinxiangqing_gouwuche = CDN_URL + '/static/assets/shangpinxiangqing_g
 const wx_shareImg = CDN_URL + '/static/assets/wx_share_221121.png'
 const pyqImg = CDN_URL + '/static/assets/pyq_221121.png'
 const miaoshaIcon = CDN_URL + '/static/assets/miaoshajia_220805.png'
+const xiaoshimiaoshaIcon = CDN_URL + '/static/assets/xiaoshimiaosha_220805.png'
 const userStore = useUserStore()
 
 const shareShowTips = ref(false)
@@ -76,8 +78,8 @@ uni.showShareMenu({
 })
 onLoad((option: any) => {
   // const id = '4858'
-  // state.id = option.id
-  state.id = 4858
+  state.id = option.id
+  // state.id = 4858
 
 
   getRecommendList({
@@ -401,16 +403,37 @@ function handleShowCustomer() {
           </swiper-item>
         </swiper>
       </div>
-      <div class="bg-gradient-to-r from-[#fe7577] to-[#fe0032] h-25 mt-3" v-if="detail.seckill == 1">
-       <div class="flex gap-2 items-center text-white">
-           <div class="text-[24px]">
-             <text class="text-[20px]">￥</text>{{ detail.price }}
-           </div>
-           <image :src="miaoshaIcon" mode="widthFix" class="w-10"></image>
-       </div>
-        <div class="text-white">
-          即将恢复原价
+      <div class="bg-gradient-to-r from-[#fe7577] to-[#fe0032] h-20 mt-3 flex items-center p-3 justify-between"
+           v-if="detail.seckill == 1">
+        <div class="flex flex-col">
+          <div class="flex gap-2 items-center text-white">
+            <div class="text-[30px] font-bold">
+              <text class="text-[20px]">￥</text>{{ detail.price }}
+            </div>
+            <image :src="miaoshaIcon" mode="widthFix" class="w-10"></image>
+          </div>
+          <div class="text-white text-xs">
+            即将恢复原价 ￥{{detail.ot_price}}
+          </div>
         </div>
+        <div class="flex flex-col items-center gap-2 justify-center">
+          <image :src="xiaoshimiaoshaIcon" class="w-17 h-4" model="widthFix"></image>
+          <div class="text-white " v-if="detail.seckill_s == 1">
+            <div class="text-xs"
+                 >
+            距秒杀结束</div>
+            <nut-countdown :end-time="new Date(detail.seckill_date_end).getTime() + 60 * 1000" ></nut-countdown>
+          </div>
+          <div class="text-white" v-if="detail.seckill_s == 2">
+            <div class="">
+              即将开始</div>
+          </div>
+          <div class="text-white" v-if="detail.seckill_s == 0">
+            <div class="">
+              已结束</div>
+          </div>
+        </div>
+
       </div>
       <div class="bg-black bg-op-30 fixed top-3  rounded-full right-3 h-6 w-6 flex flex-col justify-center items-center z-10"
            @click="toggleRelation"
@@ -422,7 +445,9 @@ function handleShowCustomer() {
       </div>
 
       <div
-          class="flex flex-col p-3 gap-3">
+          class="flex flex-col p-3 gap-3"
+          v-if="!detail.seckill == 1"
+      >
         <div class="flex flex-row  items-center text-[#FE0032] font-bold text-lg gap-2">
           <div v-if="is148Merchant && detail.price" class="flex justify-end items-end gap-2">
             <div class="!text-[24px]">{{ Number.parseFloat(detail.price).toFixed(2) }} </div>