From 6921c82ad3ff804f9666bb3aef73f0530be68975 Mon Sep 17 00:00:00 2001
From: Waiting <waitinghc@foxmail.com>
Date: Wed, 12 Jun 2024 23:01:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E5=88=86=E4=BA=AB=E6=9C=AA?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8C=E5=BA=97=E9=93=BA=E7=9A=84=E5=9B=A2=E8=B4=AD?=
 =?UTF-8?q?=E5=88=B8=E7=9A=84=E6=B3=A8=E5=86=8C=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   | 13 +---
 src/api/company/index.ts                      |  2 +
 src/pages/common/groupbuy/detail.vue          |  1 +
 src/pages/coupons/ticketsBuy/ticketsBuy.vue   | 18 ++++-
 src/pages/home/index.vue                      | 68 +++++++++++--------
 src/pages/index/index.vue                     |  5 ++
 .../subs/coupon/components/coupon-item.vue    |  4 +-
 src/store/modules/user/index.ts               |  4 +-
 src/utils/auth/index.ts                       |  2 +-
 9 files changed, 73 insertions(+), 44 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index ed74f41..6854727 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -101,15 +101,6 @@ export default {
           }, 500);
         }
       }
-
-      //原先商品团购
-      if(options?.path?.includes('ticketsBuy/ticketsBuy') && options?.query.couponsId) {
-        setTimeout(() => {
-          uni.reLaunch({
-            url: 'pages/common/groupbuy/detail?couponId=' + options?.query.couponsId
-          });
-        }, 500);
-      }
     }
 
     logger.info(`App Launch options ${env}: { companyId: `, getCompanyId() + ', storeId: ' + getRegisterStoreId() + ' }');
@@ -128,7 +119,9 @@ export default {
   globalData: {
     logger: logger,
     companyId: getCompanyId(),
-    storeId: getRegisterStoreId()
+    storeId: getRegisterStoreId(),
+    shareCompanyId: '',
+    shareStoreId: ''
   }
 };
 
diff --git a/src/api/company/index.ts b/src/api/company/index.ts
index 178da15..8c8831e 100644
--- a/src/api/company/index.ts
+++ b/src/api/company/index.ts
@@ -2,3 +2,5 @@ import { get } from '@/utils/request';
 
 export const getCompanyList = (maOpenId: string) => get({ url: `/wc/wechat/company?maOpenId=${maOpenId}` });
 export const getCompanyInfo = () => get({ url: `/ext/zconfig/company_find` });
+
+export const getStoreId = (data: any) => get({ url: '/wc/wechat/get_store_id', data });
diff --git a/src/pages/common/groupbuy/detail.vue b/src/pages/common/groupbuy/detail.vue
index ac1b053..d9f33ed 100644
--- a/src/pages/common/groupbuy/detail.vue
+++ b/src/pages/common/groupbuy/detail.vue
@@ -157,6 +157,7 @@ import { getGoodsList } from '@/api/goods';
 import { GoodsBean } from '@/api/goods/types';
 import { useUserStore } from '@/store';
 import { GroupBuyBean, RecordBean } from '@/api/groupbuy/types';
+import { getStoreId } from '@/api/company';
 
 const userStore = useUserStore();
 const { userInfo } = storeToRefs(userStore);
diff --git a/src/pages/coupons/ticketsBuy/ticketsBuy.vue b/src/pages/coupons/ticketsBuy/ticketsBuy.vue
index 917e7e9..e571bed 100644
--- a/src/pages/coupons/ticketsBuy/ticketsBuy.vue
+++ b/src/pages/coupons/ticketsBuy/ticketsBuy.vue
@@ -4,10 +4,26 @@
 
 <script lang='ts' setup>
 
