From 3945b36b0a4751f1ca51f02cc73e1049c1c8ea73 Mon Sep 17 00:00:00 2001
From: Waiting <waitinghc@foxmail.com>
Date: Sat, 1 Jun 2024 20:06:30 +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/App.vue                                   | 21 +++++--
 src/api/user/types.ts                         |  1 +
 src/pages/common/groupbuy/detail.vue          | 10 +++-
 src/pages/common/login/index.vue              |  5 --
 src/pages/common/register/index.vue           | 11 +++-
 src/pages/home/index.vue                      | 59 +++++++++++++++----
 .../mall/subs/components/coupon-dialog.vue    |  2 +-
 src/pages/mall/subs/goods/detail.vue          |  7 +++
 src/pages/mine/subs/profile/index.vue         |  2 +-
 src/store/modules/user/index.ts               | 11 +++-
 src/utils/assets.ts                           |  1 -
 src/utils/auth/index.ts                       | 13 +++-
 src/utils/common/logger.ts                    |  6 ++
 src/utils/request/interceptors.ts             | 10 ++--
 14 files changed, 124 insertions(+), 35 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index fae643d..005e3c7 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,19 +1,26 @@
 <script lang='ts'>
-import { mpUpdate, setCompanyId, setReferrerUserId, setRegisterStoreId } from '@/utils';
+import {
+  getCompanyId,
+  getRegisterStoreId,
+  mpUpdate,
+  setCompanyId,
+  setReferrerUserId,
+  setRegisterStoreId
+} from '@/utils';
 import { Logger } from '@/utils/common/logger';
 
 const logger = new Logger();
 
 export default {
   onLaunch: async (options: any) => {
-    console.log('App Launch options ', options);
-
     const miniProgram = uni.getAccountInfoSync().miniProgram;
     const env = miniProgram.envVersion;
 
+    console.log(`App Launch options ${env}: `, options);
+
     //生产
     if(env === 'release') {
-      logger.info(`launch options ${env}: `, options);
+      logger.info(`App Launch options ${env}: `, options);
 
       async function getVersionStatus() {
         return new Promise((resolve, reject) => {
@@ -102,6 +109,8 @@ export default {
       }
     }
 
+    logger.info(`App Launch options ${env}: { companyId: `, getCompanyId() + ', storeId: ' + getRegisterStoreId() + ' }');
+
     // #ifdef MP
     mpUpdate();
     // #endif
@@ -114,7 +123,9 @@ export default {
   },
 
   globalData: {
-    logger: logger
+    logger: logger,
+    companyId: getCompanyId(),
+    storeId: getRegisterStoreId()
   }
 };
 
diff --git a/src/api/user/types.ts b/src/api/user/types.ts
index 0432d50..4b1ca50 100644
--- a/src/api/user/types.ts
+++ b/src/api/user/types.ts
@@ -31,6 +31,7 @@ export interface LoginResult {
   user: UserBean;
   userInfo: any;
   token: string;
+  maOpenId: string;
 }
 
 export interface IntegralBean {
diff --git a/src/pages/common/groupbuy/detail.vue b/src/pages/common/groupbuy/detail.vue
index bceba2a..ed36326 100644
--- a/src/pages/common/groupbuy/detail.vue
+++ b/src/pages/common/groupbuy/detail.vue
@@ -3,7 +3,7 @@
     <view class='swiper-container'>
       <swiper class='swiper' :interval='1500' :duration='1000' @change='swiperChange'>
         <swiper-item v-for='(item,index) in bannerList' :key='index'>
-          <image :src='item||defaultImage' mode='aspectFill'/>
+          <image :src='item||defaultImage' mode='aspectFill' />
         </swiper-item>
       </swiper>
       <view class='indicator'>
@@ -189,13 +189,19 @@ onUnload(() => {
   }
 });
 
+onShareAppMessage((e) => {
+  return {
+    title: groupBuyBean.value?.goods?.name || 'VIP顾客中心',
+    path: `/pages/common/groupbuy/detail?id=${groupBuyBean.value?.id}&companyId=${getApp().globalData?.companyId}&storeId=${getApp().globalData?.storeId}`
+  };
+});
+
 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 = () => {
diff --git a/src/pages/common/login/index.vue b/src/pages/common/login/index.vue
index 633daf7..af1fa10 100644
--- a/src/pages/common/login/index.vue
+++ b/src/pages/common/login/index.vue
@@ -37,11 +37,6 @@ async function wechatLogin() {
     return;
   }
 
-  if(!getRegisterStoreId()) {
-    showToast('请从公众号消息窗口点击店名打开小程序');
-    return;
-  }
-
   userStore.login().then(() => {
     uni.hideLoading();
     uni.reLaunch({ url: '/pages/home/index' });
diff --git a/src/pages/common/register/index.vue b/src/pages/common/register/index.vue
index fdc0f53..e5551ff 100644
--- a/src/pages/common/register/index.vue
+++ b/src/pages/common/register/index.vue
@@ -48,13 +48,13 @@ import { ref } from 'vue';
 import { getTelephone } from '@/api/user';
 import { useUserStore } from '@/store';
 import { assetsUrl } from '@/utils/assets';
-import { getSessionKey, showToast } from '@/utils';
+import { getRegisterStoreId, getSessionKey, showToast } from '@/utils';
 import dayjs from 'dayjs';
 
 const userStore = useUserStore();
 const { userInfo } = storeToRefs(userStore);
 
-const birthday = ref(userInfo.value.birthday);
+const birthday = ref(userInfo.value.birthday || dayjs().format('YYYY-MM-DD'));
 const nickName = ref(userInfo.value.nickName);
 const gender = ref(userInfo.value.gender);
 const telephone = ref(userInfo.value.telephone);
@@ -109,13 +109,18 @@ const changeGender = (index: number) => {
 };
 
 const save = async () => {
+  if(!getRegisterStoreId()) {
+    showToast('请从公众号消息窗口点击店名打开小程序');
+    return;
+  }
+
   await uni.showLoading();
   const registerForm = {
     image: avatarUrl.value,
     avatarUrl: avatarUrl.value,
     nickName: nickName.value,
     telephone: telephone.value,
-    birthday: dayjs(birthday.value).format("YYYY-MM-DD HH:mm:ss"),
+    birthday: dayjs(birthday.value).format('YYYY-MM-DD HH:mm:ss'),
     gender: gender.value
   };
 
diff --git a/src/pages/home/index.vue b/src/pages/home/index.vue
index cc9c23b..b0cd86a 100644
--- a/src/pages/home/index.vue
+++ b/src/pages/home/index.vue
@@ -72,7 +72,7 @@ import CompanyDialog from '@/components/company-dialog.vue';
 import { getCompanyList } from '@/api/company';
 import { useUserStore } from '@/store';
 import { assetsUrl, defaultAvatar, defaultImage } from '@/utils/assets';
-import { getCompanyId, goPath, isLogin } from '@/utils';
+import { getCompanyId, getOpenId, goPath, isLogin } from '@/utils';
 import { storeToRefs } from 'pinia';
 import { UserBean } from '@/store/modules/user/types';
 
@@ -128,35 +128,73 @@ onLoad((e) => {
 onShow(async () => {
   if(isLogin()) {
     // userStore.getProfile();
-    if(userInfo.value.maOpenId) {
-      fetchCompanyList();
-    } else {
-      await userStore.getProfile();
-    }
+    fetchCompanyList();
   } else {
     // setToken('42ae187265fb4688804fd294cbcf99f1')
+    uni.showModal({
+      title: '提示',
+      content: '您还未登录，请先登录',
+      showCancel: true,
+      success: (res) => {
+        if(res.confirm) {
+          goPath('/pages/common/login/index');
+        }
+      }
+    });
   }
 });
 
 const switchCompany = () => {
   fetchCompanyList((companyList: any[], userList: any[]) => {
-    companyDialogRef.value.show(getCompanyId(), (index: number) => {
+    companyDialogRef.value.show(getApp().globalData?.companyId, (index: number) => {
       userStore.setUserInfo(userList[index]);
       userStore.setCompanyInfo(companyList[index]);
+
+      avatarModifyRemind();
     });
   });
 };
 
+function avatarModifyRemind() {
+  setTimeout(() => {
+    if(userInfo.value.image === defaultAvatar) {
+      uni.showModal({
+        title: '提示',
+        content: '为了提供更优质的个性化服务，请先修改头像',
+        showCancel: true,
+        success: (res) => {
+          if(res.confirm) {
+            goPath('/pages/mine/subs/profile/index');
+          }
+        }
+      });
+    }
+  }, 300);
+}
+
 const fetchCompanyList = (fn: any = undefined) => {
-  const maOpenId = userInfo.value?.maOpenId || (userList.value.filter((res: UserBean) => res?.maOpenId !== '')[0]?.maOpenId);
+  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);
+
+    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 === getCompanyId());
-
+      let index = companyList.value.findIndex((res: { id: string }) => res.id === getApp().globalData?.companyId);
       //未在当前公司下注册
       if(index < 0) {
         goPath('/pages/common/register/index');
@@ -164,6 +202,7 @@ const fetchCompanyList = (fn: any = undefined) => {
       }
       userStore.setUserInfo(userList.value[index]);
       userStore.setCompanyInfo(companyList.value[index]);
+      avatarModifyRemind();
     }
   });
 };
diff --git a/src/pages/mall/subs/components/coupon-dialog.vue b/src/pages/mall/subs/components/coupon-dialog.vue
index e3003fb..6ccfc63 100644
--- a/src/pages/mall/subs/components/coupon-dialog.vue
+++ b/src/pages/mall/subs/components/coupon-dialog.vue
@@ -38,7 +38,7 @@ const coupons = ref<CouponBean[]>([]);
 
 const fetchData = async (status: number) => {
   const { list } = await getCouponList({
-    companyId: getCompanyId(),
+    companyId: getApp()?.globalData?.companyId,
     memberId: userInfo.value?.id,
     status: status,
     pageNum: 1,
diff --git a/src/pages/mall/subs/goods/detail.vue b/src/pages/mall/subs/goods/detail.vue
index 181e66c..1813b54 100644
--- a/src/pages/mall/subs/goods/detail.vue
+++ b/src/pages/mall/subs/goods/detail.vue
@@ -147,6 +147,13 @@ onLoad(async (e: any) => {
   uni.hideLoading();
 });
 
+onShareAppMessage((e) => {
+  return {
+    title: goodsBean.value?.name || 'VIP顾客中心',
+    path: `/pages/common/groupbuy/detail?id=${goodsBean.value?.id}&companyId=${getApp().globalData?.companyId}&storeId=${getApp().globalData?.storeId}`
+  };
+});
+
 const getStockColorCount = computed(() => {
   const list = Array.from(new Set(goodsBean.value?.stocks?.map(item => item.colorName)))
     .map(colorName => goodsBean.value?.stocks?.find(item => item.colorName === colorName)!);
diff --git a/src/pages/mine/subs/profile/index.vue b/src/pages/mine/subs/profile/index.vue
index b5de447..b14cf8e 100644
--- a/src/pages/mine/subs/profile/index.vue
+++ b/src/pages/mine/subs/profile/index.vue
@@ -48,7 +48,7 @@
       <view class='c-flex-row'>
         <text>生日</text>
         <picker mode='date' :disabled='(userInfo.birthday?.length||0)!=0' @change='changeDate'>
-          <text>{{ dayjs(params?.birthday).format('YYYY-MM-DD') || '请选择生日' }}</text>
+          <text>{{ dayjs(params?.birthday || Date.now()).format('YYYY-MM-DD') || '请选择生日' }}</text>
         </picker>
       </view>
     </view>
diff --git a/src/store/modules/user/index.ts b/src/store/modules/user/index.ts
index 000ca78..87ecc61 100644
--- a/src/store/modules/user/index.ts
+++ b/src/store/modules/user/index.ts
@@ -1,7 +1,15 @@
 import { defineStore } from 'pinia';
 import type { providerType, UserBean } from './types';
 import { getTerminal, getUserProfile, login, logout as userLogout, register } from '@/api/user/index';
-import { clearToken, getCompanyId, getRegisterStoreId, setCompanyId, setSessionKey, setToken } from '@/utils/auth';
+import {
+  clearToken,
+  getCompanyId,
+  getRegisterStoreId,
+  setCompanyId,
+  setOpenId,
+  setSessionKey,
+  setToken
+} from '@/utils/auth';
 import type { RegisterParams, TerminalBean } from '@/api/user/types';
 import { getCompanyInfo } from '@/api/company';
 
@@ -87,6 +95,7 @@ const useUserStore = defineStore('user', {
               getApp().globalData?.logger.info('login result: ', res);
               setToken(res.token);
               setSessionKey(res.sessionKey);
+              setOpenId(res.maOpenId)
               await this.setUserInfo(res.user);
               // }
               resolve(res);
diff --git a/src/utils/assets.ts b/src/utils/assets.ts
index f52f23d..9010843 100644
--- a/src/utils/assets.ts
+++ b/src/utils/assets.ts
@@ -1,4 +1,3 @@
 export const assetsUrl = (name: string) => `https://img.lakeapp.cn/wx/images/${name}`;
 export const defaultAvatar = 'https://thirdwx.qlogo.cn/mmopen/vi_32/POgEwh4mIHO4nibH0KlMECNjjGxQUq24ZEaGT4poC6icRiccVGKSyXwibcPq4BWmiaIGuG1icwxaQX6grC9VemZoJ8rg/132';
-
 export const defaultImage = '/static/images/ic_noimage.svg';
diff --git a/src/utils/auth/index.ts b/src/utils/auth/index.ts
index 55ea3a8..710539e 100644
--- a/src/utils/auth/index.ts
+++ b/src/utils/auth/index.ts
@@ -1,5 +1,6 @@
 const TokenKey = 'accessToken';
 const SessionKey = 'sessionKey';
+const OpenIdKey = 'openId';
 const CompanyIdKey = 'companyId';
 const ReferrerUserIdKey = 'referrerUserId';
 const RegisterStoreIdKey = 'storeId';
@@ -22,10 +23,18 @@ function getSessionKey() {
   return uni.getStorageSync(SessionKey);
 }
 
-function setSessionKey(sessionKey: string){
+function setSessionKey(sessionKey: string) {
   uni.setStorageSync(SessionKey, sessionKey);
 }
 
+function getOpenId() {
+  return uni.getStorageSync(OpenIdKey);
+}
+
+function setOpenId(openId: string) {
+  uni.setStorageSync(OpenIdKey, openId);
+}
+
 function getCompanyId() {
   return uni.getStorageSync(CompanyIdKey);
 }
@@ -63,6 +72,8 @@ export {
   setToken,
   getSessionKey,
   setSessionKey,
+  getOpenId,
+  setOpenId,
   getCompanyId,
   setCompanyId,
   getReferrerUserId,
diff --git a/src/utils/common/logger.ts b/src/utils/common/logger.ts
index 7a2c9f9..fb0a334 100644
--- a/src/utils/common/logger.ts
+++ b/src/utils/common/logger.ts
@@ -13,18 +13,24 @@ export class Logger {
   info(key: string, value: any) {
     if(this.env === 'release' || this.env === 'trial') {
       this.logger.info(key, value);
+    } else {
+      console.info(key, value);
     }
   }
 
   warn(key: string, value: any) {
     if(this.env === 'release' || this.env === 'trial') {
       this.logger.warn(key, value);
+    }else {
+      console.warn(key, value);
     }
   }
 
   error(key: string, value: any) {
     if(this.env === 'release' || this.env === 'trial') {
       this.logger.error(key, value);
+    }else {
+      console.error(key, value);
     }
   }
 }
diff --git a/src/utils/request/interceptors.ts b/src/utils/request/interceptors.ts
index 5b38ea9..241d641 100644
--- a/src/utils/request/interceptors.ts
+++ b/src/utils/request/interceptors.ts
@@ -1,7 +1,7 @@
 import type { HttpError, HttpRequestConfig, HttpResponse } from 'uview-plus/libs/luch-request';
-import { getCompanyId, getToken } from '@/utils/auth';
-import useUserStore from '@/store/modules/user';
+import { getToken } from '@/utils/auth';
 import { showMessage } from '@/utils/request/status';
+import { useUserStore } from '@/store';
 
 // 是否正在刷新token的标记
 let isRefreshing: boolean = false;
@@ -22,7 +22,7 @@ function requestInterceptors() {
       const token = getToken();
       if(token && config.header) {
         config.header.token = token;
-        config.header.companyid = getCompanyId();
+        config.header.companyid = getApp().globalData?.companyId;
 
         // config.header.contentType = "x-www-form-urlencoded"
       }
@@ -53,7 +53,7 @@ function responseInterceptors() {
         return data;
       }
 
-      getApp().globalData?.logger.info('response: ', config);
+      getApp().globalData?.logger.info('response: ', data);
 
       // 请求成功则返回结果
       if(data.code === 200 || data?.retcode == 0) {
@@ -61,7 +61,7 @@ function responseInterceptors() {
       }
 
       // 登录状态失效，重新登录
-      if(data.code === 401) {
+      if(data.code === 4011) {
         // 是否在获取token中,防止重复获取
         if(!isRefreshing) {
           // 修改登录状态为true