样式修改，首次进入小程序逻辑修改

src/app.tsx

@@ -26,8 +26,9 @@ class App extends Component<PropsWithChildren> {
     // Taro.switchTab({
     //   url: "pages/index/index",
     // });
+    // go("/pages/initiate/initiate"); // 介绍页
     // go("/pages/entry/entry"); // 介绍页
-    // go("/pages/userInfo/userInfo");
+    // go("/pages/userInfo/userInfo"); // 个人信息完善
     // go("/pages/register/register");
     // go("/pages/instrument/instrument");
   }

src/components/calendar/body/index.tsx

@@ -434,7 +434,7 @@ export default class AtCalendarBody extends React.Component<any, any> {
               className={classnames("arrow", {
                 "arrow-rotate": isFolding,
               })}
-              src={require("../../../img/index/arrow-down.png")}
+              src={require("../img/arrow-down.png")}
               mode="aspectFill"
             />
           </View>
@@ -531,7 +531,7 @@ export default class AtCalendarBody extends React.Component<any, any> {
             className={classnames("arrow", {
               "arrow-rotate": isFolding,
             })}
-            src={require("../../../img/index/arrow-down.png")}
+            src={require("../img/arrow-down.png")}
             mode="aspectFill"
           />
         </View>

src/components/calendar/body/isFolding.less

@@ -35,6 +35,14 @@
   }
 }
 
