控制分享返回按钮&鱼市通知页面

project.private.config.json

@@ -10,6 +10,20 @@
     "miniprogram": {
       "list": [
         {
+          "name": "pages/mineSub/inform/index",
+          "pathName": "pages/mineSub/inform/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
+          "name": "pages/indexSub/activity/index",
+          "pathName": "pages/indexSub/activity/index",
+          "query": "isShare=true",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
           "name": "pages/mineSub/explain/index",
           "pathName": "pages/mineSub/explain/index",
           "query": "",
@@ -52,13 +66,6 @@
           "scene": null
         },
         {
-          "name": "pages/indexSub/activity/index",
-          "pathName": "pages/indexSub/activity/index",
-          "query": "",
-          "launchMode": "default",
-          "scene": null
-        },
-        {
           "name": "pages/indexSub/seckillIndex/index",
           "pathName": "pages/indexSub/seckillIndex/index",
           "query": "id=124&title=%E8%82%AF%E9%BA%A6%E5%BF%85%E6%BD%AE%E8%B6%B4&isBanner=true",

src/app.config.js

@@ -39,7 +39,8 @@ export default defineAppConfig({
       pages: [
         "infoEdit/index",
         "userSpecification/index",
-        "explain/index"
+        "explain/index",
+        "inform/index"
       ]
     },
     {

src/pages/indexSub/activity/index.jsx

@@ -3,6 +3,7 @@ import { View, Image, Text, ScrollView } from "@tarojs/components";
 import { AtTabs, AtActivityIndicator } from "taro-ui";
 import "./index.less";
 import Taro from "@tarojs/taro";
+import { getShareSwitch } from "../../../service";
 import {
   getNewYearTab,
   getNewYearProductList,
@@ -17,6 +18,7 @@ export default class Index extends Component {
     tabList: [], //tab列表
     productList: [], //商品列表
     isShare: false, // 是否是分享跳转
+    shareSwitch: 1, //分享返回开关
     isShowBack: false, // 是否显示返回按钮
   };
   componentDidMount() {
@@ -29,8 +31,8 @@ export default class Index extends Component {
         shareUserId: shareUserId || "",
       },
       () => {
-        if (isShare) {
-          Taro.hideHomeButton(); //隐藏返回首页
+        if (this.state.isShare) {
+          this.getShareSwitch(); //获取分享开关
         }
         this.getTab(); //获取tab
         handleLog({
@@ -45,6 +47,15 @@ export default class Index extends Component {
       }
     );
   }
+  // 获取分享开关
+  getShareSwitch = async () => {
+    const res = await getShareSwitch({
+      key: "share_switch",
+    });
+    this.setState({
+      shareSwitch: Number(res.value),
+    });
+  };
   // 获取tab
   getTab = async () => {
     const res = await getNewYearTab();
@@ -77,7 +88,14 @@ export default class Index extends Component {
   };
   // 返回
   handleBack = () => {
-    Taro.navigateBack();
+    const pages = Taro.getCurrentPages();
+    if (pages.length > 1) {
+      Taro.navigateBack();
+    } else {
+      Taro.switchTab({
+        url: "/pages/index/index",
+      });
+    }
   };
   // 专场点击
   siteClick = (title, index) => {
@@ -134,7 +152,7 @@ export default class Index extends Component {
     return (
       <View className="index">
         {/* 返回按钮 */}
-        {!this.state.isShare && (
+        {this.state.shareSwitch == 1 && (
           <Image
             onClick={this.handleBack}
             style={{ top: Taro.navigationBarHeight + "px" }}

src/pages/indexSub/productDetail/index.jsx

@@ -7,6 +7,7 @@ import {
   getProductPromotion,
   getShareJump,
   bindShareJump,
+  getShareSwitch,
 } from "../../../service";
 import { handleLog } from "../../../common/track";
 import { isDebounce } from "../../../common/debounce";
@@ -35,6 +36,7 @@ export default class Index extends Component {
     shareTitle: "", //分享标题
     shareUserId: "", //分享用户id
     isShowBack: false, //是否显示返回
+    shareSwitch: 1, //分享返回开关
   };
   // 获取产品详情的方法
   fetchProductDetails = async (id) => {
@@ -57,7 +59,7 @@ export default class Index extends Component {
     const res = await getProductPromotion({
       goods_id: [this.state.id],
       item_id: [this.state.productDetail.item_id],
-      material_type:1,//1:自购省,2:红包购买
+      material_type: 1, //1:自购省,2:红包购买
     });
     this.setState({
       productPromotion:
@@ -78,9 +80,9 @@ export default class Index extends Component {
       tagTitle,
       shareType,
       isShowBack,
-      share_unique_value
+      share_unique_value,
     } = Taro.getCurrentInstance().router.params;
-    shareJump = shareJump || share_unique_value
+    shareJump = shareJump || share_unique_value;
     let session_key = Taro.getStorageSync("session_key");
     let userInfo = Taro.getStorageSync("userInfo");
     let isShowSign = Taro.getStorageSync("isShowSign");
@@ -94,6 +96,11 @@ export default class Index extends Component {
         isShowBack: isShowBack === "true" || false,
       },
       () => {
+        // 分享页面才判断是否展示
+        if (this.state.isShare) {
+          // 获取分享开关
+          this.getShareSwitch();
+        }
         // 获取分享跳转标识
         shareJump &&
           Taro.setStorage({
@@ -134,6 +141,15 @@ export default class Index extends Component {
       }
     );
   }
+  // 获取分享开关
+  getShareSwitch = async () => {
+    const res = await getShareSwitch({
+      key: "share_switch",
+    });
+    this.setState({
+      shareSwitch: Number(res.value),
+    });
+  };
   // 复制商品编号
   handleCopy = (text) => {
     Taro.setClipboardData({
@@ -239,7 +255,7 @@ export default class Index extends Component {
         className="index"
         style={{ paddingTop: Taro.navigationBarHeight + "px" }}
       >
-        {!this.state.isShare && (
+        {this.state.shareSwitch == 1 && (
           <View className="back-btn" onClick={this.handleBack}>
             <AtIcon value="chevron-left" size="24" color="#999999"></AtIcon>
           </View>

src/pages/indexSub/seckillIndex/index.jsx

@@ -8,6 +8,7 @@ import {
   getShareJump,
   bindShareJump,
   getFishMarketTags,
+  getShareSwitch,
 } from "../../../service";
 import { handleLog } from "../../../common/track";
 import { getShareContent } from "../../../common/share";
@@ -30,6 +31,7 @@ export default class Index extends Component {
     current: 0, // 当前选中的tab索引
     tabList: [], // 标签列表
     isTabFixed: false, // 添加新的状态来控制tab是否固定
+    shareSwitch: 1, //分享返回开关
   };
   componentDidMount() {
     const {
@@ -60,7 +62,7 @@ export default class Index extends Component {
           title: this.state.title || "鱼市",
         });
         if (isShare) {
-          Taro.hideHomeButton(); //隐藏返回首页
+          this.getShareSwitch(); //获取分享开关
         }
         handleLog({
           event_type: isDirect
@@ -98,6 +100,18 @@ export default class Index extends Component {
       }
     );
   }
+  // 获取分享开关
+  getShareSwitch = async () => {
+    const res = await getShareSwitch({
+      key: "share_switch",
+    });
+    if (res.value == 0) {
+      Taro.hideHomeButton(); //隐藏返回首页
+    }
+    this.setState({
+      shareSwitch: Number(res.value),
+    });
+  };
   // 获取标签
   getFishMarketTags = async () => {
     let res = await getFishMarketTags({

src/pages/memberSub/storeManagement/index.jsx

@@ -9,6 +9,7 @@ import {
   getShareShopProductList,
   getShareJump,
   bindShareJump,
+  getShareSwitch,
 } from "../../../service";
 import storeManagement from "../../../images/storeManagement/storeManagement.png";
 import storeManagementIcon from "../../../images/storeManagement/storeManagementIcon.png";
@@ -27,6 +28,7 @@ export default class Index extends Component {
     shopId: "", // 店铺id
     isNoMore: false, // 是否没有更多
     isShowBack: false, // 是否显示返回
+    shareSwitch: 1, //分享返回开关
   };
   // 获取店铺详情
   getMyShopDetail = async () => {
@@ -82,8 +84,7 @@ export default class Index extends Component {
         this.getMyShopDetail(); //获取店铺详情
         this.getMyShopList(true); //获取店铺数据
         if (isShare) {
-          // 分享隐藏返回首页
-          Taro.hideHomeButton();
+          this.getShareSwitch(); //获取分享开关
         }
         // 获取分享跳转标识
         shareJump &&
@@ -102,6 +103,18 @@ export default class Index extends Component {
       }
     );
   }
+  // 获取分享开关
+  getShareSwitch = async () => {
+    const res = await getShareSwitch({
+      key: "share_switch",
+    });
+    if (res.value == 0) {
+      Taro.hideHomeButton();
+    }
+    this.setState({
+      shareSwitch: Number(res.value),
+    });
+  };
   // 绑定分享跳转标识
   bindShareJump = async () => {
     let shareJump = Taro.getStorageSync("shareJump");

src/pages/mineSub/inform/index.config.js

@@ -0,0 +1,3 @@
+export default definePageConfig({
+  navigationBarTitleText: '通知'
+})

src/pages/mineSub/inform/index.jsx

@@ -0,0 +1,30 @@
+import { Component } from 'react'
+import { View, RichText } from '@tarojs/components'
+import './index.less'
+import { getUserAgreement } from '../../../service'
+export default class Index extends Component {
+  state = {
+    agreement: ''
+  }
+  componentDidMount () { 
+    this.getUserAgreement()
+  }
+  // 获取用户协议
+  getUserAgreement = async () => {
+    const res = await getUserAgreement({
+      type:5
+    })
+    // 替换图片样式
+    res.content = res.content.replace(/<img/g, '<img style="max-width: 100%; width: 100%; height: auto; display: block; margin: 0 auto;"')
+    this.setState({
+      agreement: res.content
+    })
+  }
+  render () {
+    return (
+      <View className='index'>
+        {this.state.agreement && <RichText nodes={this.state.agreement} />}
+      </View>
+    )
+  }
+}

src/pages/mineSub/inform/index.less

@@ -0,0 +1,6 @@
+.index {
+  padding: 20rpx;
+  background-color: #f5f5f5;
+  min-height: 100vh;
+  box-sizing: border-box;
+}

src/service/index.js

@@ -229,7 +229,14 @@ export const addLog = data =>
     method: 'POST',
     data,
   })
-
+// ----------------------------------------字典
+// 分享开关接口（0关闭，1打开）
+export const getShareSwitch = data =>
+  Request({
+    url: '/user/get_app_dict_list',
+    method: 'POST',
+    data,
+  })