From 13ee0f593c5a85ad3784d9b2f17e48ce9ad66a23 Mon Sep 17 00:00:00 2001
From: Waiting <waitinghc@foxmail.com>
Date: Mon, 17 Jun 2024 16:02:46 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/common/groupbuy/detail.vue          | 31 +++++++++++++++++--
 src/pages/common/groupbuy/order-confirm.vue   |  7 +++++
 .../common/groupbuy/order-coupon-confirm.vue  | 12 ++-----
 src/pages/home/index.vue                      |  6 ++++
 4 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/src/pages/common/groupbuy/detail.vue b/src/pages/common/groupbuy/detail.vue
index 3166321..9b2cad7 100644
--- a/src/pages/common/groupbuy/detail.vue
+++ b/src/pages/common/groupbuy/detail.vue
@@ -142,7 +142,7 @@
 <script lang='ts' setup>
 import { assetsUrl, defaultImage } from '@/utils/assets';
 import dayjs from 'dayjs';
-import { formatTimeWithZeroPad, getCompanyId, getOpenId, goLogin, goPath, isLogin } from '@/utils';
+import { formatTimeWithZeroPad, getCompanyId, getOpenId, goLogin, goPath, isLogin, showToast } from '@/utils';
 import SkuDialog from '@/components/sku-dialog.vue';
 import CouponItem from './components/coupon-item.vue';
 
@@ -180,6 +180,8 @@ const countdownTime = ref<{
 
 const recordList = ref<RecordBean[]>([]);
 const currentPageNum = ref(1);
+const shareGoodsId = ref();
+const shareCouponId = ref();
 
 onLoad(async (e: any) => {
   if(isLogin()) {
@@ -188,10 +190,12 @@ onLoad(async (e: any) => {
       groupBuyBean.value = await getGroupBuyDetail(e.id);
     }
     if(e.shareId != undefined) {
+      shareGoodsId.value = e.shareId;
       const { group, share } = await getShareGoodsDetail(e.shareId);
       groupBuyBean.value = group;
     }
     if(e.couponId != undefined) {
+      shareCouponId.value = e.couponId;
       isCouponGoodsDetail.value = true;
       groupBuyBean.value = await getShareGoodsCouponDetail(e.couponId);
       groupBuyBean.value.price = groupBuyBean.value?.offsetPrice;
@@ -201,6 +205,7 @@ onLoad(async (e: any) => {
     const maOpenId = getOpenId() || userInfo.value?.maOpenId;
     const data = await getCompanyList(maOpenId);
     const companyList = data.map((item: any) => item.company);
+    const userList = data.map((item: any) => item.user);
     let index = companyList.findIndex((res: {
       id: string
     }) => res.id === (getApp()?.globalData?.shareCompanyId || getCompanyId()));
@@ -217,7 +222,8 @@ onLoad(async (e: any) => {
           }
         }
       });
-      return;
+    } else {
+      await userStore.setUserInfo(userList[index]);
     }
 
     // setCompanyId('1512403904150138881');
@@ -230,6 +236,19 @@ onLoad(async (e: any) => {
         await fetchRecommendList();
         await fetchBuyRecordList();
       }
+    } else {
+      showToast('查询失败', {
+        complete: () => {
+          const pages = getCurrentPages();
+          if(pages.map(item => item?.route?.includes('pages/home/index'))) {
+            uni.navigateBack();
+          } else {
+            uni.reLaunch({
+              url: '/pages/home/index'
+            });
+          }
+        }
+      });
     }
     uni.hideLoading();
   } else {
@@ -244,9 +263,15 @@ onUnload(() => {
 });
 
 onShareAppMessage((e) => {
+  let path = `/pages/common/groupbuy/detail?id=${groupBuyBean.value?.id}&companyId=${getApp().globalData?.companyId}&storeId=${getApp().globalData?.storeId}`;
+  if(shareGoodsId.value) {
+    path = `/pages/common/groupbuy/detail?shareId=${shareGoodsId.value}&companyId=${getApp().globalData?.companyId}&storeId=${getApp().globalData?.storeId}`;
+  } else if(shareCouponId.value) {
+    path = `/pages/common/groupbuy/detail?couponId=${shareCouponId.value}&companyId=${getApp().globalData?.companyId}&storeId=${getApp().globalData?.storeId}`;
+  }
   return {
     title: groupBuyBean.value?.goods?.name || 'VIP顾客中心',
-    path: `/pages/common/groupbuy/detail?id=${groupBuyBean.value?.id}&companyId=${getApp().globalData?.companyId}&storeId=${getApp().globalData?.storeId}`
+    path: path
   };
 });
 
diff --git a/src/pages/common/groupbuy/order-confirm.vue b/src/pages/common/groupbuy/order-confirm.vue
index 1e33b68..2fff85f 100644
--- a/src/pages/common/groupbuy/order-confirm.vue
+++ b/src/pages/common/groupbuy/order-confirm.vue
@@ -97,6 +97,13 @@ const navigateTo = (e: any) => {
           uni.hideLoading();
         }
       });
+    },
+    onFailure: (e: any) => {
+      showToast(e, {
+        complete: () => {
+          uni.navigateBack();
+        }
+      });
     }
   });
 };
diff --git a/src/pages/common/groupbuy/order-coupon-confirm.vue b/src/pages/common/groupbuy/order-coupon-confirm.vue
index de8fb70..be1783e 100644
--- a/src/pages/common/groupbuy/order-coupon-confirm.vue
+++ b/src/pages/common/groupbuy/order-coupon-confirm.vue
@@ -144,17 +144,11 @@ const navigateTo = (e: any) => {
         icon: 'none',
         duration: 1500,
         complete(result) {
+          if(e?.includes('订单号重复')) {
+            createOrder();
+          }
         }
       });
-
-      // showToast(e, {
-      //   icon: 'none',
-      //   complete: () => {
-      //     setTimeout(() => {
-      //       uni.navigateBack();
-      //     }, 1500);
-      //   }
-      // });
     }
   });
 };
diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue
index 5d258c3..632759c 100644
--- a/src/pages/home/index.vue
+++ b/src/pages/home/index.vue
@@ -208,6 +208,12 @@ const fetchCompanyList = (fn: any = undefined) => {
         userStore.setUserInfo(userList.value[index]);
         userStore.setCompanyInfo(companyList.value[index]);
         avatarModifyRemind();
+
+        //首页选中处理后清空分享数据，避免再次选中
+        if(getApp()?.globalData?.shareCompanyId && getApp()?.globalData?.shareStoreId) {
+          getApp().globalData!.shareCompanyI = '';
+          getApp().globalData!.shareStoreId = '';
+        }
       }
     }
   );