+// .at-calendar__list.flex .flex__item--selected {
+//   .flex__item-container {
+//     position: relative;
+//     background: linear-gradient(0deg, #fff0da, #ffe4c0);
+//     border-radius: 50%;
+//   }
+// }
+
 .at-calendar__list.flex .flex__item--complete {
   color: #333 !important;
   font-weight: 400 !important;

src/pages/about/about.less

@@ -2,15 +2,37 @@ page {
   background: #f3f3f3;
 }
 
-.cell {
+.about-box {
-  border-bottom: 1px solid #f3f3f3;
+  width: 690rpx;
-  background: #fff;
+  height: 270rpx;
-  padding: 30rpx;
+  background: #ffffff;
-  font-size: 28rpx;
+  border-radius: 30rpx;
-}
+  margin: 33rpx auto;
-.cell .label {
+  // padding: 20rpx 0;
-  color: #323232;
+  box-sizing: border-box;
-}
+  overflow: hidden;
-.cell .value {
+  .cell {
-  color: #a19fa2;
+    border-bottom: 1px solid #f3f3f3;
+    background: #fff;
+    padding: 20rpx 30rpx;
+    font-size: 28rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: #000000;
+    .label {
+      color: #000000;
+    }
+    .value {
+      color: #000000;
+    }
+  }
+
+  .version {
+    // height: 26rpx;
+    font-size: 28rpx;
+    font-family: PingFang SC;
+    font-weight: 500;
+    color: #000000;
+    // line-height: 60rpx;
+  }
 }

src/pages/about/about.tsx

@@ -1,11 +1,13 @@
 import { Component, PropsWithChildren, useEffect, useState } from "react";
 import Taro from "@tarojs/taro";
-import { Block, View, Text } from "@tarojs/components";
+import { Block, View, Image, Text } from "@tarojs/components";
 
 import Navbar from "../../components/navbar/navbar";
 
 import { GetAboutUs } from "../../utils/Interface";
 
+import { go } from "../../utils/traoAPI";
+
 import "./about.less";
 
 export default class About extends Component<any, any> {
@@ -34,20 +36,49 @@ export default class About extends Component<any, any> {
     //   this.setState({ version: res.data.data.value });
     // }
     const accountInfo = Taro.getAccountInfoSync();
-    this.setState({
+
-      version: accountInfo?.miniProgram?.version || "开发版",
+    let version = accountInfo?.miniProgram?.version
-      // accountInfo?.miniProgram?.envVersion,
+      ? "当前版本V" + accountInfo?.miniProgram?.version
-    });
+      : "开发版";
+    this.setState({ version: version });
   }
 
+  goUser = () => {
+    go("/pages/userPolicy/userPolicy");
+  };
+
+  goPrivacy = () => {
+    go("/pages/privacyPolicy/privacyPolicy");
+  };
+
   render() {
     let { version } = this.state;
     return (
       <Block>
         <Navbar titleSlot="更多设置" isBack={true} />
-        <View className="cell flex aitems sb" style="margin-top:20rpx;">
+        <View className="about-box">
-          <View className="label">版本管理</View>
+          <View className="cell flex aitems sb" style="margin-top:20rpx;">
-          <View className="value">{version}</View>
+            <View className="label">版本管理</View>
+            <View className="value version">{version}</View>
+          </View>
+          <View className="cell flex aitems sb" onClick={this.goUser}>
+            <View className="label">用户协议</View>
+            <View className="value">
+              <Image
+                src={require("../../img/index/right.png")}
+                style="width: 20rpx;height:20rpx"
+              />
+            </View>
+          </View>
+          <View className="cell flex aitems sb" onClick={this.goPrivacy}>
+            <View className="label">隐私协议</View>
+            <View className="value">
+              <Image
+                src={require("../../img/index/right.png")}
+                style="width: 20rpx;height:20rpx"
+              />
+            </View>
+          </View>
         </View>
       </Block>
     );

src/pages/activity/activity.less

@@ -0,0 +1,8 @@
+.main {
+  display: flex;
+  width: 100vw;
+  height: 100vh;
+  justify-content: center;
+  align-items: center;
+  font-size: 30rpx;
+}

src/pages/activity/activity.tsx

@@ -9,13 +9,12 @@ import {
   Video,
   Swiper,
   SwiperItem,
+  Block,
 } from "@tarojs/components";
 
 import "taro-ui/dist/style/components/button.scss"; // 按需引入
 import "./activity.less";
 
-const app = Taro.getApp();
-
 import type CustomTabBar from "../../custom-tab-bar";
 export default class Activity extends Component<any, any> {
   pageCtx = Taro.getCurrentInstance().page;
@@ -42,6 +41,11 @@ export default class Activity extends Component<any, any> {
 
   render() {
     let { name } = this.state;
-    return <View>{name}</View>;
+    return (
+      <Block>
+        <View>{name}</View>
+        <View className="main">待开发</View>
+      </Block>
+    );
   }
 }

src/pages/detect/detect.less

@@ -0,0 +1,8 @@
+.main {
+  display: flex;
+  width: 100vw;
+  height: 100vh;
+  justify-content: center;
+  align-items: center;
+  font-size: 30rpx;
+}

src/pages/detect/detect.tsx

@@ -3,6 +3,7 @@ import { Component, PropsWithChildren, useEffect, useState } from "react";
 import Taro from "@tarojs/taro";
 // 引入 Swiper, SwiperItem 组件
 import {
+  Block,
   View,
   Text,
   Image,
@@ -40,6 +41,11 @@ export default class Detect extends Component<any, any> {
 
   render() {
     let { name } = this.state;
-    return <View>{name}</View>;
+    return (
+      <Block>
+        <View>{name}</View>
+        <View className="main">待开发</View>
+      </Block>
+    );
   }
 }

src/pages/entry/entry.tsx

@@ -13,15 +13,20 @@ import {
   SwiperItem,
 } from "@tarojs/components";
 
+/*** redux ***/
+import { connect } from "react-redux";
+import { userRefresh } from "../../store/features/userInfo";
+/*** redux end ***/
+
 import Navbar from "../../components/navbar/navbar";
 
 import "taro-ui/dist/style/components/button.scss"; // 按需引入
 import "./entry.less";
 import "./Animista.less";
 import "./fade.css";
-import { go } from "../../utils/traoAPI";
+import { go, msg } from "../../utils/traoAPI";
 
-export default class Entry extends Component<any, any> {
+class Entry extends Component<any, any> {
   constructor(props) {
     super(props);
     this.state = {
@@ -40,7 +45,7 @@ export default class Entry extends Component<any, any> {
   async onLoad() {
     this.setStatusBar();
 
-    this.intData();
+    this.initData();
   }
   componentDidMount() {}
 
@@ -73,12 +78,18 @@ export default class Entry extends Component<any, any> {
     });
   }
 
-  async intData() {
+  async initData() {
     let MpSplashDetail_type1 =
       Taro.getStorageSync("MpSplashDetail_type1") || undefined;
     if (MpSplashDetail_type1) {
       let detail = JSON.parse(MpSplashDetail_type1);
       let list = detail.filter((item: any) => item.fileSuffix === "images");
+      if (list.length === 0) {
+        Taro.reLaunch({
+          url: "/pages/index/index",
+        });
+        return;
+      }
       let welcomeList = list.map((item) => {
         return {
           image: item.filePath,
@@ -88,7 +99,9 @@ export default class Entry extends Component<any, any> {
       });
       this.setState({ welcomeList });
     } else {
-      go("/pages/index/index");
+      Taro.reLaunch({
+        url: "/pages/index/index",
+      });
     }
   }
 
@@ -115,7 +128,10 @@ export default class Entry extends Component<any, any> {
     }
   }
   toHomePage() {
-    Taro.switchTab({
+    // Taro.switchTab({
+    //   url: "/pages/index/index",
+    // });
+    Taro.reLaunch({
       url: "/pages/index/index",
     });
   }
@@ -209,25 +225,18 @@ export default class Entry extends Component<any, any> {
               );
             })}
           </Swiper>
-          {/* <View className="footer flex aitems jcenter">
-            <View className="btn" onClick={this.toHomePage.bind(this)}>
-              前往主页
-            </View>
-            <View className="indicator">
-              {welcomeList.map((item, index) => {
-                return (
-                  <View
-                    key={"indicator_" + index}
-                    className={classnames("dot", {
-                      "bg-show": current >= index,
-                    })}
-                  ></View>
-                );
-              })}
-            </View>
-          </View> */}
         </View>
       </Block>
     );
   }
 }
+
+const mapStateToProps = (state) => ({
+  mobile: state.userInfo.mobile,
+});
+const mapDispatchToProps = (dispatch) => ({
+  userRefresh(value) {
+    dispatch(userRefresh(value));
+  },
+});
+export default connect(mapStateToProps, mapDispatchToProps)(Entry);

src/pages/index/index.less

@@ -993,10 +993,11 @@ page {
   background-color: #fff;
   .date-title {
     position: absolute;
-    right: 0;
+    right: 16rpx;
-    width: 140rpx;
+    width: 132rpx;
     display: flex;
     align-items: center;
+    justify-content: space-between;
     height: 40rpx;
     .text {
       color: #666;

src/pages/index/index.tsx

@@ -70,8 +70,17 @@ class Index extends Component<any, any> {
       weekinfo: undefined,
       // 日历
       currentDate: dayjs().format("YYYY-MM-DD"),
-      calendarComplete: [dayjs().subtract(1, "day").format("YYYY-MM-DD")],
+      calendarComplete: [
-      calendarInComplete: [dayjs().add(1, "day").format("YYYY-MM-DD")],
+        dayjs().subtract(1, "day").format("YYYY-MM-DD"),
+        dayjs().subtract(3, "day").format("YYYY-MM-DD"),
+      ],
+      calendarInComplete: [
+        dayjs().add(1, "day").format("YYYY-MM-DD"),
+        dayjs().add(3, "day").format("YYYY-MM-DD"),
+      ],
+      // currentDate: "2023-06-23",
+      // calendarComplete: ["2023-06-16", "2023-06-19", "2023-06-21"],
+      // calendarInComplete: ["2023-06-25", "2023-06-27"],
       // 横幅轮播
       bannerList: [],
       bannerCurrent: 0,
@@ -138,6 +147,11 @@ class Index extends Component<any, any> {
         this.GetSitePopupList();
         // 全局内存缓存，仅初次进入首页运行
         this.props.setIndexFlag(true);
+        // 小程序切到后台，则清除弹窗缓存
+        Taro.onAppHide((res) => {
+          console.log("小程序进入后台：", res);
+          this.props.setIndexFlag(false);
+        });
       }
     }
   }
@@ -366,7 +380,11 @@ class Index extends Component<any, any> {
         <View className="index">
           <View className="date-title" onClick={this.toNursingRecords}>
             <Text className="text">护理记录</Text>
-            <View className="at-icon at-icon-chevron-right"></View>
+            <Image
+              src={require("../../img/index/right.png")}
+              style="width: 20rpx;height: 20rpx;"
+            ></Image>
+            {/* <View className="at-icon at-icon-chevron-right"></View> */}
           </View>
           <View className="bg-while">
             <AtCalendar

src/pages/initiate/initiate.tsx

@@ -12,6 +12,8 @@ import {
   SwiperItem,
 } from "@tarojs/components";
 
+import Navbar from "../../components/navbar/navbar";
+
 /*** redux ***/
 import { connect } from "react-redux";
 import { userRefresh } from "../../store/features/userInfo";
@@ -64,20 +66,39 @@ class Initiate extends Component<any, any> {
   componentDidHide() {}
 
   async initData() {
+    Taro.showLoading({
+      title: "请求中...",
+      mask: true,
+    });
     const { data } = await MpSplashDetail({
       pageNum: 1,
       pageSize: 5,
       type: 1,
     });
+    Taro.hideLoading();
     if (data.code === 200) {
       let url = "";
       if (data.rows.length) {
         Taro.setStorageSync("MpSplashDetail_type1", JSON.stringify(data.rows));
+        // 1.判断是否设置登录页视频，有则正常显示视频
         let bgObj = data.rows.find((item: any) => item.fileSuffix === "video");
         if (bgObj) {
           url = bgObj.filePath;
-          console.log("url", url);
           this.setState({ url });
+        } else {
+          // 1-2.判断是否设置介绍页图片，有则跳转介绍登录页
+          let imgList = data.rows.filter(
+            (item: any) => item.fileSuffix === "images"
+          );
+          if (imgList.length > 0) {
+            go("/pages/entry/entry");
+            return;
+          } else {
+            // 1-3.如果介绍页图片也没有，直接跳转首页
+            Taro.reLaunch({
+              url: "/pages/index/index",
+            });
+          }
         }
       } else {
         Taro.reLaunch({
@@ -85,20 +106,15 @@ class Initiate extends Component<any, any> {
         });
       }
     } else {
-      // msg("获取首页视频失败！");
+      msg("请求失败，请联系管理员");
-    }
-  }
-
-  setBg() {
-    let bgData = Taro.getStorageSync("MpSplashDetail_type1");
-    bgData = JSON.parse(bgData);
-    let bgObj = bgData.find((item: any) => item.fileSuffix === "video");
-    if (bgObj) {
-      this.setState({ url: bgObj.filePath });
     }
   }
 
   async WCUserLogin() {
+    Taro.showLoading({
+      title: "请求中...",
+      mask: true,
+    });
     const { code } = await Taro.login();
     const { data } = await WCUserLogin({ code });
     if (data.code === 200) {
@@ -106,10 +122,12 @@ class Initiate extends Component<any, any> {
       Taro.setStorageSync("token", data.data.token);
       Taro.setStorageSync("mobile", data.data.mobile);
       this.props.userRefresh(data.data);
+      Taro.hideLoading();
 
       this.initData();
     } else {
-      msg("登录失败！");
+      msg("请求失败,尝试重新请求");
+      this.WCUserLogin();
     }
   }
 
@@ -125,18 +143,23 @@ class Initiate extends Component<any, any> {
     }
   }
   onEnded = () => {
-    let timeOut: any = null;
+    let token = Taro.getStorageSync("token");
-    clearTimeout(timeOut);
+    if (token) {
-    timeOut = setTimeout(() => {
+      let timeOut: any = null;
-      go("/pages/entry/entry");
+      clearTimeout(timeOut);
-    }, 300);
+      timeOut = setTimeout(() => {
+        go("/pages/entry/entry");
+      }, 300);
+    } else {
+      msg("请求中，请稍候");
+    }
   };
 
   render() {
     let { menu, url } = this.state;
     return (
       <Block>
-        <View
+        {/* <View
           className="logo"
           style={{
             top: (menu?.top != undefined ? menu?.top : 44) + "px",
@@ -148,8 +171,8 @@ class Initiate extends Component<any, any> {
             src={require("../../img/welcome/top-logo.png")}
             mode="widthFix"
           />
-        </View>
+        </View> */}
-
+        <Navbar transparent={true}></Navbar>
         <View
           className="main"
           onTouchStart={this.touchstart.bind(this)}

src/pages/integral_list/integral_list.less

@@ -73,12 +73,17 @@ page {
 }
 
 .integral_box2 {
+  height: calc(100vh - 400rpx);
   .nodata {
-    width: 160rpx;
+    width: 200rpx;
-    height: 160rpx;
+    height: 300rpx;
     margin: 0 auto;
     margin-top: 310rpx;
+    text-align: center;
     .nodata_img {
+      display: inline-block;
+      width: 160rpx;
+      height: 160rpx;
       margin-bottom: 34rpx;
     }
   }

src/pages/integral_list/integral_list.tsx

@@ -446,7 +446,7 @@ class IntegralList extends Component<any, any> {
                       src={require("../../img/user/points.png")}
                       mode="aspectFill"
                     ></Image>
-                    <View>暂无积分记录</View>
+                    <View style="color:#666">暂无积分记录</View>
                   </View>
                 )}
                 {list.map((item: any, key: number) => {

src/pages/shop/shop.tsx

@@ -72,7 +72,12 @@ class Shop extends Component<any, any> {
 
   // 获取小程序设置
   GetOtherSetting = async () => {
+    Taro.showLoading({
+      title: "请求中...",
+      mask: true,
+    });
     let res = await GetOtherSetting();
+    Taro.hideLoading();
     if (res.data.code === 200) {
       this.props.otherSettingRefresh(res.data.data);
 

src/pages/user/user.tsx

@@ -12,7 +12,7 @@ import { connect } from "react-redux";
 import { userRefresh } from "../../store/features/userInfo";
 /*** redux end ***/
 
-import { RefreshWxUserInfo } from "../../utils/Interface";
+import { RefreshWxUserInfo, GetNoReadMessageNum } from "../../utils/Interface";
 
 import "taro-ui/dist/style/components/button.scss"; // 按需引入
 import "./user.less";
@@ -47,16 +47,19 @@ class User extends Component<any, any> {
     };
   }
 
-  async onLoad() {}
+  async onLoad() {
-  componentDidMount() {
     this.initData();
   }
+  componentDidMount() {}
 
   componentWillUnmount() {}
 
   componentDidShow() {
     this.setState({ userInfo: this.props.userInfo });
 
+    let messagecount = Taro.getStorageSync("messageCount");
+    this.setState({ messagecount: messagecount });
+
     const tabbar = Taro.getTabBar<CustomTabBar>(this.pageCtx);
     tabbar?.setSelected(4);
   }
@@ -65,8 +68,18 @@ class User extends Component<any, any> {
 
   async initData() {
     this.RefreshWxUserInfo();
+    this.GetNoReadMessageNum();
   }
 
+  // 获取消息数量
+  GetNoReadMessageNum = async () => {
+    let res = await GetNoReadMessageNum();
+    if (res.data.code === 200) {
+      Taro.setStorageSync("messageCount", res.data.data);
+      this.setState({ messagecount: res.data.data });
+    }
+  };
+
   // 刷新用户信息
   RefreshWxUserInfo = async () => {
     let res = await RefreshWxUserInfo();

src/pages/userInfo/userInfo.css

@@ -1,139 +0,0 @@
-/* pages/userInfo/userInfo.wxss */
-page {
-  background: #f3f3f3;
-}
-.nav {
-  position: fixed;
-  z-index: 99;
-  width: 100%;
-  top: 0;
-}
-.nav .logo {
-  width: 223rpx;
-}
-.nav .nav_box {
-  position: relative;
-  display: flex;
-  align-items: center;
-  justify-content: center;
-  padding: 0 32rpx;
-}
-.main {
-  text-align: center;
-  padding-bottom: 153rpx;
-}
-.main .title {
-  font-size: 48rpx;
-  font-weight: 500;
-  color: #000;
-  margin: 73rpx auto 48rpx;
-}
-.main .txt {
-  font-size: 26rpx;
-  font-weight: 500;
-  color: #666;
-  margin-bottom: 10rpx;
-}
-.main .avatar_box {
-  position: relative;
-  width: max-content;
-  margin: 78rpx auto 59rpx;
-}
-.main .avatar_box .avatar {
-  width: 147rpx;
-  height: 147rpx;
-  border-radius: 50%;
-  margin: 0 auto 13rpx;
-}
-.main .avatar_box .btn_avatar {
-  background: transparent;
-}
-/* 去掉背景色和内外边距 */
-button {
-  margin: 0;
-  padding: 0;
-  background-color: inherit;
-  position: static;
-}
-button:after {
-  content: none;
-}
-/* 去掉边框 */
-button::after {
-  border: none;
-}
-.main .avatar_box .btn_avatar::after {
-  border: none;
-  background: transparent;
-}
-.form {
-  width: 690rpx;
-  text-align: left;
-  margin: 0 30rpx 0;
-}
-.form .form_item {
-  position: relative;
-  margin-bottom: 35rpx;
-}
-.form_item .arrow {
-  position: absolute;
-  bottom: 30rpx;
-  right: 51rpx;
-  width: 30rpx;
-  height: 20rpx;
-}
-.form .form_item .label {
-  font-size: 28rpx;
-  font-weight: 500;
-  color: #030000;
-  margin-bottom: 28rpx;
-}
-.form .form_item .label::after {
-  content: "*";
-  color: #eb5858;
-  margin-left: 10rpx;
-}
-.form .form_item .ipt {
-  width: 100%;
-  height: 80rpx;
-  line-height: 80rpx;
-  background: #ffffff;
-  border: 1px solid #dddddd;
-  border-radius: 3rpx;
-  padding-left: 28rpx;
-  box-sizing: border-box;
-}
-.footer {
-  position: fixed;
-  bottom: 0;
-  z-index: 99;
-  display: flex;
-  align-items: baseline;
-  width: 100%;
-  height: 153rpx;
-  background: #ffffff;
-  box-shadow: 0rpx -3rpx 7rpx 1rpx rgba(173, 191, 207, 0.21);
-}
-.btn {
-  width: 540rpx;
-  height: 90rpx;
-  background: #000;
-  border-radius: 45rpx;
-  color: #fff;
-  line-height: 90rpx;
-  text-align: center;
-  margin: 21rpx 49rpx 42rpx 30rpx;
-}
-.text {
-  font-size: 32rpx;
-  font-weight: bold;
-  color: #000;
-}
-.btn-disable {
-  background-color: #ccc !important;
-  /* 设置按钮背景颜色为灰色 */
-  color: #fff !important;
-  /* 设置按钮文字颜色为白色 */
-  border-color: #ccc !important;
-  /* 设置按钮边框颜色为灰色 */
-}

src/pages/userInfo/userInfo.less

@@ -43,7 +43,8 @@ page {
 
 .main .avatar_box {
   position: relative;
-  width: max-content;
+  // width: max-content;
+  width: 147rpx;
   margin: 78rpx auto 50rpx;
 }
 
@@ -131,6 +132,7 @@ button::after {
   height: 153rpx;
   background: #ffffff;
   box-shadow: 0rpx -3rpx 7rpx 1rpx rgba(173, 191, 207, 0.21);
+  padding-bottom: env(safe-area-inset-bottom);
 }
 
 .btn {

src/pages/userInfo/userInfo.tsx

@@ -157,7 +157,6 @@ class UserInfo extends Component<any, any> {
       let res = await UpdateUserUploadFile(formData);
       console.log("Res", res);
       if (res.code === 200) {
-        msg("更新成功");
         userInfo.province = res.data.province;
         userInfo.city = res.data.city;
         userInfo.area = res.data.area;
@@ -169,10 +168,10 @@ class UserInfo extends Component<any, any> {
         userInfo.integralText = res.data.integralText;
         this.props.userRefresh(userInfo);
         this.setState({ userInfo: userInfo });
-
         if (res.data.integralText) {
           this.setState({ isShowIntegralText: true });
         } else {
+          msg("更新成功");
           this.goUser();
         }
       }
@@ -191,7 +190,6 @@ class UserInfo extends Component<any, any> {
       let data = formData.getData();
       let res = await UpdateUser(data);
       if (res.data.code === 200) {
-        msg("更新成功");
         userInfo.province = res.data.data.province;
         userInfo.city = res.data.data.city;
         userInfo.area = res.data.data.area;
@@ -207,6 +205,7 @@ class UserInfo extends Component<any, any> {
         if (res.data.data.integralText) {
           this.setState({ isShowIntegralText: true });
         } else {
+          msg("更新成功");
           this.goUser();
         }
       }
@@ -419,7 +418,7 @@ class UserInfo extends Component<any, any> {
           close={this.closeIntegralText}
           confirm={this.closeIntegralText}
         />
-        <Navbar titleSlot="个人信息完善"></Navbar>
+        <Navbar></Navbar>
         <View className="main">
           <View className="title">个人信息</View>
           <View className="txt">请完善您的个人信息</View>

src/pages/userInfoDetail/userInfoDetail.less

@@ -29,7 +29,7 @@ button::after {
   border: none;
 }
 .infobox1 .avatar_box {
-  width: max-content;
+  width: 100rpx;
 }
 .infobox1 .avatar_box .headimg {
   width: 100rpx;
@@ -164,6 +164,7 @@ button::after {
   background: #ffffff;
   box-shadow: 0rpx -3rpx 7rpx 1rpx rgba(173, 191, 207, 0.21);
   padding-bottom: 21rpx;
+  padding-bottom: env(safe-area-inset-bottom);
   .btn {
     width: 690rpx;
     height: 90rpx;

src/pages/userPolicy/userPolicy.tsx

@@ -52,14 +52,7 @@ export default class UserPolicy extends Component<any, any> {
         <Navbar titleSlot="用户协议" isBack={true} />
 
         <View className="nodes">
-          <RichText
+          <RichText nodes={nodes} />
-            nodes={
-              nodes
-              // "<pre style=' white-space: pre-wrap;word-wrap: break-word;'>" +
-              // nodes +
-              // "</pre>"
-            }
-          />
         </View>
       </Block>
     );

src/pages/webViewPage/webViewPage.tsx

@@ -26,8 +26,11 @@ export default class WebViewPage extends Component<any, any> {
   componentDidHide() {}
 
   async initData() {
-    console.log("this.$instance.router", this.$instance.router);
+    let url = this.$instance.router?.params?.url;
-    this.setState({ url: this.$instance.router?.params?.url });
+    if (!url?.includes("https://") && !url?.includes("http://")) {
+      url = "https://" + url;
+    }
+    this.setState({ url: url });
   }
 
   render() {

src/utils/request.js

@@ -108,7 +108,7 @@ export const Ajax = (params) => {
         });
       },
       complete() {
-        Taro.hideLoading();
+        // Taro.hideLoading();
         // const requestUrlList = global_requestUrlList;
         // const newRequestUrlList = requestUrlList.splice(
         //   requestUrlList.indexOf(params.url),
@@ -262,7 +262,7 @@ export const AjaxFormData = (params) => {
         });
       },
       complete() {
-        Taro.hideLoading();
+        // Taro.hideLoading();
         const requestUrlList = global_requestUrlList;
         const newRequestUrlList = requestUrlList.splice(
           requestUrlList.indexOf(params.url),

src/utils/traoAPI.js

@@ -100,15 +100,31 @@ const jupmFun = (type, data) => {
   try {
     switch (type) {
       case 1: // 跳转内部链接
-        if (data.linkParams) {
+        let tabbar = [
-          Taro.reLaunch({
+          "/pages/index/index",
-            url: data.link + "?" + data.linkParams,
+          "/pages/activity/activity",
-          });
+          "/pages/detect/detect",
-        } else {
+          "/pages/shop/shop",
-          Taro.reLaunch({
+          "/pages/user/user",
+        ];
+        if (tabbar.includes(data.link)) {
+          // tabbar页不能带参数
+          Taro.setStorageSync(data.link + "-jupm-params", data.linkParams);
+          Taro.switchTab({
             url: data.link,
           });
+        } else {
+          if (data.linkParams) {
+            Taro.navigateTo({
+              url: data.link + "?" + data.linkParams,
+            });
+          } else {
+            Taro.navigateTo({
+              url: data.link,
+            });
+          }
         }
+
         break;
       case 3: // 跳转外部链接
         if (data.linkParams) {
@@ -140,9 +156,10 @@ const jupmFun = (type, data) => {
         });
         break;
       case 5: // 跳转视频号
+        // Taro.getChannelsLiveInfo();
         Taro.openChannelsActivity({
           finderUserName: data.videoNo,
-          feedId: data.feedId,
+          // feedId: data.feedId,
           success: (res) => {
             // 打开成功
             console.log("跳转视频号success", res);