Merge branch 'fix-109' of https://git.nianxx.cn/zoujing/YGChatCS

project.config.json

@@ -1,5 +1,5 @@
 {
-  "appid": "wx5e79df5996572539",
+  "appid": "wx23f86d809ae80259",
   "compileType": "miniprogram",
   "libVersion": "3.8.10",
   "packOptions": {

src/App.vue

@@ -2,10 +2,16 @@
 import { onLaunch, onShow, onHide } from "@dcloudio/uni-app";
 import { getEvnUrl } from "@/request/api/config";
 import { refreshToken } from "@/hooks/useGoLogin";
+import { getAccessToken } from "@/constant/token";
 
-onLaunch(() => {
-  getEvnUrl({ versionValue: "1.0.1" });
-  refreshToken();
+onLaunch(async () => {
+  await getEvnUrl({ versionValue: "1.0.3" });
+
+  const token = getAccessToken();
+
+  if (token) {
+    refreshToken();
+  }
 });
 
 onShow(() => {

src/components/Calender/index.vue

@@ -352,6 +352,14 @@ const handleSingleSelect = (dateInfo) => {
 
 // 处理范围选择
 const handleRangeSelection = (dateInfo) => {
+  if (dateInfo.price === undefined || dateInfo.price === null || dateInfo.stock === '' || dateInfo.price === '-') {
+      uni.showToast({
+        title: "所选日期不可预订，请重新选择",
+        icon: "none",
+      });
+      return;
+  }
+
   if (!rangeStart.value || (rangeStart.value && rangeEnd.value)) {
     // 开始新的范围选择
     rangeStart.value = dateInfo.date;

src/components/RefundPopup/index.vue

@@ -80,7 +80,8 @@ const refundTitle = computed(() => {
 });
 
 const commodityPurchaseInstruction = computed(() => {
-  if (props.orderData.commodityPurchaseInstruction) {
+  if (props.orderData.commodityPurchaseInstruction && 
+      props.orderData.commodityPurchaseInstruction.refundContent) {
     // 以换行符为分隔符，将字符串转换为数组
     return props.orderData.commodityPurchaseInstruction.refundContent.split(
       "\n"

src/components/SwipeCards/index.vue

@@ -14,7 +14,7 @@
       <view class="inner-card bg-white">
         <!-- 商品大图部分：自适应剩余空间 -->
         <view class="goods-image-wrapper relative">
-          <image class="w-full h-full" :src="card.commodityPhoto" />
+          <image class="w-full h-full" :src="card.commodityPhoto" mode="aspectFill"/>
           <view
             class="goods-title absolute left-0 right-0 bottom-0 border-box p-12"
           >

src/constant/base.js

@@ -12,7 +12,7 @@ import rawConfigs from '../../client-configs.json' with { type: 'json' };
 export const CLIENT_CONFIGS = rawConfigs;
 
 // 获取当前用户端配置
-export const getCurrentConfig = () => CLIENT_CONFIGS.zhinian;
+export const getCurrentConfig = () => CLIENT_CONFIGS.duohua;
 export const clientId = getCurrentConfig().clientId;
 export const appId = getCurrentConfig().appId;
 

src/constant/token.js

@@ -0,0 +1,35 @@
+import { currentClientType } from "@/constant/base";
+
+// 存储在本地的认证 token 键名
+const CLIENT_TYPE = currentClientType();
+const ACCESS_TOKEN = `${CLIENT_TYPE}_ACCESS_TOKEN`;
+const REFRESH_ACCESS_TOKEN = `${CLIENT_TYPE}_REFRESH_ACCESS_TOKEN`;
+
+// 设置本地存储的认证 token
+export const setAccessToken = (token) => {
+  return uni.setStorageSync(ACCESS_TOKEN, token);
+};
+
+// 设置本地存储的刷新 token
+export const setRefreshToken = (token) => {
+  return uni.setStorageSync(REFRESH_ACCESS_TOKEN, token);
+};
+
+// 获取本地存储的刷新 token
+export const getRefreshToken = () => {
+  return uni.getStorageSync(REFRESH_ACCESS_TOKEN);
+};
+
+// 获取本地存储的认证 token
+export const getAccessToken = () => {
+  return uni.getStorageSync(ACCESS_TOKEN);
+};
+
+// 移除本地存储的认证 token
+export const removeAccessToken = () => {
+  return uni.removeStorageSync(ACCESS_TOKEN);
+};
+
+export const removeRefreshToken = () => {
+  return uni.removeStorageSync(REFRESH_ACCESS_TOKEN);
+};

src/hooks/useGoLogin.js

@@ -1,7 +1,8 @@
-import { wxLogin } from "../request/api/LoginApi";
-import { loginAuth, bindPhone, checkPhone } from "@/manager/LoginManager";
+import { wxLogin, checkUserPhone } from "@/request/api/LoginApi";
+import { loginAuth, bindPhone } from "@/manager/LoginManager";
 import { clientId } from "@/constant/base";
 import { NOTICE_EVENT_LOGIN_SUCCESS } from "@/constant/constant";
+import { getAccessToken, setAccessToken } from "../constant/token";
 
 // 跳转登录
 export const goLogin = () => uni.navigateTo({ url: "/pages/login/index" });
@@ -21,8 +22,9 @@ export const onLogin = async (e) => {
     }
 
     await loginAuth(e).then(async () => {
+      console.log("loginAuth resolve success");
       // 检查手机号是否绑定
-      const checkRes = await checkPhone();
+      const checkRes = await checkUserPhone();
       if (checkRes.data) {
         resolve();
         return;
@@ -47,7 +49,7 @@ export const onLogin = async (e) => {
 
 // 检测token
 export const checkToken = () => {
-  const token = uni.getStorageSync("token");
+  const token = getAccessToken();
 
   return new Promise((resolve) => {
     if (!token) {
@@ -60,31 +62,40 @@ export const checkToken = () => {
 };
 
 // 刷新token
-export const refreshToken = () => {
-  const token = uni.getStorageSync("token");
+export const refreshToken = (needLogin = false) => {
+  return new Promise(async (resolve) => {
+    uni.login({
+      provider: "weixin", //使用微信登录
+      success: async ({ code }) => {
+        console.log("进入 refreshToken success", code);
+        const params = {
+          openIdCode: [code],
+          grant_type: "wechat",
+          scope: "server",
+          clientId: clientId,
+        };
+        console.log("获取到的微信授权params:", JSON.stringify(params));
 
-  if (!token) {
-    return;
-  }
+        const response = await wxLogin(params);
 
-  uni.login({
-    provider: "weixin", //使用微信登录
-    success: async ({ code }) => {
-      console.log("refreshToken", code);
-      const params = {
-        openIdCode: [code],
-        grant_type: "wechat",
-        scope: "server",
-        clientId: clientId,
-      };
-      console.log("获取到的微信授权params:", JSON.stringify(params));
-      const response = await wxLogin(params);
+        if (needLogin && response.access_token) {
+          setAccessToken(response.access_token);
+        }
 
-      if (response.access_token) {
-        uni.setStorageSync("token", response.access_token);
-        // 登录成功后，触发登录成功事件
-        uni.$emit(NOTICE_EVENT_LOGIN_SUCCESS);
-      }
-    },
+        if (response.access_token) {
+          const checkRes = await checkUserPhone({
+            token: response.access_token,
+          });
+
+          if (checkRes.data) {
+            // 登录成功后，触发登录成功事件
+            uni.$emit(NOTICE_EVENT_LOGIN_SUCCESS);
+            resolve(false);
+          } else {
+            resolve(true);
+          }
+        }
+      },
+    });
   });
 };

src/main.js

@@ -16,6 +16,7 @@ app.$mount();
 import { createSSRApp } from "vue";
 import * as Pinia from "pinia";
 import { createUnistorage } from "pinia-plugin-unistorage";
+
 export function createApp() {
   const app = createSSRApp(App);
   const pinia = Pinia.createPinia();
@@ -29,4 +30,4 @@ export function createApp() {
     pinia,
   };
 }
-// #endif
+// #endif

src/manager/LoginManager.js

@@ -1,16 +1,11 @@
-import {
-  wxLogin,
-  bindUserPhone,
-  checkUserPhone,
-} from "../request/api/LoginApi";
+import { wxLogin, bindUserPhone } from "../request/api/LoginApi";
 import { getWeChatAuthCode } from "./AuthManager";
-import { useAppStore } from "@/store";
 import { clientId } from "@/constant/base";
 import { NOTICE_EVENT_LOGIN_SUCCESS } from "@/constant/constant";
+import { removeAccessToken, setAccessToken } from "../constant/token";
 
 const loginAuth = (e) => {
-  uni.setStorageSync("token", "");
-  const appStore = useAppStore();
+  removeAccessToken();
 
   return new Promise(async (resolve, reject) => {
     const openIdCode = await getWeChatAuthCode(e);
@@ -26,7 +21,9 @@ const loginAuth = (e) => {
     console.log("获取到的微信授权response:", response);
 
     if (response.access_token) {
-      uni.setStorageSync("token", response.access_token);
+      console.log("进入条件");
+      setAccessToken(response.access_token);
+
       // 登录成功后，触发登录成功事件
       uni.$emit(NOTICE_EVENT_LOGIN_SUCCESS);
       resolve();
@@ -45,9 +42,4 @@ const bindPhone = async (params) => {
   }
 };
 
-const checkPhone = async () => {
-  const response = await checkUserPhone();
-  return response;
-};
-
-export { loginAuth, bindPhone, checkPhone };
+export { loginAuth, bindPhone };

src/manifest.json

@@ -60,7 +60,7 @@
   朵花：wx23f86d809ae80259
   */
   "mp-weixin": {
-    "appid": "wx5e79df5996572539",
+    "appid": "wx23f86d809ae80259",
     "setting": {
       "urlCheck": false,
       "minified": true

src/pages-booking/components/FooterSection/index.vue

@@ -21,7 +21,6 @@
       />
       <text
         class="font-size-16 font-500 color-white"
-        @click="emit('payClick', orderData)"
         >立即支付</text
       >
     </view>
@@ -29,7 +28,9 @@
 </template>
 
 <script setup>
-import { computed, defineProps, defineEmits } from "vue";
+import { computed, defineProps, defineEmits, ref, onMounted, watch } from "vue";
+import { DebounceUtils } from "@/utils";
+import { preOrder } from "@/request/api/OrderApi";
 
 const props = defineProps({
   modelValue: {
@@ -54,11 +55,39 @@ const count = computed({
   },
 });
 
-const totalAmt = computed(() => {
-  const { totalDays } = props.selectedDate;
-  const { specificationPrice } = props.orderData;
-  return count.value * Number(specificationPrice) * totalDays;
+watch(
+  () => count.value,
+  (newVal, oldVal) => {
+    if (newVal !== oldVal) {
+      preOrderPay();
+    }
+  }
+);
+
+onMounted(() => {
+  preOrderPay();
 });
+
+const totalAmt = ref(props.orderData.specificationPrice);
+
+const preOrderPay = async () => {
+  preOrder({
+    "commodityId": props.orderData.commodityId,
+    "purchaseAmount": count.value,
+    "checkInData": props.selectedDate.startDate,
+    "checkOutData": props.selectedDate.endDate,
+  }).then((res) => {
+    console.log("预支付金额计算结果:", res);
+    totalAmt.value = res.data.payAmt;
+  }).catch((err) => {
+    console.error("预支付金额计算失败:", err);
+  });
+}
+
+const handleBooking = DebounceUtils.createDebounce(() => {
+  emit("payClick", props.orderData);
+}, 1000); 
+
 </script>
 
 <style scoped lang="scss">

src/pages-booking/index.vue

@@ -79,6 +79,7 @@
 
     <!-- 底部 -->
     <FooterSection
+      v-if="Object.keys(orderData).length"
       v-model="quantity"
       :selectedDate="selectedDate"
       :orderData="orderData"
@@ -203,96 +204,107 @@ const validateUserForms = () => {
 
 // 处理支付点击事件
 const handlePayClick = ThrottleUtils.createThrottle(async (goodsData) => {
-  console.log("处理支付点击事件", userFormList.value);
-  // 判断是酒店类型
-  if (goodsData.commodityTypeCode === "0") {
-    // 校验用户姓名
-    if (!validateUserForms()) {
+  // 点击后立即展示 loading
+  uni.showLoading({ title: "正在提交订单..." });
+
+  try {
+    console.log("处理支付点击事件", userFormList.value);
+    // 判断是酒店类型
+    if (goodsData.commodityTypeCode === "0") {
+      // 校验用户姓名
+      if (!validateUserForms()) {
+        uni.hideLoading();
+        return;
+      }
+    }
+    // 校验手机号
+    if (!PhoneUtils.validatePhone(userFormList.value[0].contactPhone)) {
+      uni.hideLoading();
+      uni.showToast({ title: "请输入正确的手机号", icon: "none" });
       return;
     }
+
+    // 购买的商品id
+    const commodityId = goodsData.commodityId;
+    // 消费者信息
+    const consumerInfoEntityList = userFormList.value;
+    // 购买数量
+    const purchaseAmount = consumerInfoEntityList.length;
+    // 支付方式 0-微信 1-支付宝 2-云闪付
+    const payWay = "0";
+    // 支付渠道 0-app 1-小程序 2-h5
+    const paySource = "1";
+
+    const params = {
+      commodityId,
+      purchaseAmount,
+      payWay,
+      paySource,
+      consumerInfoEntityList,
+    };
+
+    //酒店类型添加入住时间、离店时间
+    if (goodsData.commodityTypeCode === "0" && selectedDate.value) {
+      const { startDate, endDate } = selectedDate.value;
+      // 入住时间
+      params.checkInData = startDate;
+      // 离店时间
+      params.checkOutData = endDate;
+    }
+
+    const res = await orderPay(params);
+    console.log("确认订单---2:", res);
+
+    // 检查接口返回数据
+    if (!res || !res.data) {
+      uni.hideLoading();
+      uni.showToast({ title: "订单创建失败，请重试", icon: "none" });
+      return;
+    }
+
+    const { data } = res;
+    const { nonceStr, packageVal, paySign, signType, timeStamp } = data;
+
+    // 验证支付参数是否完整
+    if (!nonceStr || !packageVal || !paySign || !signType || !timeStamp) {
+      uni.hideLoading();
+      uni.showToast({ title: "支付参数错误，请重试", icon: "none" });
+      return;
+    }
+
+    // 在发起微信支付前关闭 loading（避免与原生支付 UI 冲突）
+    uni.hideLoading();
+
+    // 调用微信支付
+    uni.requestPayment({
+      provider: "wxpay",
+      timeStamp: String(timeStamp), // 确保为字符串类型
+      nonceStr: String(nonceStr),
+      package: String(packageVal), // 确保为字符串类型
+      signType: String(signType),
+      paySign: String(paySign),
+      success: () => {
+        uni.showToast({
+          title: "支付成功",
+          icon: "success",
+          success: () => {
+            uni.navigateTo({
+              url: "/pages-order/order/list",
+            });
+          },
+        });
+      },
+      fail: () => {
+        uni.showToast({ title: "支付失败，请重试", icon: "none" });
+      },
+    });
+  } catch (error) {
+    console.error(error);
+    uni.showToast({ title: "请求出错，请重试", icon: "none" });
+  } finally {
+    // 防止某些分支忘记 hide，确保最终关闭 loading（requestPayment 后也可以安全调用 hide）
+    uni.hideLoading();
   }
-  // 校验手机号
-  if (!PhoneUtils.validatePhone(userFormList.value[0].contactPhone)) {
-    uni.showToast({ title: "请输入正确的手机号", icon: "none" });
-    return;
-  }
-
-  // 购买的商品id
-  const commodityId = goodsData.commodityId;
-  // 消费者信息
-  const consumerInfoEntityList = userFormList.value;
-  // 购买数量
-  const purchaseAmount = consumerInfoEntityList.length;
-  // 支付方式 0-微信 1-支付宝 2-云闪付
-  const payWay = "0";
-  // 支付渠道 0-app 1-小程序 2-h5
-  const paySource = "1";
-
-  const params = {
-    commodityId,
-    purchaseAmount,
-    payWay,
-    paySource,
-    consumerInfoEntityList,
-  };
-
-  //酒店类型添加入住时间、离店时间
-  if (goodsData.commodityTypeCode === "0" && selectedDate.value) {
-    const { startDate, endDate } = selectedDate.value;
-    // 入住时间
-    params.checkInData = startDate;
-    // 离店时间
-    params.checkOutData = endDate;
-  }
-
-  const res = await orderPay(params);
-  console.log("确认订单---2:", res);
-
-  // 检查接口返回数据
-  if (!res || !res.data) {
-    uni.showToast({ title: "订单创建失败，请重试", icon: "none" });
-    return;
-  }
-
-  const { data } = res;
-  const { nonceStr, packageVal, paySign, signType, timeStamp } = data;
-
-  // 验证支付参数是否完整
-  if (!nonceStr || !packageVal || !paySign || !signType || !timeStamp) {
-    // console.error("支付参数不完整:", {
-    //   nonceStr: !!nonceStr,
-    //   packageVal: !!packageVal,
-    //   paySign: !!paySign,
-    //   signType: !!signType,
-    //   timeStamp: !!timeStamp,
-    // });
-    uni.showToast({ title: "支付参数错误，请重试", icon: "none" });
-    return;
-  }
-
-  // 调用微信支付
-  uni.requestPayment({
-    provider: "wxpay",
-    timeStamp: String(timeStamp), // 确保为字符串类型
-    nonceStr: String(nonceStr),
-    package: String(packageVal), // 确保为字符串类型
-    signType: String(signType),
-    paySign: String(paySign),
-    success: () => {
-      uni.showToast({
-        title: "支付成功",
-        icon: "success",
-        success: () => {
-          uni.navigateTo({
-            url: "/pages-order/order/list",
-          });
-        },
-      });
-    },
-    fail: () => {
-      uni.showToast({ title: "支付失败，请重试", icon: "none" });
-    },
-  });
 }, 1000);
 </script>
 

src/pages-order/order/components/FooterSection/index.vue

@@ -27,6 +27,7 @@
 <script setup>
 import { defineProps, defineEmits, computed } from "vue";
 import { orderPayNow } from "@/request/api/OrderApi";
+import { DebounceUtils } from "@/utils";
 
 const props = defineProps({
   orderData: {
@@ -64,17 +65,21 @@ const buttonText = computed(() => {
 const emit = defineEmits(["refund", "refresh"]);
 
 // 处理按钮点击事件
-const handleButtonClick = async (orderData) => {
+const handleButtonClick = DebounceUtils.createDebounce(async (orderData) => {
   try {
     // 再次预定跳转商品详情
     if (["1", "2", "3", "4", "5", "6"].includes(statusCode.value)) {
       uni.navigateTo({
         url: `/pages/goods/index?commodityId=${orderData.commodityId}`,
       });
+      return;
     }
 
     // 待支付状态，调用支付接口
     if (statusCode.value === "0") {
+      // 显示 loading
+      uni.showLoading({ title: "正在提交订单..." });
+
       const orderId = orderData.orderId;
       const payWay = orderData.payWay;
       const paySource = orderData.paySource;
@@ -84,6 +89,7 @@ const handleButtonClick = async (orderData) => {
 
       // 检查接口返回数据
       if (!res || !res.data) {
+        uni.hideLoading();
         uni.showToast({ title: "订单创建失败，请重试", icon: "none" });
         return;
       }
@@ -93,17 +99,14 @@ const handleButtonClick = async (orderData) => {
 
       // 验证支付参数是否完整
       if (!nonceStr || !packageVal || !paySign || !signType || !timeStamp) {
-        // console.error("支付参数不完整:", {
-        //   nonceStr: !!nonceStr,
-        //   packageVal: !!packageVal,
-        //   paySign: !!paySign,
-        //   signType: !!signType,
-        //   timeStamp: !!timeStamp,
-        // });
+        uni.hideLoading();
         uni.showToast({ title: "支付参数错误，请重试", icon: "none" });
         return;
       }
 
+      // 在发起微信支付前关闭 loading（避免与原生支付 UI 冲突）
+      uni.hideLoading();
+
       // 调用微信支付
       uni.requestPayment({
         provider: "wxpay",
@@ -126,8 +129,9 @@ const handleButtonClick = async (orderData) => {
     }
   } catch (error) {
     console.error("操作失败:", error);
+    uni.hideLoading();
   }
-};
+}, 1000);
 </script>
 
 <style lang="scss" scoped>

src/pages-quick/components/Card/index.vue

@@ -1,21 +1,11 @@
 <template>
-  <view
-    class="card bg-white border-box p-8 rounded-12 flex flex-items-start m-12"
-    @click.stop="handleClick(item)"
-  >
-    <image
-      class="left rounded-10"
-      :src="item.commodityPhoto"
-      mode="aspectFill"
-    />
+  <view class="card bg-white border-box p-8 rounded-12 flex flex-items-start m-12" @click.stop="handleClick(item)">
+    <image class="left rounded-10" :src="item.commodityPhoto" mode="aspectFill" />
     <view class="right border-box flex-full pl-12">
       <view class="font-size-16 line-height-24 color-171717 mb-4">
         {{ item.commodityName }}
       </view>
-      <view
-        v-if="item.commodityFacility"
-        class="font-size-12 line-height-16 color-99A0AE mb-4 ellipsis-1"
-      >
+      <view v-if="item.commodityFacility" class="font-size-12 line-height-16 color-99A0AE mb-4 ellipsis-1">
         {{ item.commodityFacility.join(" ") }}
       </view>
       <view class="font-size-12 line-height-18 color-43669A">
@@ -23,19 +13,13 @@
       </view>
 
       <view class="flex flex-items-center flex-justify-end">
-        <text
-          class="amt font-size-18 font-500 font-family-misans-vf line-height-24 color-FF3D60 mr-4"
-        >
+        <text class="amt font-size-18 font-500 font-family-misans-vf line-height-24 color-FF3D60 mr-4">
           {{ item.specificationPrice }}
         </text>
         <text class="font-size-12 line-height-16 color-99A0AE">
           /{{ item.stockUnitLabel }}
         </text>
-        <text
-          class="btn border-box rounded-10 color-white ml-16"
-          @click.stop="handleBooking(item)"
-          >订</text
-        >
+        <text class="btn border-box rounded-10 color-white ml-16" @click.stop="handleBooking(item)">订</text>
       </view>
     </view>
   </view>
@@ -64,24 +48,22 @@ const props = defineProps({
   },
   selectedDate: {
     type: Object,
-    default: () => {},
+    default: () => { },
   },
 });
 
-const handleClick = ({ commodityId }) => {
-  uni.navigateTo({ url: `/pages/goods/index?commodityId=${commodityId}` });
-};
-
 const selectedDateStore = useSelectedDateStore();
-const handleBooking = ({ commodityId }) => {
-  const { startDate, endDate, totalDays } = props.selectedDate;
 
+const navigateToPage = (commodityId, path) => {
+  const { startDate, endDate, totalDays } = props.selectedDate;
   selectedDateStore.setData({ startDate, endDate, totalDays });
 
-  uni.navigateTo({
-    url: `/pages-booking/index?commodityId=${commodityId}`,
-  });
+  uni.navigateTo({ url: `${path}?commodityId=${commodityId}` });
 };
+
+const handleClick = ({ commodityId }) => navigateToPage(commodityId, "/pages/goods/index")
+
+const handleBooking = ({ commodityId }) => navigateToPage(commodityId, "/pages-booking/index")
 </script>
 
 <style scoped lang="scss">

src/pages/index/components/DrawerSection/components/MineSetting/index.vue

@@ -102,6 +102,9 @@ const handleLogout = () => {
         uni.clearStorageSync();
         emits("close");
         uni.$emit(NOTICE_EVENT_LOGOUT);
+        uni.showToast({
+          title: "退出登录成功",
+        });
       }
     },
   });

src/pages/index/components/chat/ChatMainList/index.vue

@@ -2,79 +2,42 @@
   <view class="flex flex-col h-screen">
     <!-- 顶部自定义导航栏 -->
     <view class="header" :style="{ paddingTop: statusBarHeight + 'px' }">
-      <ChatTopNavBar
-        ref="topNavBarRef"
-        :mainPageDataModel="mainPageDataModel"
-      />
+      <ChatTopNavBar ref="topNavBarRef" :mainPageDataModel="mainPageDataModel" />
     </view>
 
     <!-- 消息列表（可滚动区域） -->
-    <scroll-view
-      class="main flex-full overflow-hidden scroll-y"
-      scroll-y
-      :scroll-top="scrollTop"
-      :scroll-with-animation="true"
-      @scroll="handleScroll"
-      @scrolltolower="handleScrollToLower"
-    >
+    <scroll-view class="main flex-full overflow-hidden scroll-y" scroll-y :scroll-top="scrollTop"
+      :scroll-with-animation="true" @scroll="handleScroll" @scrolltolower="handleScrollToLower">
       <!-- welcome栏 -->
       <ChatTopWelcome ref="welcomeRef" :mainPageDataModel="mainPageDataModel" />
 
-      <view
-        class="area-msg-list-content"
-        v-for="item in chatMsgList"
-        :key="item.msgId"
-        :id="item.msgId"
-      >
+      <view class="area-msg-list-content" v-for="item in chatMsgList" :key="item.msgId" :id="item.msgId">
         <template v-if="item.msgType === MessageRole.AI">
-          <ChatCardAI
-            class="flex flex-justify-start"
-            :key="`ai-${item.msgId}-${item.msg ? item.msg.length : 0}`"
-            :text="item.msg || ''"
-            :isLoading="item.isLoading"
-          >
+          <ChatCardAI class="flex flex-justify-start" :key="`ai-${item.msgId}-${item.msg ? item.msg.length : 0}`"
+            :text="item.msg || ''" :isLoading="item.isLoading">
             <template #content v-if="item.toolCall">
-              <QuickBookingComponent
-                v-if="item.toolCall.componentName === CompName.quickBookingCard"
-              />
-              <DiscoveryCardComponent
-                v-else-if="
-                  item.toolCall.componentName === CompName.discoveryCard
-                "
-              />
-              <CreateServiceOrder
-                v-else-if="
-                  item.toolCall.componentName === CompName.callServiceCard
-                "
-                :toolCall="item.toolCall"
-              />
-              <Feedback
-                v-else-if="
-                  item.toolCall.componentName === CompName.feedbackCard
-                "
-                :toolCall="item.toolCall"
-              />
-              <DetailCardCompontent
-                v-else-if="
-                  item.toolCall.componentName ===
-                  CompName.pictureAndCommodityCard
-                "
-                :toolCall="item.toolCall"
-              />
-              <AddCarCrad
-                v-else-if="
-                  item.toolCall.componentName === CompName.enterLicensePlateCard
-                "
-                :toolCall="item.toolCall"
-              />
+              <QuickBookingComponent v-if="item.toolCall.componentName === CompName.quickBookingCard" />
+              <DiscoveryCardComponent v-else-if="
+                item.toolCall.componentName === CompName.discoveryCard
+              " />
+              <CreateServiceOrder v-else-if="
+                item.toolCall.componentName === CompName.callServiceCard
+              " :toolCall="item.toolCall" />
+              <Feedback v-else-if="
+                item.toolCall.componentName === CompName.feedbackCard
+              " :toolCall="item.toolCall" />
+              <DetailCardCompontent v-else-if="
+                item.toolCall.componentName ===
+                CompName.pictureAndCommodityCard
+              " :toolCall="item.toolCall" />
+              <AddCarCrad v-else-if="
+                item.toolCall.componentName === CompName.enterLicensePlateCard
+              " :toolCall="item.toolCall" />
             </template>
 
             <template #footer>
               <!-- 这个是底部 -->
-              <AttachListComponent
-                v-if="item.question"
-                :question="item.question"
-              />
+              <AttachListComponent v-if="item.question" :question="item.question" />
             </template>
           </ChatCardAI>
         </template>
@@ -85,21 +48,15 @@
 
         <template v-else>
           <ChatCardOther class="flex flex-justify-center" :text="item.msg">
-            <ActivityListComponent
-              v-if="
-                mainPageDataModel.activityList &&
-                mainPageDataModel.activityList.length > 0
-              "
-              :activityList="mainPageDataModel.activityList"
-            />
+            <ActivityListComponent v-if="
+              mainPageDataModel.activityList &&
+              mainPageDataModel.activityList.length > 0
+            " :activityList="mainPageDataModel.activityList" />
 
-            <RecommendPostsComponent
-              v-if="
-                mainPageDataModel.recommendTheme &&
-                mainPageDataModel.recommendTheme.length > 0
-              "
-              :recommendThemeList="mainPageDataModel.recommendTheme"
-            />
+            <RecommendPostsComponent v-if="
+              mainPageDataModel.recommendTheme &&
+              mainPageDataModel.recommendTheme.length > 0
+            " :recommendThemeList="mainPageDataModel.recommendTheme" />
           </ChatCardOther>
         </template>
       </view>
@@ -108,17 +65,9 @@
     <!-- 输入框区域 -->
     <view class="pb-safe-area">
       <ChatQuickAccess />
-      <ChatInputArea
-        ref="inputAreaRef"
-        v-model="inputMessage"
-        :holdKeyboard="holdKeyboard"
-        :is-session-active="isSessionActive"
-        :stop-request="stopRequest"
-        @send="sendMessageAction"
-        @noHideKeyboard="handleNoHideKeyboard"
-        @keyboardShow="handleKeyboardShow"
-        @keyboardHide="handleKeyboardHide"
-      />
+      <ChatInputArea ref="inputAreaRef" v-model="inputMessage" :holdKeyboard="holdKeyboard"
+        :is-session-active="isSessionActive" :stop-request="stopRequest" @send="sendMessageAction"
+        @noHideKeyboard="handleNoHideKeyboard" @keyboardShow="handleKeyboardShow" @keyboardHide="handleKeyboardHide" />
     </view>
   </view>
 </template>
@@ -159,6 +108,7 @@ import WebSocketManager from "@/utils/WebSocketManager";
 import { ThrottleUtils, IdUtils } from "@/utils";
 import { checkToken } from "@/hooks/useGoLogin";
 import { useAppStore } from "@/store";
+import { getAccessToken } from "@/constant/token";
 
 const appStore = useAppStore();
 /// 导航栏相关
@@ -242,7 +192,7 @@ const handleScroll = ThrottleUtils.createThrottle(({ detail }) => {
 }, 50);
 
 // 处理滚动到底部事件
-const handleScrollToLower = () => {};
+const handleScrollToLower = () => { };
 
 // 滚动到底部 - 优化版本，确保打字机效果始终可见
 const scrollToBottom = () => {
@@ -308,9 +258,6 @@ const addNoticeListener = () => {
 
   uni.$on(NOTICE_EVENT_LOGOUT, () => {
     resetConfig();
-    uni.showToast({
-      title: "退出登录成功",
-    });
   });
 
   uni.$on(SCROLL_TO_BOTTOM, () => {
@@ -346,7 +293,7 @@ onLoad(() => {
 // token存在，初始化数据
 const initHandler = () => {
   console.log("initHandler");
-  const token = uni.getStorageSync("token");
+  const token = getAccessToken();
 
   if (!token) return;
   loadRecentConversation();
@@ -407,14 +354,14 @@ const getMainPageData = async () => {
 
 /// =============对话↓================
 // 初始化WebSocket
-const initWebSocket = () => {
+const initWebSocket = async () => {
   // 清理旧实例
   if (webSocketManager) {
     webSocketManager.destroy();
   }
 
   // 使用配置的WebSocket服务器地址
-  const token = uni.getStorageSync("token");
+  const token = getAccessToken();
   const wsUrl = `${appStore.serverConfig.wssUrl}?access_token=${token}`;
 
   // 初始化WebSocket管理器
@@ -426,9 +373,10 @@ const initWebSocket = () => {
 
     // 连接成功回调
     onOpen: (event) => {
+      console.log("WebSocket连接成功");
       // 重置会话状态
       webSocketConnectStatus = true;
-      isSessionActive.value = true;
+      isSessionActive.value = false; // 连接成功时重置会话状态，避免影响新消息发送
     },
 
     // 连接断开回调
@@ -441,9 +389,9 @@ const initWebSocket = () => {
 
     // 错误回调
     onError: (error) => {
+      console.error("WebSocket错误:", error);
       webSocketConnectStatus = false;
       isSessionActive.value = false;
-      console.error("WebSocket错误:", error);
     },
 
     // 消息回调
@@ -458,21 +406,24 @@ const initWebSocket = () => {
     getAgentId: () => agentId.value,
   });
 
-  // 初始化连接
-  webSocketManager
-    .connect()
-    .then(() => {
-      webSocketConnectStatus = true;
-    })
-    .catch((error) => {
-      console.error("WebSocket连接失败:", error);
-    });
+  try {
+    // 初始化连接
+    await webSocketManager.connect();
+    console.log("WebSocket连接初始化成功");
+    webSocketConnectStatus = true;
+    return true;
+  } catch (error) {
+    console.error("WebSocket连接失败:", error);
+    webSocketConnectStatus = false;
+    return false;
+  }
 };
 
 // 处理WebSocket消息
 const handleWebSocketMessage = (data) => {
   const aiMsgIndex = chatMsgList.value.length - 1;
   if (!chatMsgList.value[aiMsgIndex] || aiMsgIndex < 0) {
+    console.error("处理WebSocket消息时找不到对应的AI消息项");
     return;
   }
 
@@ -518,7 +469,10 @@ const handleWebSocketMessage = (data) => {
 };
 
 // 重置消息状态
-const resetMessageState = () => {};
+const resetMessageState = () => {
+  // 重置当前会话消息ID
+  currentSessionMessageId = null;
+};
 
 // 初始化数据 首次数据加载的时候
 const initData = () => {
@@ -536,12 +490,39 @@ const sendMessage = async (message, isInstruct = false) => {
 
   await checkToken();
 
+  // 检查WebSocket连接状态，如果未连接，尝试重新连接
   if (!webSocketConnectStatus) {
-    uni.showToast({
-      title: "当前网络异常，请稍后重试",
-      icon: "none",
+    console.log("WebSocket未连接，尝试重新连接...");
+    // 显示加载提示
+    uni.showLoading({
+      title: "正在连接服务器...",
     });
-    return;
+
+    // 尝试重新初始化WebSocket连接
+    try {
+      await initWebSocket();
+      // 等待短暂时间确保连接建立
+      await new Promise(resolve => setTimeout(resolve, 1000));
+
+      // 检查连接是否成功建立
+      if (!webSocketConnectStatus) {
+        uni.hideLoading();
+        uni.showToast({
+          title: "连接服务器失败，请稍后重试",
+          icon: "none",
+        });
+        return;
+      }
+      uni.hideLoading();
+    } catch (error) {
+      console.error("重新连接WebSocket失败:", error);
+      uni.hideLoading();
+      uni.showToast({
+        title: "连接服务器失败，请稍后重试",
+        icon: "none",
+      });
+      return;
+    }
   }
 
   if (isSessionActive.value) {
@@ -563,6 +544,8 @@ const sendMessage = async (message, isInstruct = false) => {
   };
   chatMsgList.value.push(newMsg);
   inputMessage.value = "";
+  // 发送消息后滚动到底部
+  setTimeoutScrollToBottom();
   sendChat(message, isInstruct);
   console.log("发送的新消息：", JSON.stringify(newMsg));
 };
@@ -578,9 +561,11 @@ const sendWebSocketMessage = (messageType, messageContent, options = {}) => {
   };
 
   try {
-    webSocketManager.sendMessage(args);
+    // 直接调用webSocketManager的sendMessage方法，利用其内部的消息队列机制
+    // 即使当前连接断开，消息也会被加入队列，等待连接恢复后发送
+    const result = webSocketManager.sendMessage(args);
     console.log(`WebSocket消息已发送 [类型:${messageType}]:`, args);
-    return true;
+    return result;
   } catch (error) {
     console.error("发送WebSocket消息失败:", error);
     isSessionActive.value = false;
@@ -590,9 +575,26 @@ const sendWebSocketMessage = (messageType, messageContent, options = {}) => {
 
 // 发送获取AI聊天消息
 const sendChat = (message, isInstruct = false) => {
-  if (!webSocketManager || !webSocketManager.isConnected()) {
-    console.error("WebSocket未连接");
-    isSessionActive.value = false;
+  // 检查WebSocket管理器是否存在，如果不存在，尝试重新初始化
+  if (!webSocketManager) {
+    console.error("WebSocket管理器不存在，尝试重新初始化...");
+    initWebSocket();
+    // 短暂延迟后再次检查连接状态
+    setTimeout(() => {
+      if (webSocketManager && webSocketManager.isConnected()) {
+        // 连接成功后重新发送消息
+        sendChat(message, isInstruct);
+      } else {
+        console.error("WebSocket重新初始化失败");
+        isSessionActive.value = false;
+        // 更新AI消息状态为失败
+        const aiMsgIndex = chatMsgList.value.length - 1;
+        if (aiMsgIndex >= 0 && chatMsgList.value[aiMsgIndex].msgType === MessageRole.AI) {
+          chatMsgList.value[aiMsgIndex].msg = "发送消息失败，请重试";
+          chatMsgList.value[aiMsgIndex].isLoading = false;
+        }
+      }
+    }, 1000);
     return;
   }
 
@@ -615,6 +617,8 @@ const sendChat = (message, isInstruct = false) => {
     },
   };
   chatMsgList.value.push(aiMsg);
+  // 添加AI消息后滚动到底部
+  setTimeoutScrollToBottom();
   const aiMsgIndex = chatMsgList.value.length - 1;
 
   // 发送消息
@@ -678,6 +682,7 @@ const resetConfig = () => {
 
   // 重置消息状态
   resetMessageState();
+  isSessionActive.value = false;
 
   // 清理定时器
   if (holdKeyboardTimer.value) {

src/pages/index/components/chat/ChatQuickAccess/index.vue

@@ -1,13 +1,7 @@
 <template>
-  <view
-    class="quick-access flex flex-row ml-12 pt-8 pb-8 scroll-x whitespace-nowrap"
-  >
-    <view
-      class="item border-box rounded-50 flex flex-row items-center"
-      v-for="(item, index) in itemList"
-      :key="index"
-      @click="sendReply(item)"
-    >
+  <view class="quick-access flex flex-row ml-12 pt-8 pb-8 scroll-x whitespace-nowrap">
+    <view class="item border-box rounded-50 flex flex-row items-center" v-for="(item, index) in itemList" :key="index"
+      @click="sendReply(item)">
       <view class="flex items-center justify-center">
         <image v-if="item.icon" class="icon" :src="item.icon" />
         <text class="font-size-14 color-2D91FF line-height-20">
@@ -22,6 +16,7 @@
 import { ref } from "vue";
 import { Command } from "@/model/ChatModel";
 import { SEND_MESSAGE_COMMAND_TYPE } from "@/constant/constant";
+import { checkToken } from "@/hooks/useGoLogin";
 
 const itemList = ref([
   {
@@ -55,7 +50,9 @@ const sendReply = (item) => {
 
   // 快速预定
   if (item.type === Command.quickBooking) {
-    uni.navigateTo({ url: "/pages-quick/list" });
+    checkToken().then(() => {
+      uni.navigateTo({ url: "/pages-quick/list" });
+    });
     return;
   }
 

src/pages/index/components/module/MoreService/index.vue

@@ -2,19 +2,12 @@
   <uni-popup ref="popup" type="bottom" :safe-area="false">
     <view class="popup-content border-box pt-12 pl-12 pr-12">
       <view class="header flex flex-items-center pb-12">
-        <view
-          class="title flex-full text-center font-size-17 color-000 font-500 ml-24"
-          >更多服务</view
-        >
+        <view class="title flex-full text-center font-size-17 color-000 font-500 ml-24">更多服务</view>
         <uni-icons type="close" size="24" color="#CACFD8" @click="close" />
       </view>
 
       <view class="list bg-white border-box pl-20 pr-20">
-        <view
-          class="item border-box border-bottom pt-20 pb-20"
-          v-for="(item, index) in list"
-          :key="index"
-        >
+        <view class="item border-box border-bottom pt-20 pb-20" v-for="(item, index) in list" :key="index">
           <view class="flex flex-items-center flex-justify-center">
             <image v-if="item.icon" class="left" :src="item.icon" />
             <view class="center flex-full">
@@ -25,10 +18,7 @@
                 {{ item.content }}
               </view>
             </view>
-            <view
-              class="right border-box font-size-12 color-white line-height-16"
-              @click="handleClick(item)"
-            >
+            <view class="right border-box font-size-12 color-white line-height-16" @click="handleClick(item)">
               {{ item.btnText }}
             </view>
           </view>
@@ -42,6 +32,7 @@
 import { ref } from "vue";
 import { Command } from "@/model/ChatModel";
 import { SEND_MESSAGE_COMMAND_TYPE } from "@/constant/constant";
+import { checkToken } from "@/hooks/useGoLogin";
 
 const popup = ref(null);
 
@@ -100,7 +91,10 @@ const handleClick = (item) => {
   close();
 
   if (item.path) {
-    uni.navigateTo({ url: item.path });
+    checkToken().then(() => {
+      uni.navigateTo({ url: item.path });
+    });
+
     return;
   }
 

src/pages/login/index.vue

@@ -17,17 +17,9 @@
     <view class="login-agreement flex flex-items-center">
       <CheckBox v-model="isAgree">
         <text class="font-size-12 color-525866">我已阅读并同意</text>
-        <text
-          class="font-size-12 color-2D91FF ml-4 mr-4"
-          @click.stop="handleAgreeClick('service')"
-          >《服务协议》</text
-        >
+        <text class="font-size-12 color-2D91FF ml-4 mr-4" @click.stop="handleAgreeClick('service')">《服务协议》</text>
         <text class="font-size-12 color-525866">和</text>
-        <text
-          class="font-size-12 color-2D91FF ml-4 mr-4"
-          @click.stop="handleAgreeClick('privacy')"
-          >《隐私协议》</text
-        >
+        <text class="font-size-12 color-2D91FF ml-4 mr-4" @click.stop="handleAgreeClick('privacy')">《隐私协议》</text>
         <text class="font-size-12 color-525866">，\n</text>
         <text class="font-size-12 color-525866 ml-30">授权与账号关联操作</text>
       </CheckBox>
@@ -37,49 +29,30 @@
     <view class="login-btn-area">
       <!-- 同意隐私协议并获取手机号按钮 -->
 
-      <button
-        v-if="!isAgree"
-        class="login-btn"
-        type="primary"
-        @click="handleAgreeAndGetPhone"
-      >
-        手机号快捷登录
-      </button>
-
-      <button
-        v-if="isAgree && !appStore.tokenExpired"
-        class="login-btn"
-        type="primary"
-        open-type="getPhoneNumber"
-        @getphonenumber="getPhoneNumber"
-      >
+      <button class="login-btn" type="primary" :open-type="needWxLogin ? 'getPhoneNumber' : ''"
+        @getphonenumber="getPhoneNumber" @click="handleAgreeAndGetPhone">
         手机号快捷登录
       </button>
     </view>
 
-    <AgreePopup
-      ref="agreePopup"
-      :visible="visible"
-      :agreement="computedAgreement"
-      @close="visible = false"
-    />
+    <AgreePopup ref="agreePopup" :visible="visible" :agreement="computedAgreement" @close="visible = false" />
   </view>
 </template>
 
 <script setup>
+import { onShow } from "@dcloudio/uni-app";
 import { ref, computed } from "vue";
 import {
   getServiceAgreement,
   getPrivacyAgreement,
 } from "@/request/api/LoginApi";
-import { onLogin, goBack } from "@/hooks/useGoLogin";
+import { onLogin, goBack, refreshToken } from "@/hooks/useGoLogin";
 import CheckBox from "@/components/CheckBox/index.vue";
 import AgreePopup from "./components/AgreePopup/index.vue";
-import { zniconsMap } from "@/static/fonts/znicons.js";
+import { zniconsMap } from "@/static/fonts/znicons";
 import { getCurrentConfig } from "@/constant/base";
-import { useAppStore } from "@/store";
-const appStore = useAppStore();
 
+const needWxLogin = ref(false);
 const isAgree = ref(false);
 const visible = ref(false);
 const serviceAgreement = ref("");
@@ -90,6 +63,11 @@ const logo = computed(() => getCurrentConfig().logo);
 
 // 同意隐私协议并获取手机号
 const handleAgreeAndGetPhone = () => {
+  // 如果需要微信登录，直接返回
+  if (needWxLogin.value) {
+    return;
+  }
+
   if (!isAgree.value) {
     uni.showToast({
       title: "请先同意服务协议和隐私协议",
@@ -97,6 +75,8 @@ const handleAgreeAndGetPhone = () => {
     });
     return;
   }
+
+  refreshToken(true).then(() => goBack());
 };
 
 const getPhoneNumber = (e) => {
@@ -108,7 +88,7 @@ const getPhoneNumber = (e) => {
       });
       goBack();
     })
-    .catch(() => {});
+    .catch(() => { });
 };
 
 // 处理同意协议点击事件
@@ -141,10 +121,18 @@ const getPrivacyAgreementData = async () => {
 };
 
 getPrivacyAgreementData();
+
+// 页面显示时刷新token
+onShow(async () => {
+  const res = await refreshToken();
+
+  needWxLogin.value = res;
+});
 </script>
 
 <style lang="scss" scoped>
 @import "./styles/index.scss";
+
 @font-face {
   font-family: znicons;
   src: url("@/static/fonts/znicons.ttf");

src/request/api/AgentChatStream.js

@@ -1,5 +1,7 @@
 import { goLogin } from "@/hooks/useGoLogin";
 import { useAppStore } from "@/store";
+import { getAccessToken } from "@/constant/token";
+import { removeAccessToken } from "@/constant/token";
 
 /// 请求流式数据的API
 const API = "/agent/assistant/chat";
@@ -72,7 +74,7 @@ const stopAbortTask = () => {
 
 const agentChatStream = (params, onChunk) => {
   return new Promise((resolve, reject) => {
-    const token = uni.getStorageSync("token");
+    const token = getAccessToken();
     const requestId = Date.now().toString(); // 生成唯一请求ID
 
     // 重置状态
@@ -130,7 +132,7 @@ const agentChatStream = (params, onChunk) => {
               res.statusCode
             );
             if (res.statusCode === 424) {
-              uni.setStorageSync("token", "");
+              removeAccessToken();
               goLogin();
             }
             if (onChunk) {

src/request/api/LoginApi.js

@@ -1,48 +1,49 @@
+import { removeAccessToken } from "@/constant/token";
 import request from "../base/request";
 
 const wxLogin = (args) => {
-    const config = {
-        header: {
-            Authorization: "Basic Y3VzdG9tOmN1c3RvbQ==", // 可在此动态设置 token
-            "Content-Type": "application/x-www-form-urlencoded",
-        },
-    };
+  const config = {
+    header: {
+      Authorization: "Basic Y3VzdG9tOmN1c3RvbQ==", // 可在此动态设置 token
+      "Content-Type": "application/x-www-form-urlencoded",
+    },
+  };
 
-    uni.setStorageSync("token", "");
+  removeAccessToken();
 
-    return request.post("/auth/oauth2/token", args, config);
+  return request.post("/auth/oauth2/token", args, config);
 };
 
 // 绑定用户手机号
 const bindUserPhone = (args) => {
-    return request.post("/hotelBiz/user/bindUserPhone", args);
+  return request.post("/hotelBiz/user/bindUserPhone", args);
 };
 
 // 检测用户是否绑定手机号
-const checkUserPhone = (args) => {
-    return request.get("/hotelBiz/user/checkUserHasBindPhone", args);
+const checkUserPhone = (config) => {
+  return request.get("/hotelBiz/user/checkUserHasBindPhone", {}, config);
 };
 
 // 获取登录用户手机号
 const getLoginUserPhone = (args) => {
-    return request.get("/hotelBiz/user/getLoginUserPhone", args);
+  return request.get("/hotelBiz/user/getLoginUserPhone", args);
 };
 
 // 获取服务协议
 const getServiceAgreement = (args) => {
-    return request.get("/hotelBiz/mainScene/serviceAgreement", args);
+  return request.get("/hotelBiz/mainScene/serviceAgreement", args);
 };
 
 // 获取隐私协议
 const getPrivacyAgreement = (args) => {
-    return request.get("/hotelBiz/mainScene/privacyPolicy", args);
+  return request.get("/hotelBiz/mainScene/privacyPolicy", args);
 };
 
 export {
-    wxLogin,
-    bindUserPhone,
-    checkUserPhone,
-    getLoginUserPhone,
-    getServiceAgreement,
-    getPrivacyAgreement,
+  wxLogin,
+  bindUserPhone,
+  checkUserPhone,
+  getLoginUserPhone,
+  getServiceAgreement,
+  getPrivacyAgreement,
 };

src/request/api/UpdateFile.js

@@ -1,10 +1,11 @@
 import { getCurrentConfig } from "@/constant/base";
 import { useAppStore } from "@/store";
+import { getAccessToken } from "@/constant/token";
 
 export const updateImageFile = (file) => {
   const { serverConfig } = useAppStore();
   const url = serverConfig.baseUrl + "/hotelBiz/hotBizCommon/upload";
-  const token = uni.getStorageSync("token");
+  const token = getAccessToken();
   const clientId = getCurrentConfig().clientId;
 
   return new Promise((resolve, reject) => {

src/request/api/config.js

@@ -3,14 +3,11 @@ import { isProd } from "@/constant/base";
 import { useAppStore } from "@/store";
 
 // 获取服务地址
-const getEvnUrl = (args) => {
-  if (isProd) {
+const getEvnUrl = async (args) => {
+  const res = await request.post("https://biz.nianxx.cn/hotelBiz/mainScene/getServiceUrl", args)
+  if (res && res.code == 0 && res.data) {
     const appStore = useAppStore();
-    request
-      .post("https://biz.nianxx.cn/hotelBiz/mainScene/getServiceUrl", args)
-      .then(({ data }) => {
-        appStore.setServerConfig(data);
-      });
+    appStore.setServerConfig(res.data);
   }
 };
 

src/request/base/request.js

@@ -2,6 +2,7 @@ import { goLogin } from "../../hooks/useGoLogin";
 import { getCurrentConfig } from "@/constant/base";
 import { useAppStore } from "@/store";
 import { NOTICE_EVENT_LOGOUT } from "@/constant/constant";
+import { getAccessToken } from "@/constant/token";
 
 const clientId = getCurrentConfig().clientId;
 const defaultConfig = {
@@ -19,7 +20,7 @@ function request(url, args = {}, method = "POST", customConfig = {}) {
     url = appStore.serverConfig?.baseUrl + url;
   }
   // 动态获取 token
-  const token = uni.getStorageSync("token");
+  const token = getAccessToken();
 
   let header = {
     ...defaultConfig.header,
@@ -30,8 +31,8 @@ function request(url, args = {}, method = "POST", customConfig = {}) {
   if (customConfig.noToken) {
     delete header.Authorization;
   } else {
-    if (token) {
-      header.Authorization = `Bearer ${token}`;
+    if (token || customConfig.token) {
+      header.Authorization = `Bearer ${token || customConfig.token}`;
     }
   }
 
@@ -58,9 +59,9 @@ function request(url, args = {}, method = "POST", customConfig = {}) {
         resolve(res.data);
         if (res.statusCode && res.statusCode === 424) {
           console.log("424错误，重新登录");
-          uni.setStorageSync("token", "");
+          // removeAccessToken();
           uni.$emit(NOTICE_EVENT_LOGOUT);
-          goLogin();
+          // goLogin();
         }
       },
       fail: (err) => {

src/utils/share.js

@@ -3,7 +3,9 @@ export default {
     app.mixin({
       onLoad() {
         const page = getCurrentPages().pop();
-        if (page) {
+        console.log("Current page:", page);
+        const allowShare = page && page.route && page.route !== "pages/login/index";
+        if (allowShare) {
           uni.showShareMenu({
             withShareTicket: true,
             menus: ["shareAppMessage", "shareTimeline"],