From b87c8e82922a6c4e2288d3f11c39c6c6ba3e72db Mon Sep 17 00:00:00 2001
From: Waiting <waitinghc@foxmail.com>
Date: Tue, 16 Apr 2024 16:52:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=A2=E8=B4=AD=E5=B7=B2=E7=BB=93=E6=9D=9F?=
 =?UTF-8?q?=EF=BC=8C=E6=9C=AA=E5=BC=80=E5=A7=8B=E6=98=BE=E7=A4=BA=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=20=E8=AE=A2=E5=8D=95=E5=BE=85=E6=94=AF=E4=BB=98?=
 =?UTF-8?q?=E6=95=B0=E9=87=8F=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/common/groupbuy/detail.vue | 42 +++++++++++++++++++++++-----
 src/pages/common/groupbuy/index.vue  |  2 +-
 src/pages/home/subs/group/join.vue   |  2 +-
 src/pages/mall/subs/goods/detail.vue |  9 +++---
 src/pages/mine/index.vue             | 15 +++++++++-
 src/store/modules/user/index.ts      |  3 +-
 6 files changed, 58 insertions(+), 15 deletions(-)

diff --git a/src/pages/common/groupbuy/detail.vue b/src/pages/common/groupbuy/detail.vue
index 94f8f88..88cfd7c 100644
--- a/src/pages/common/groupbuy/detail.vue
+++ b/src/pages/common/groupbuy/detail.vue
@@ -19,7 +19,7 @@
         <text>{{ groupBuyBean?.payPrice || 0 }}</text>
         <text>￥{{ groupBuyBean?.price || 0 }}</text>
       </view>
-      <view class='countdown-time c-flex-column'>
+      <view v-if='isPending()' class='countdown-time c-flex-column'>
         <view class='c-flex-row'>{{ countdownTime?.days || 0 }}天
           <text class='time'>{{ countdownTime?.hours || '00' }}</text>
           :
@@ -29,6 +29,11 @@
         </view>
         <text>距离活动结束仅剩</text>
       </view>
+      <view v-else>
+        <text style='font-size: 35rpx;color: #FFFFFF'>
+          {{ isNotStated() ? '未开始' : '已结束' }}
+        </text>
+      </view>
     </view>
 
     <view class='goods-info-view c-flex-column'>
@@ -38,7 +43,7 @@
       </view>
 
       <view class='c-flex-row'>
-        <text style='flex: 1'>{{ groupBuyBean?.name }}</text>
+        <text style='flex: 1'>{{ groupBuyBean?.name || '未知' }}</text>
         <view class='share-button c-flex-column'>
           <image :src='assetsUrl("ic_share.png")'></image>
           <button class='btn' plain open-type='share'>分享</button>
@@ -55,14 +60,14 @@
       </view>
     </view>
 
-    <view class='recommend-view c-flex-column' v-if='recommendList?.length>0'>
+    <view class='recommend-view c-flex-column' v-if='(recommendList?.length||0)>0'>
       <text>浏览此商品的客户还浏览了</text>
       <scroll-view scroll-x>
         <view style='display: inline-block' v-for='(item, index) in recommendList'
               :key='index'>
           <view class='recommend-item c-flex-column'>
-            <image :src='item.images' />
-            <text>{{ item.goodsName }}</text>
+            <image :src='item.images||defaultImage' />
+            <text>{{ item.goodsName || '未知' }}</text>
             <text class='goods-price'>{{ item.price }}</text>
           </view>
         </view>
@@ -122,7 +127,10 @@
     </view>
 
     <view class='bottom-view c-flex-row'>
-      <view class='place-order-button' @click.stop='placeOrder'>跟团购买</view>
+      <button v-if='isPending()' class='place-order-button' @click.stop='placeOrder'>跟团购买</button>
+      <button v-else class='place-order-button-disable' :plain='true' :disabled='true'>
+        {{ isNotStated() ? '即将开始' : '已结束' }}
+      </button>
     </view>
   </view>
   <sku-dialog ref='skuDialogRef' :flash-price='Number(groupBuyBean?.payPrice) || 0' />
@@ -181,6 +189,19 @@ onUnload(() => {
   }
 });
 
+const isNotStated = () => {
+  return dayjs(groupBuyBean.value?.startDate).isAfter(Date.now());
+};
+
+const isPending = () => {
+  return dayjs(groupBuyBean.value?.startDate).isBefore(Date.now()) && dayjs(groupBuyBean.value?.endDate).isAfter(Date.now());
+  ;
+};
+
+const isEnded = () => {
+  return dayjs(groupBuyBean.value?.endDate).isBefore(Date.now());
+};
+
 const getStockColorCount = computed(() => {
   const list = Array.from(new Set(groupBuyBean.value?.goods?.stocks?.map(item => item.colorName)))
     .map(colorName => groupBuyBean.value?.goods?.stocks?.find(item => item.colorName === colorName)!);
@@ -194,7 +215,7 @@ const fetchRecommendList = async () => {
       pageSize: 20,
       bean: {
         keyword: '',
-        typeIds: ['1724629185362591745']
+        typeIds: []
       }
     }
   });
@@ -550,6 +571,13 @@ const placeOrder = async () => {
     background: #F32B2B;
     color: #FFFFFF;
     border-radius: 40rpx;
+    border: none;
+  }
+
+  .place-order-button-disable {
+    @extend .place-order-button;
+    background: #b9b5b5;
+    color: #FFFFFF;
   }
 }
 
