From e097b7096389be1682a79e8306394de0ac09df90 Mon Sep 17 00:00:00 2001
From: blak-kong <546598185@qq.com>
Date: Mon, 15 Jan 2024 15:47:23 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/user/user.tsx | 33 +++++++++++++++------------------
 src/utils/request.js    | 11 ++++++++---
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/pages/user/user.tsx b/src/pages/user/user.tsx
index b26ac7f..74a7d92 100644
--- a/src/pages/user/user.tsx
+++ b/src/pages/user/user.tsx
@@ -96,24 +96,21 @@ class User extends Component<any, any> {
       return;
     }
     let url = e.currentTarget.dataset.url;
-    // if (url == "/pages/integral_list/integral_list") {
-    //   // this.CreditSubscribe(url);
-    //   return false;
-    // }
     Taro.navigateTo({
       url,
     });
   };
+
+  // 不检查登录跳转
+  goUrlNoRegister = (e) => {
+    let url = e.currentTarget.dataset.url;
+    Taro.navigateTo({
+      url,
+    });
+  };
+
   gourls = (e) => {
-    let registerArray = ["/pages/message/message"];
     let url = e.currentTarget.dataset.url;
-    let mobile = Taro.getStorageSync("mobile");
-    if (!mobile) {
-      if (registerArray.includes(url)) {
-        this.setState({ isNotRegister: true });
-        return;
-      }
-    }
     Taro.navigateTo({
       url,
     });
@@ -271,7 +268,7 @@ class User extends Component<any, any> {
               </View>
               <View
                 className="block"
-                onClick={this.gourl}
+                onClick={this.goUrlNoRegister}
                 data-url="/pages/integral_list/integral_list"
               >
                 <Image
@@ -319,7 +316,7 @@ class User extends Component<any, any> {
               </View>
               <View
                 className="block flex aitems"
-                onClick={this.gourls}
+                onClick={this.goUrlNoRegister}
                 data-url="/pages/integral_list/integral_list"
               >
                 <View className="img">
@@ -330,7 +327,7 @@ class User extends Component<any, any> {
               <View
                 className="block flex aitems"
                 data-url="/pages/message/message"
-                onClick={this.gourls}
+                onClick={this.gourl}
               >
                 <View className="img">
                   <Image src={require("../../img/4.png")} mode="aspectFill" />
@@ -346,7 +343,7 @@ class User extends Component<any, any> {
               <View
                 className="block flex aitems"
                 data-url="/pages/consultant/consultant"
-                onClick={this.gourls}
+                onClick={this.goUrlNoRegister}
               >
                 <View className="img">
                   <Image src={require("../../img/5.png")} mode="aspectFill" />
@@ -365,7 +362,7 @@ class User extends Component<any, any> {
               <View
                 className="block flex aitems"
                 data-url="/pages/about/about"
-                onClick={this.gourls}
+                onClick={this.goUrlNoRegister}
               >
                 <View className="img">
                   <Image src={require("../../img/7.png")} mode="aspectFill" />
@@ -375,7 +372,7 @@ class User extends Component<any, any> {
               <View
                 className="block flex aitems"
                 data-url="/pages/privacyPolicy/privacyPolicy"
-                onClick={this.gourls}
+                onClick={this.goUrlNoRegister}
               >
                 <View className="img">
                   <Image src={require("../../img/8.png")} mode="aspectFill" />
diff --git a/src/utils/request.js b/src/utils/request.js
index 5053841..9dc2400 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -67,7 +67,9 @@ export const Ajax = (params) => {
         }
         if (res.data.code !== 200) {
           let msg =
-            typeof res.data.msg == "string" ? res.data.msg : "没内容提示";
+            typeof res.data.msg == "string"
+              ? res.data.msg
+              : "系统异常，请联系管理人员";
           if (msg == "请不要操作太快哦") {
             reject(res);
             return false;
@@ -145,7 +147,8 @@ export const AjaxuploadFile = (params) => {
           return false;
         }
         if (o.code !== 200) {
-          let msg = typeof o.msg == "string" ? o.msg : "没内容提示";
+          let msg =
+            typeof o.msg == "string" ? o.msg : "系统异常，请联系管理人员";
           Taro.showModal({
             title: "提示",
             content: msg,
@@ -216,7 +219,9 @@ export const AjaxFormData = (params) => {
         }
         if (res.data.code !== 200) {
           let msg =
-            typeof res.data.msg == "string" ? res.data.msg : "没内容提示";
+            typeof res.data.msg == "string"
+              ? res.data.msg
+              : "系统异常，请联系管理人员";
           if (msg == "请不要操作太快哦") {
             reject(res);
             return false;