feat：工单的校验问题处理

client-configs.json

@@ -1,6 +1,6 @@
 {
   "zhinian": {
-    "clientId": "2",
+    "clientId": "6",
     "appId": "wx5e79df5996572539",
     "name": "智念",
     "placeholder": "快告诉智念您在想什么~",

src/App.vue

@@ -1,9 +1,11 @@
 <script setup>
 import { onLaunch, onShow, onHide } from "@dcloudio/uni-app";
 import { getEvnUrl } from "@/request/api/config";
+import { refreshToken } from "@/hooks/useGoLogin";
 
 onLaunch(() => {
   getEvnUrl({ versionValue: "1.0.1" });
+  refreshToken();
 });
 
 onShow(() => {

src/components/CreateServiceOrder/index.vue

@@ -15,7 +15,7 @@
         />
       </view>
 
-      <view v-if="!isCallSuccess" class="order-content border-box p-12">
+      <view v-if="!isCallSuccess" class="border-box p-12">
         <view
           class="bg-F5F7FA border-box flex flex-items-center p-12 rounded-10 font-size-14 color-171717 mb-12"
         >
@@ -149,6 +149,8 @@ const originalPhone = ref("");
 const contactPhone = ref("");
 // 是否用户已编辑过手机号（一旦编辑则不再脱敏）
 const hasEditedPhone = ref(false);
+// 需求信息描述：使用可写的 ref，并从工具结果初始化
+const contactText = ref("");
 
 // 手机号脱敏：138****1234（仅对11位数字进行处理）
 const maskPhone = (phone) => {
@@ -163,13 +165,10 @@ watch(
     originalPhone.value = val?.userPhone || "";
     hasEditedPhone.value = false;
     contactPhone.value = maskPhone(originalPhone.value);
+    contactText.value = val?.callServiceContent || "";
   },
   { immediate: true }
 );
-const contactText = computed({
-  get: () => toolResult.value?.callServiceContent || "",
-  set: (val) => (contactText.value = val),
-});
 
 // 处理图片上传
 const handleChooseImage = () => {

src/components/CreateServiceOrder/styles/index.scss

@@ -6,9 +6,6 @@
   width: 98px;
   height: 48px;
 }
-.order-content {
-  width: 335px;
-}
 
 .help-icon {
   width: 16px;

src/components/Feedback/index.vue

@@ -15,7 +15,7 @@
         />
       </view>
 
-      <view v-if="!isCallSuccess" class="order-content border-box p-12">
+      <view v-if="!isCallSuccess" class="border-box p-12">
         <view
           class="bg-F5F7FA border-box flex flex-items-center p-12 rounded-10 font-size-14 color-171717 mb-12"
         >

src/components/Feedback/styles/index.scss

@@ -7,10 +7,6 @@
   height: 48px;
 }
 
-.order-content {
-  width: 335px;
-}
-
 .help-icon {
   width: 16px;
   height: 16px;

src/hooks/useGoLogin.js

@@ -1,6 +1,7 @@
+import { wxLogin } from "../request/api/LoginApi";
 import { loginAuth, bindPhone, checkPhone } from "@/manager/LoginManager";
 import { clientId } from "@/constant/base";
-import { useAppStore } from "@/store";
+import { NOTICE_EVENT_LOGIN_SUCCESS } from "@/constant/constant";
 
 // 跳转登录
 export const goLogin = () => uni.navigateTo({ url: "/pages/login/index" });
@@ -46,14 +47,44 @@ export const onLogin = async (e) => {
 
 // 检测token
 export const checkToken = () => {
+  const token = uni.getStorageSync("token");
+
   return new Promise((resolve) => {
-    const appStore = useAppStore();
-    console.log("appStore.hasToken: ", appStore.hasToken);
-    if (!appStore.hasToken) {
-      console.log("没有token，跳转到登录页");
+    if (!token) {
       goLogin();
       return;
     }
+
     resolve();
   });
 };
+
+// 刷新token
+export const refreshToken = () => {
+  const token = uni.getStorageSync("token");
+
+  if (!token) {
+    return;
+  }
+
+  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 (response.access_token) {
+        uni.setStorageSync("token", response.access_token);
+        // 登录成功后，触发登录成功事件
+        uni.$emit(NOTICE_EVENT_LOGIN_SUCCESS);
+      }
+    },
+  });
+};

src/manager/AuthManager.js

@@ -22,12 +22,8 @@ export const getWeChatAuthCode = (e) => {
     uni.login({
       provider,
       onlyAuthorize: true,
-      success: (res) => {
-        resolve(res.code);
-      },
-      fail: (err) => {
-        reject(err);
-      },
+      success: (res) => resolve(res.code),
+      fail: (err) => reject(err),
     });
   });
 };

src/manager/LoginManager.js

@@ -11,7 +11,6 @@ import { NOTICE_EVENT_LOGIN_SUCCESS } from "@/constant/constant";
 const loginAuth = (e) => {
   uni.setStorageSync("token", "");
   const appStore = useAppStore();
-  appStore.setHasToken(false);
 
   return new Promise(async (resolve, reject) => {
     const openIdCode = await getWeChatAuthCode(e);
@@ -28,8 +27,6 @@ const loginAuth = (e) => {
 
     if (response.access_token) {
       uni.setStorageSync("token", response.access_token);
-      const appStore = useAppStore();
-      appStore.setHasToken(true);
       // 登录成功后，触发登录成功事件
       uni.$emit(NOTICE_EVENT_LOGIN_SUCCESS);
       resolve();

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

@@ -100,8 +100,6 @@ const handleLogout = () => {
     success: (res) => {
       if (res.confirm) {
         uni.clearStorageSync();
-        appStore.setHasToken(false);
-        appStore.setTokenExpired(true);
         emits("close");
         uni.$emit(NOTICE_EVENT_LOGOUT);
       }

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

@@ -346,7 +346,9 @@ onLoad(() => {
 // token存在，初始化数据
 const initHandler = () => {
   console.log("initHandler");
-  if (!appStore.hasToken) return;
+  const token = uni.getStorageSync("token");
+
+  if (!token) return;
   loadRecentConversation();
   ///loadConversationMsgList();
   initWebSocket();

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

@@ -1,6 +1,6 @@
 <template>
   <view
-    class="quick-access border-box flex flex-nowrap items-center ml-12 pt-8 pb-8"
+    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"

src/pages/login/index.vue

@@ -55,15 +55,6 @@
       >
         手机号快捷登录
       </button>
-
-      <button
-        v-if="isAgree && appStore.tokenExpired"
-        class="login-btn"
-        type="primary"
-        @click="handleLogin"
-      >
-        手机号快捷登录
-      </button>
     </view>
 
     <AgreePopup
@@ -120,20 +111,6 @@ const getPhoneNumber = (e) => {
     .catch(() => {});
 };
 
-const handleLogin = () => {
-  console.log("handleLogin");
-  onLogin()
-    .then(() => {
-      uni.showToast({
-        title: "登录成功",
-        icon: "success",
-      });
-      appStore.setTokenExpired(false);
-      goBack();
-    })
-    .catch(() => {});
-};
-
 // 处理同意协议点击事件
 const handleAgreeClick = (type) => {
   visible.value = true;

src/request/base/request.js

@@ -25,6 +25,7 @@ function request(url, args = {}, method = "POST", customConfig = {}) {
     ...defaultConfig.header,
     ...customConfig.header,
   };
+
   // 判断是否需要 token
   if (customConfig.noToken) {
     delete header.Authorization;
@@ -58,8 +59,6 @@ function request(url, args = {}, method = "POST", customConfig = {}) {
         if (res.statusCode && res.statusCode === 424) {
           console.log("424错误，重新登录");
           uni.setStorageSync("token", "");
-          appStore.setHasToken(false);
-          appStore.setTokenExpired(true);
           uni.$emit(NOTICE_EVENT_LOGOUT);
           goLogin();
         }

src/store/modules/app.js

@@ -5,8 +5,6 @@ export const useAppStore = defineStore("app", {
     return {
       title: "",
       sceneId: "", // 分身场景id
-      hasToken: false, // 是否有token
-      tokenExpired: false, // token是否过期
       previewImageData: [], // 预览图片数据
       serverConfig: {
         baseUrl: "https://onefeel.brother7.cn/ingress", // 服务器基础地址
@@ -23,12 +21,6 @@ export const useAppStore = defineStore("app", {
     setSceneId(data) {
       this.sceneId = data;
     },
-    setHasToken(status) {
-      this.hasToken = status;
-    },
-    setTokenExpired(status) {
-      this.tokenExpired = status;
-    },
     setPreviewImageData(data) {
       this.previewImageData = data;
     },