订阅消息&&banner跳转&&捡漏计算器bug修改

project.private.config.json

@@ -10,6 +10,13 @@
     "miniprogram": {
       "list": [
         {
+          "name": "pages/member/index",
+          "pathName": "pages/member/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
           "name": "pages/calculatorSub/calculatorResult/index",
           "pathName": "pages/calculatorSub/calculatorResult/index",
           "query": "",

src/components/instructionModal/index.jsx

@@ -3,7 +3,7 @@ import "./index.less";
 
 // 签约模态框组件
 export default function instructionModal(props) {
-  const { isOpened, onClose, title, content} = props;
+  const { isOpened, onClose, title, content } = props;
   // 关闭弹窗
   const closeModal = () => {
     onClose();
@@ -14,15 +14,19 @@ export default function instructionModal(props) {
         <View className="modal-container">
           <View className="modal-mask" />
           <View className="modal-content">
-          <View className="content-box">
-            {/* 背景图 */}
-              <Image src='https://yushi.tos-cn-beijing.volces.com/member/instructionBg.png' className="instruction-bg" />
-              <View className="instruction-title">
-                {title}
-              </View>
+              {/* 背景图 */}
+              <Image
+                mode="widthFix"
+                src="https://yushi.tos-cn-beijing.volces.com/member/instructionBg.png"
+                className="instruction-bg"
+              />
+            <View className="content-box">
+              <View className="instruction-title">{title}</View>
               <View className="instruction-content">
                 <RichText nodes={content} />
               </View>
+            </View>
+            <View className="instruction-button-box">
               <View onClick={closeModal} className="instruction-button">
                 我知道了
               </View>

src/components/instructionModal/index.less

@@ -27,30 +27,36 @@
   max-width: 600px;
   z-index: 1001;
   animation: modalFadeIn 0.3s ease;
+  max-height: 90vh;
+  overflow: hidden;
+
+  // 背景图
+  .instruction-bg {
+    width: 100%;
+    height: 100%;
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: -1;
+  }
 
   .content-box {
-    min-height: 400px;
-    padding: 54px 32px 38px 32px;
+    max-height: 70vh;
+    padding: 54px 32px 148px 32px;
     display: flex;
     flex-direction: column;
     align-items: center;
-    justify-content: center;
+    justify-content: flex-start;
     position: relative;
+    overflow-y: auto;
+
 
-    // 背景图
-    .instruction-bg {
-      width: 100%;
-      height: 100%;
-      position: absolute;
-      top: 0;
-      left: 0;
-      z-index: -1;
-    }
     .instruction-title {
       font-weight: 700;
       font-size: 32px;
       color: #000000;
     }
+
     .instruction-content {
       font-size: 28px;
       color: #3D3D3D;
@@ -58,19 +64,34 @@
       margin-top: 28px;
       padding: 0 39px;
       box-sizing: border-box;
+      width: 100%;
     }
-    .instruction-button {
-      width: 272px;
-      height: 76px;
-      background: linear-gradient(270deg, #FF6E39 0%, #FF891B 100%);
-      border-radius: 121px 121px 121px 121px;
-      font-size: 30px;
-      color: #FFFFFF;
-      margin-top: 44px;
-      display: flex;
-      align-items: center;
-      justify-content: center;
-    }
+  }
+
+  .instruction-button-box {
+    position: absolute; // 绝对定位
+    bottom: 0; // 固定在底部
+    left: 0;
+    width: 100%;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 110px;
+    background: #fff;
+  }
+
+  .instruction-button {
+    width: 272px;
+    height: 76px;
+    background: linear-gradient(270deg, #FF6E39 0%, #FF891B 100%);
+    border-radius: 121px 121px 121px 121px;
+    font-size: 30px;
+    color: #FFFFFF;
+    margin-top: 44px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    margin: 0 auto;
   }
 }
 

src/pages/calculatorSub/calculator/index.jsx

@@ -37,7 +37,7 @@ export default class Index extends Component {
     return {
       title: "捡漏计算器",
       path: `/pages/calculatorSub/calculatorWish/index?isShare=true`,
-      imageUrl: '',
+      imageUrl: 'https://yushi.tos-cn-beijing.volces.com/calculator/shareImg.png',
     }
   }
   render() {

src/pages/calculatorSub/calculatorResult/index.jsx

@@ -6,18 +6,28 @@ export default class Index extends Component {
   state = {
     isSearch: 1,// 是否计算成功
     list: [],// 列表
+    wish: '',// 心愿
+    price: '',// 价格
   };
   componentDidMount() {
-    let { isSearch, list } = Taro.getCurrentInstance().router.params;
+    let { isSearch, list, wish, price } = Taro.getCurrentInstance().router.params;
     this.setState({
       isSearch,
       list: JSON.parse(decodeURIComponent(list)),
+      wish,
+      price,
     });
   }
   // 再次捡漏
   handleAgain = () => {
     Taro.navigateBack();
   }
+  // 去捡漏清单
+  toCalculatorInventory = (id) => {
+    Taro.navigateTo({
+      url: `/pages/calculatorSub/calculatorInventory/index?id=${id}&&isShare=true`,
+    });
+  }
   // 精选推荐
   handleGoodRecommend = (id) => {
     Taro.navigateTo({
@@ -25,7 +35,7 @@ export default class Index extends Component {
     });
   }
   render() {
-    const { isSearch, list } = this.state;
+    const { isSearch, list, wish, price } = this.state;
     return (
       <View className="index">
         {/* 顶部盒子 */}
@@ -38,11 +48,11 @@ export default class Index extends Component {
           <View className="calculator-info">
             <View className="title-box">
               <Text className="title-text-left">您想要的:</Text>
-              <Text className="title-text">购买北京到深圳的机票</Text>
+              <Text className="title-text">{wish}</Text>
             </View>
             <View className="title-box">
               <Text className="title-text-left">期望花费:</Text>
-              <Text className="title-text">1000元</Text>
+              <Text className="title-text">{price}元</Text>
             </View>
           </View>
           {/* 首选推荐产品 */}
@@ -56,7 +66,7 @@ export default class Index extends Component {
             </View>
             <View className="first-recommend-content">
               {list.length > 0 && (
-                <View className="product-info">
+                <View className="product-info" onClick={() => this.handleGoodRecommend(list[0].id)}>
                   <Image
                     className="product-avatar"
                     mode="aspectFill"

src/pages/calculatorSub/calculatorWish/index.jsx

@@ -52,7 +52,7 @@ export default class Index extends Component {
       Taro.navigateTo({
         url: `/pages/calculatorSub/calculatorResult/index?isSearch=${
           res.is_search
-        }&&list=${encodeURIComponent(JSON.stringify(res.goods_list))}`,
+        }&&list=${encodeURIComponent(JSON.stringify(res.goods_list))}&&wish=${this.state.wish}&&price=${this.state.price}`,
       });
     } finally {
       Taro.hideLoading();

src/pages/index/index.jsx

@@ -43,8 +43,9 @@ export default class Index extends Component {
   // 轮播图点击
   handleBannerClick = (item) => {
     if (item.type_jpath == 1) {
+      const connector = item.jpath.includes('?') ? '&' : '?';
       Taro.navigateTo({
-        url: `${item.jpath}&isBanner=true`,
+        url: `${item.jpath}${connector}isBanner=true`,
       });
     }
   };
@@ -121,14 +122,6 @@ export default class Index extends Component {
   onShareAppMessage() {
     return getShareContent();
   }
-  // ooo = () => {
-  //   Taro.requestSubscribeMessage({
-  //     tmplIds: ["vAYG7hbNbsD75YHpmGvF8O_Pve_1Q5AvnLBd-2JF9ys"],
-  //     success: function (res) {
-  //       console.log(res);
-  //     },
-  //   });
-  // };
   render() {
     const { homeData, productList, loading } = this.state;
     return (
@@ -194,7 +187,6 @@ export default class Index extends Component {
             </Swiper>
           </View>
         </View>
-        {/* <Button onClick={this.ooo}>订阅</Button> */}
         {/* 骨架屏 */}
         <Skeleton
           isSkeletonShow={!homeData.banner && !productList.length > 0}

src/pages/indexSub/productDetail/index.jsx

@@ -77,7 +77,6 @@ export default class Index extends Component {
       tagTitle,
       shareType,
     } = Taro.getCurrentInstance().router.params;
-    console.log(isShare);
 
     let session_key = Taro.getStorageSync("session_key");
     let userInfo = Taro.getStorageSync("userInfo");

src/pages/member/index.jsx

@@ -1,7 +1,7 @@
 import { Component } from "react";
 import { View, Text, Image } from "@tarojs/components";
 import { AtIcon } from "taro-ui";
-import { getVipInfo,getUserAgreement } from "../../service";
+import { getVipInfo, getUserAgreement } from "../../service";
 import { get_my_worker_info } from "../../service/money_api";
 import Taro from "@tarojs/taro";
 import "./index.less";
@@ -33,7 +33,7 @@ export default class Index extends Component {
     }, //会员信息
     isAlipay: true, //是否签约
     isInstructionModal: false, //是否显示伙伴说明弹窗
-    userAgreement: '', //会员规则
+    userAgreement: "", //会员规则
   };
 
   // 获取签约信息
@@ -69,7 +69,6 @@ export default class Index extends Component {
     });
   };
 
-
   // 去登录
   Login = () => {
     if (!Taro.getStorageSync("session_key")) {
@@ -85,6 +84,30 @@ export default class Index extends Component {
     }
     this.getUserAgreement(); //获取会员规则
   }
+  // 我的小店
+  handleShopClick = () => {
+    Taro.navigateTo({
+      url: `/pages/memberSub/storeManagement/index?isManager=${true}`,
+    });
+    Taro.requestSubscribeMessage({
+      tmplIds: ["vAYG7hbNbsD75YHpmGvF8O_Pve_1Q5AvnLBd-2JF9ys"],
+      success: function (res) {
+        console.log(res);
+      },
+    });
+  };
+  // 去我的伙伴
+  handlePartnerClick = () => {
+    Taro.navigateTo({
+      url: `/pages/memberSub/myPartner/index`,
+    });
+    Taro.requestSubscribeMessage({
+      tmplIds: ["vAYG7hbNbsD75YHpmGvF8O_Pve_1Q5AvnLBd-2JF9ys"],
+      success: function (res) {
+        console.log(res);
+      },
+    });
+  };
   // 去订单列表
   handleOrderClick = (type) => {
     Taro.navigateTo({
@@ -132,11 +155,7 @@ export default class Index extends Component {
               </View>
               {/* 我的小店 */}
               <View
-                onClick={() =>
-                  Taro.navigateTo({
-                    url: `/pages/memberSub/storeManagement/index?isManager=${true}`,
-                  })
-                }
+                onClick={() => this.handleShopClick()}
                 className="my-shop"
               >
                 <Image className="my-shop-icon" src={home} />
@@ -212,9 +231,7 @@ export default class Index extends Component {
                 <Text className="my-partner-title">我的伙伴</Text>
               </View>
               <View
-                onClick={() =>
-                  Taro.navigateTo({ url: `/pages/memberSub/myPartner/index` })
-                }
+                onClick={() => this.handlePartnerClick()}
                 className="my-partner-header-right"
               >
                 查看更多
@@ -231,7 +248,7 @@ export default class Index extends Component {
                   onClick={() => this.handleInstructionModal()}
                   className="partnerExplain"
                   src="https://yushi.tos-cn-beijing.volces.com/calculator/partnerExplain.png"
-              />
+                />
               )}
               <View
                 onClick={() =>
@@ -300,13 +317,13 @@ export default class Index extends Component {
                   {vipInfo.order.on_arrival_order_cnt}
                 </Text>
               </View>
-              <View
+              {/* <View
                 className="order-item"
                 onClick={() => this.handleOrderClick(2)}
               >
                 <Text className="label">已结算订单</Text>
                 <Text className="amount">{vipInfo.order.order_pay}</Text>
-              </View>
+              </View> */}
               <View
                 className="order-item"
                 onClick={() => this.handleOrderClick(2)}

src/pages/member/index.less

@@ -370,7 +370,7 @@
             padding: 27px 20px 0 20px;
             box-sizing: border-box;
             display: flex;
-            justify-content: space-between;
+            // justify-content: space-between;
             align-items: center;
             flex-wrap: wrap;
             .order-item {