diff --git a/src/pages/common/groupbuy/index.vue b/src/pages/common/groupbuy/index.vue
index e2f98a5..90b66b9 100644
--- a/src/pages/common/groupbuy/index.vue
+++ b/src/pages/common/groupbuy/index.vue
@@ -19,7 +19,7 @@
                 <image :src='assetsUrl("ic_decline.png")' />
                 <text>直降￥{{ (item.price - item.payPrice).toFixed(2) }}</text>
               </view>
-              <text>即将恢复</text>
+              <text>{{ tabIndex == 0 ? '即将恢复' : '即将开始'}}</text>
             </view>
             <view class='bottom-price c-flex-row' :class='{"bottom-price-disabled":tabIndex==1}'>
               <text>{{ item.payPrice }}</text>
diff --git a/src/pages/home/subs/group/join.vue b/src/pages/home/subs/group/join.vue
index 0d24cd0..7e75338 100644
--- a/src/pages/home/subs/group/join.vue
+++ b/src/pages/home/subs/group/join.vue
@@ -6,7 +6,7 @@
       1.长按识别下方二维码，添加【店铺福利群】
     </text>
     <view class='divider' style='margin-top: 28rpx' />
-    <image :src=' companyConfigInfo.regqrcode' show-menu-by-longpress />
+    <image :src=' companyConfigInfo.groupqrcode' show-menu-by-longpress />
     <text class='step-title'>
       2.识别【店铺福利群】发您的二维码，即可入群
     </text>
diff --git a/src/pages/mall/subs/goods/detail.vue b/src/pages/mall/subs/goods/detail.vue
index 0dd90f8..5375afe 100644
--- a/src/pages/mall/subs/goods/detail.vue
+++ b/src/pages/mall/subs/goods/detail.vue
@@ -26,7 +26,7 @@
 
       <view class='c-flex-row'>
         <text style='flex: 1'>{{ goodsBean?.name }}</text>
-        <view class='share-button c-flex-column'>
+        <view class='share-button'>
           <image :src='assetsUrl("ic_share.png")'></image>
           <button class='btn' plain open-type='share'>分享</button>
         </view>
@@ -56,8 +56,8 @@
           <view class='recommend-item c-flex-column'>
             <image :src='item.images||defaultImage' />
             <text>{{ item.goodsName || '未知' }}</text>
-            <text class='goods-price'>{{ (item.price * ((userInfo.levelEntity.discount || 100) / 100)).toFixed(2) }}
-              <text v-if='userInfo.levelEntity.discount>0'
+            <text class='goods-price'>{{ (item.price * ((userInfo.levelEntity?.discount || 100) / 100)).toFixed(2) }}
+              <text v-if='userInfo.levelEntity?.discount>0'
                     style='text-decoration: line-through;font-size: 25rpx;color: #999999'>{{ item.price }}
               </text>
             </text>
@@ -175,7 +175,6 @@ const addShoppingCart = () => {
 
 const placeOrder = () => {
   showSkuDialog((e: GoodsBean) => {
-    console.log(e);
     const orderBean = {
       totalPrice: (e.consumePrice * e.checkedStock.count).toFixed(2),
       orderGoods: [e]
@@ -264,6 +263,8 @@ const placeOrder = () => {
     }
 
     .share-button {
+      display: flex;
+      flex-direction: column;
       align-items: center;
 
       image {
diff --git a/src/pages/mine/index.vue b/src/pages/mine/index.vue
index 275bbc8..abf7730 100644
--- a/src/pages/mine/index.vue
+++ b/src/pages/mine/index.vue
@@ -45,7 +45,7 @@
       <view v-for='(item,index) in orderActionList' :key='index' @click.stop='gotoPath(item.path)'>
         <image :src='item.icon' />
         <text>{{ item.title }}</text>
-        <text v-if='index==0&&userInfo?.orderNum>0'>{{ userInfo?.orderNum }}</text>
+        <text v-if='index==0&&unPaidOrderCount>0'>{{ unPaidOrderCount }}</text>
       </view>
     </view>
 
@@ -67,6 +67,8 @@
 <script setup lang='ts'>
 import { assetsUrl, defaultAvatar } from '@/utils/assets';
 import { goLogin, goPath, isLogin } from '@/utils';
+import { isPending } from '@/utils/order';
+import { getOrderList } from '@/api/order';
 import OfficialAccountDialog from '@/components/official-account-dialog.vue';
 import { useUserStore } from '@/store';
 
@@ -124,6 +126,8 @@ title.value = import.meta.env.VITE_APP_TITLE;
 const store = useUserStore();
 const { userInfo, companyConfigInfo } = storeToRefs(store);
 
+const unPaidOrderCount = ref(0);
+
 onLoad(() => {
   if(!isLogin()) {
     goLogin();
@@ -131,6 +135,15 @@ onLoad(() => {
   }
 });
 
+onShow(async () => {
+  const { list } = await getOrderList({
+    pageNum: 1,
+    pageSize: 9999,
+    obj: { payStatus: 1 }
+  });
+  unPaidOrderCount.value = list.filter((item: any) => isPending(item))?.length || 0;
+});
+
 const gotoPath = (path: string) => {
   if(path === 'follow_official_account') {
     showOfficialAccountDialog();
diff --git a/src/store/modules/user/index.ts b/src/store/modules/user/index.ts
index d3327d4..6700c15 100644
--- a/src/store/modules/user/index.ts
+++ b/src/store/modules/user/index.ts
@@ -16,7 +16,8 @@ const useUserStore = defineStore('user', {
       goodsstockzero: 0,
       mallopen: 0,
       regqrcode: undefined,
-      userbgcover: undefined
+      userbgcover: undefined,
+      groupqrcode: undefined
     },
     deliveryAddress: {
       addrid: '',