-onLoad((options) => {
+import { getStoreId } from '@/api/company';
+
+onLoad(async (options) => {
   getApp().globalData?.logger?.info('ticketsBuy share options: ', options);
   let couponId = options?.couponsId;
   if(couponId) {
+    if(options?.companyId && options?.creatorId) {
+      const storeId = await getStoreId({
+        companyid: options?.companyId,
+        deviceid: options?.creatorId
+      });
+      if(storeId) {
+        // setRegisterStoreId(storeId);
+        if(getApp()?.globalData) {
+          getApp().globalData!.shareCompanyId = options?.companyId;
+          getApp().globalData!.shareStoreId = storeId;
+        }
+      }
+    }
+
     setTimeout(() => {
       uni.reLaunch({
         url: `/pages/common/groupbuy/detail?couponId=${couponId}`
diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue
index 4a4b094..c773ed7 100644
--- a/src/pages/home/index.vue
+++ b/src/pages/home/index.vue
@@ -178,38 +178,50 @@ function avatarModifyRemind() {
 const fetchCompanyList = (fn: any = undefined) => {
   const maOpenId = getOpenId() || userInfo.value?.maOpenId || (userList.value.filter((res: UserBean) => res?.maOpenId !== '')[0]?.maOpenId);
   getCompanyList(maOpenId).then(res => {
-    companyList.value = res.map((res: { company: any }) => res.company);
-    userList.value = res.map((res: { user: any }) => res.user);
+      companyList.value = res.map((res: { company: any }) => res.company);
+      userList.value = res.map((res: { user: any }) => res.user);
 
-    if(companyList.value.length === 0) {
-      uni.showModal({
-        title: '提示',
-        content: '当前店铺还未注册，请先注册',
-        showCancel: true,
-        success: (res) => {
-          if(res.confirm) {
-            goPath('/pages/common/register/index');
-          }
-        }
-      });
-      return;
-    }
-    if(fn != undefined && fn instanceof Function) {
-      fn(companyList.value, userList.value);
-    } else {
-      let index = companyList.value.findIndex((res: { id: string }) => res.id === getApp().globalData?.companyId);
-      //未在当前公司下注册
-      if(index < 0) {
-        if(!getApp()?.globalData?.storeId) {
-          goPath('/pages/common/register/index');
+      if(companyList.value.length === 0) {
+        showRegisterModal();
+        return;
+      }
+      if(fn != undefined && fn instanceof Function) {
+        fn(companyList.value, userList.value);
+      } else {
+        let index = companyList.value.findIndex((res: { id: string }) => res.id === getApp()?.globalData?.companyId);
+        //未在当前公司下注册
+        if(index < 0) {
+          showRegisterModal();
           return;
         }
-        index = 0;
-      }
 
-      userStore.setUserInfo(userList.value[index]);
-      userStore.setCompanyInfo(companyList.value[index]);
-      avatarModifyRemind();
+        //分享过来的公司id和店铺id
+        if(getApp()?.globalData?.shareCompanyId && getApp()?.globalData?.shareStoreId) {
+          index = companyList.value.findIndex((res: { id: string }) => res.id === getApp().globalData?.shareCompanyId);
+          if(index < 0) {
+            showRegisterModal();
+            return;
+          }
+        }
+
+        userStore.setUserInfo(userList.value[index]);
+        userStore.setCompanyInfo(companyList.value[index]);
+        avatarModifyRemind();
+      }
+    }
+  )
+  ;
+};
+
+const showRegisterModal = () => {
+  uni.showModal({
+    title: '提示',
+    content: '当前店铺还未注册，请先注册',
+    showCancel: true,
+    success: (res) => {
+      if(res.confirm) {
+        goPath('/pages/common/register/index');
+      }
     }
   });
 };
diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue
index fd4d25a..f61b3a1 100644
--- a/src/pages/index/index.vue
+++ b/src/pages/index/index.vue
@@ -7,6 +7,11 @@
 onLoad((options) => {
   getApp().globalData?.logger?.info('app share index/index options: ', options);
 
+  if(options?.companyId && options?.storeId && getApp()?.globalData) {
+    getApp().globalData!.shareCompanyId = options?.companyId;
+    getApp().globalData!.shareStoreId = options?.storeId;
+  }
+
   let goodsShareId = '';
   if(options?.shareId) {
     goodsShareId = options?.shareId;
diff --git a/src/pages/mine/subs/coupon/components/coupon-item.vue b/src/pages/mine/subs/coupon/components/coupon-item.vue
index cf3ca95..b8fe91e 100644
--- a/src/pages/mine/subs/coupon/components/coupon-item.vue
+++ b/src/pages/mine/subs/coupon/components/coupon-item.vue
@@ -9,7 +9,7 @@
 
     <view class='right-content accent-text-color' :class='{"right-content-disabled": item?.status!=0}'>
       <text>{{ item?.name }}</text>
-      <text>有效期至{{ dayjs(item?.startTime).format('YYYY-MM-DD') }}</text>
+      <text>有效期至{{ dayjs(item?.endTime).format('YYYY-MM-DD') }}</text>
       <text class='btn-text' :class='{"btn-text-disabled": item?.status!=0}' @click.stop='goPath("/pages/mall/index")'>
         立即使用
       </text>
@@ -80,7 +80,7 @@ defineProps({
     position: relative;
     flex: 1;
     justify-content: center;
-    margin-left: 70rpx;
+    margin-left: 65rpx;
 
     text:nth-of-type(1) {
       font-size: 30rpx;
diff --git a/src/store/modules/user/index.ts b/src/store/modules/user/index.ts
index cebc67b..748badd 100644
--- a/src/store/modules/user/index.ts
+++ b/src/store/modules/user/index.ts
@@ -130,9 +130,9 @@ const useUserStore = defineStore('user', {
         unionId: this.userInfo.unionId,
         openId: this.userInfo.openId,
         maOpenId: this.userInfo.maOpenId,
-        companyId: getCompanyId(),
+        companyId: getApp()?.globalData?.shareCompanyId || getCompanyId(),
         creatorId: this.userInfo.creatorId,
-        storeId: getRegisterStoreId()
+        storeId: getApp()?.globalData?.shareStoreId || getRegisterStoreId()
       } as RegisterParams;
       return new Promise(async (resolve, reject) => {
         try {
diff --git a/src/utils/auth/index.ts b/src/utils/auth/index.ts
index 1619bbe..e93500d 100644
--- a/src/utils/auth/index.ts
+++ b/src/utils/auth/index.ts
@@ -43,7 +43,7 @@ function setCompanyId(companyId: string) {
   if(companyId) {
     uni.setStorageSync(CompanyIdKey, companyId);
     if(getApp()?.globalData) {
-      getApp().globalData.companyId = companyId;
+      getApp().globalData!.companyId = companyId;
     }
   }
 }