From db459b10a2a127d5edc5df6ea5ebe3f4dac9b3fb Mon Sep 17 00:00:00 2001
From: blak-kong <546598185@qq.com>
Date: Fri, 12 Jan 2024 18:38:48 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E5=A4=8Dbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/popup/popup-drawer.less |  2 +-
 src/components/popup/popup-drawer.tsx  |  2 +-
 src/pages/user/user.tsx                | 56 ++++++++++++++++++--------
 src/store/features/userInfo.js         |  2 +-
 src/utils/Interface.js                 | 26 ++++++++++++
 src/utils/request.js                   |  1 -
 6 files changed, 68 insertions(+), 21 deletions(-)

diff --git a/src/components/popup/popup-drawer.less b/src/components/popup/popup-drawer.less
index ccc10a9..142670a 100644
--- a/src/components/popup/popup-drawer.less
+++ b/src/components/popup/popup-drawer.less
@@ -1,4 +1,4 @@
-.common-popup-btn {
+.drawer-popup-btn {
   width: 690rpx;
   height: 90rpx;
   line-height: 90rpx;
diff --git a/src/components/popup/popup-drawer.tsx b/src/components/popup/popup-drawer.tsx
index e5d785c..d9bcc6d 100644
--- a/src/components/popup/popup-drawer.tsx
+++ b/src/components/popup/popup-drawer.tsx
@@ -96,7 +96,7 @@ export default class PopupDrawer extends Component<any, any> {
               </View>
             </View>
             <View className="common-popup-btns">
-              <Button className="common-popup-btn" onClick={this.onConfirm}>
+              <Button className="drawer-popup-btn" onClick={this.onConfirm}>
                 {confirmButtonText}
               </Button>
             </View>
diff --git a/src/pages/user/user.tsx b/src/pages/user/user.tsx
index 9064e6f..733de2c 100644
--- a/src/pages/user/user.tsx
+++ b/src/pages/user/user.tsx
@@ -41,6 +41,7 @@ class User extends Component<any, any> {
       isNotRegister: false, // 是否未注册
       isShowCustomerService: false, // 反馈留言
       messageInfo: "", // 用户留言
+      isDev: false,
     };
   }
 
@@ -87,10 +88,14 @@ class User extends Component<any, any> {
     });
   };
   gourls = (e) => {
+    let registerArray = ["/pages/message/message"];
     let url = e.currentTarget.dataset.url;
     let mobile = Taro.getStorageSync("mobile");
-    if (url === "/pages/register/register" && mobile) {
-      url = "/pages/userInfoDetail/userInfoDetail";
+    if (!mobile) {
+      if (registerArray.includes(url)) {
+        this.setState({ isNotRegister: true });
+        return;
+      }
     }
     Taro.navigateTo({
       url,
@@ -110,8 +115,11 @@ class User extends Component<any, any> {
   }
 
   showCustomerService = () => {
-    let { messageInfo } = this.state;
-    console.log("messageInfo", messageInfo);
+    let mobile = Taro.getStorageSync("mobile");
+    if (!mobile) {
+      this.setState({ isNotRegister: true });
+      return;
+    }
     this.setState({ isShowCustomerService: true });
   };
 
@@ -138,6 +146,9 @@ class User extends Component<any, any> {
   onInputTextarea = (e) => {
     this.setState({ messageInfo: e.detail.value });
   };
+  closeDev = () => {
+    this.setState({ isDev: false });
+  };
 
   render() {
     let {
@@ -147,10 +158,30 @@ class User extends Component<any, any> {
       messagecount,
       isNotRegister,
       isShowCustomerService,
+      isDev,
     } = this.state;
 
     return (
       <Block>
+        <PopupAlert
+          isShow={isDev}
+          title="提示"
+          content="页面正在开发中"
+          confirmButtonText="确定"
+          textAlgin="center"
+          close={this.closeDev}
+          confirm={this.closeDev}
+        />
+        <PopupAlert
+          isShow={isNotRegister}
+          title="提示"
+          content="暂未授权注册，请点击注册"
+          confirmButtonText="确定"
+          textAlgin="center"
+          type="1"
+          close={this.closeRegisterAlert}
+          confirm={this.closeRegisterAlert}
+        />
         <Navbar transparent={true}></Navbar>
         <View className="user_bg_card">
           <Image
@@ -203,7 +234,9 @@ class User extends Component<any, any> {
               <View
                 className="block"
                 data-url="/pages/instrument_manage/instrument_manage?isback=1"
-                onClick={this.gourl}
+                onClick={() => {
+                  this.setState({ isDev: true });
+                }}
               >
                 <Image
                   className="bg_img"
@@ -268,7 +301,7 @@ class User extends Component<any, any> {
               </View>
               <View
                 className="block flex aitems"
-                onClick={this.gourl}
+                onClick={this.gourls}
                 data-url="/pages/integral_list/integral_list"
               >
                 <View className="img">
@@ -335,17 +368,6 @@ class User extends Component<any, any> {
           </View>
         </View>
 
-        <PopupAlert
-          isShow={isNotRegister}
-          title="提示"
-          content="暂未授权注册，请点击注册"
-          confirmButtonText="确定"
-          textAlgin="center"
-          type="1"
-          close={this.closeRegisterAlert}
-          confirm={this.closeRegisterAlert}
-        />
-
         <PopupDrawer
           isShow={isShowCustomerService}
           isClose={true}
diff --git a/src/store/features/userInfo.js b/src/store/features/userInfo.js
index 43dd7c1..6125436 100644
--- a/src/store/features/userInfo.js
+++ b/src/store/features/userInfo.js
@@ -50,7 +50,7 @@ const userInfoReducer = createSlice({
       state.integralText = payload.integralText || "";
 
       Taro.setStorageSync("mobile", state.mobile);
-      Taro.setStorageSync("token", state.token);
+      // Taro.setStorageSync("token", state.token);
     },
   },
 });
diff --git a/src/utils/Interface.js b/src/utils/Interface.js
index fa4428e..767b8f7 100644
--- a/src/utils/Interface.js
+++ b/src/utils/Interface.js
@@ -178,6 +178,32 @@ export const GetCloseOfficialAccount = (data) => {
     method: "get",
   });
 };
+
+export const GetSitePopupList = (data) => {
+  // 站点管理-弹窗列表
+  return Ajax({
+    url: "/hzwx/siteInfo/popup/" + data,
+    data,
+    method: "get",
+  });
+};
+export const GetSiteCarousel = (data) => {
+  // 站点管理-轮播图
+  return Ajax({
+    url: "/hzwx/siteInfo/carousel",
+    data,
+    method: "get",
+  });
+};
+export const GetSiteAddTag = (data) => {
+  // 站点管理-轮播图-添加标签
+  return Ajax({
+    url: "/hzwx/addTag/" + data,
+    data,
+    method: "get",
+  });
+};
+
 ///////////
 ///////////
 
diff --git a/src/utils/request.js b/src/utils/request.js
index 2b83ccd..a8763b6 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -1,6 +1,5 @@
 import { back, showModal } from "./traoAPI";
 import { WCUserLogin } from "./Interface";
-// import { getGlobalData, setGlobalData } from "./global";
 import Taro from "@tarojs/taro";
 
 import formdata from "./wxFormdata/formData";