首页专项区域动态配置

src/components/Modal/index.jsx

@@ -9,7 +9,7 @@ import selectStep from "../../images/productDetail/selectStep.png";
 import xianyu from "../../images/productDetail/xianyu.png";
 import stepThree from "../../images/productDetail/stepThree.png";
 export default function Modal(props) {
-  const { productPromotion, isOpened, title, linkText, id, shareUserId,isHighCommission,isSeckill } =
+  const { productPromotion, isOpened, title, linkText, id, shareUserId,isSeckill } =
     props;
   const handleCopyLink = () => {
     if (!isDebounce(500)) return; // 如果在300ms内重复触发，直接返回
@@ -20,7 +20,7 @@ export default function Modal(props) {
         title: "口令已复制",
         icon: "success",
       });
-      if (isHighCommission || isSeckill) {
+      if (isSeckill) {
         const dayid = formatDate(new Date(), "YYYY-MM-DD");
         let userId = "";
         if (Taro.getStorageSync("loginInfo")) {

src/components/index/OperationArea/index.jsx

@@ -5,24 +5,17 @@ import "./index.less";
 const OperationArea = ({ recommend }) => {
   // 添加跳转方法
   const handleNavigate = (type) => {
-    if (type === "鱼市秒杀") {
-      Taro.navigateTo({
-        url: `/pages/indexSub/seckillIndex/index?isDirect=true`,
-      });
-    } else if (type === "高佣专项") {
-      Taro.navigateTo({
-        url: `/pages/indexSub/highCommission/index?isDirect=true`,
-      });
-    }
+    Taro.navigateTo({
+      url: `/pages/indexSub/seckillIndex/index?isDirect=true&title=${type.name}&id=${type.id}`,
+    });
   };
-
   return (
     <View className="operation-wrap">
       {recommend.map((item, index) => (
         <View
           key={index}
           className="operation-item"
-          onClick={() => handleNavigate(item.tag.name)}
+          onClick={() => handleNavigate(item.tag)}
         >
           <View className="title-wrap">
             <Text className="title">{item.tag.name}</Text>
@@ -53,13 +46,6 @@ const OperationArea = ({ recommend }) => {
           </View>
         </View>
       ))}
-
-      {/* <View className="operation-item" onClick={() => handleNavigate('highCommission')}>
-        <View className="title-wrap">
-          <Text className="title">高佣专项</Text>
-          <Text className="tag">高佣金必囤爆品</Text>
-        </View>
-      </View> */}
     </View>
   );
 };

src/components/index/OperationArea/index.less

@@ -2,14 +2,14 @@
     margin: 16px 16px 0;
     display: flex;
     justify-content: space-between;
-
+    flex-wrap: wrap;
     .operation-item {
         width: 350px;
         height: 256px;
         background: #FFFFFF;
         border-radius: 16px;
         border: 1px solid #FFFFFF;
-
+        margin-bottom: 16px;
         .title {
             font-size: 28px;
             font-weight: bold;

src/components/index/ProductList/index.jsx

@@ -23,8 +23,8 @@ const ProductList = forwardRef((props, ref) => {
   const {
     productList, // 商品列表数据
     loading, // 加载状态
-    isSeckill, // 是否秒杀页面使用
-    isHighCommission, // 是否高佣金��面使用
+    isSeckill, // 是否专项区域页面使用
+    tagTitle,//专项区域名称
     isManagement, // 是否管理页面使用
     isManagementStatus, // 是否管理状态
     isProductClassify, // 是否分类页面使用
@@ -69,7 +69,7 @@ const ProductList = forwardRef((props, ref) => {
       selectProduct(id);
     } else {
       Taro.navigateTo({
-        url: `/pages/indexSub/productDetail/index?id=${id}&&isHighCommission=${isHighCommission}&&isSeckill=${isSeckill}&&shareUserId=${shareUserId}`,
+        url: `/pages/indexSub/productDetail/index?id=${id}&&isSeckill=${isSeckill}&&shareUserId=${shareUserId}&&tagTitle=${tagTitle}`,
       });
     }
   };
@@ -149,24 +149,24 @@ const ProductList = forwardRef((props, ref) => {
           product.id
         }&&isShare=${true}&&shareJump=${
           res.share_unique_value
-        }&&isHighCommission=${isHighCommission}&&isSeckill=${isSeckill}&&shareUserId=${shareUserId}`,
+        }&&isSeckill=${isSeckill}&&shareUserId=${shareUserId}`,
         imageUrl: product.image_url,
       });
       setShareLink(res.share_unique_value);
       setShareModalOpened(true);
-      if (isHighCommission || isSeckill) {
+      if (isSeckill) {
         handleLog(product.id);
       }
     });
   };
   return (
     <View className="product-list-wrap">
-      {isSeckill && (
+      {/* {isSeckill && (
         <View className="seckill-icon">
           <Image src={seckillIcon} mode="aspectFit" />
           <Text>每日疯抢 限时秒杀</Text>
         </View>
-      )}
+      )} */}
       {productList.map((product, index) => (
         <View key={product.id}>
           <View onClick={() => toDetail(product.id)} className="product-item">
@@ -198,9 +198,7 @@ const ProductList = forwardRef((props, ref) => {
                 >
                   <Text className="self-tag">
                     {isSeckill
-                      ? "鱼市秒杀"
-                      : isHighCommission
-                      ? "高佣专项"
+                      ? tagTitle
                       : "自营"}
                   </Text>
                   {product.item_title}
@@ -315,7 +313,7 @@ const ProductList = forwardRef((props, ref) => {
 
 ProductList.defaultProps = {
   isSeckill: false,
-  isHighCommission: false,
+  tagTitle:'',
   productList: [],
   loading: false,
   isManagement: false,

src/pages/index/index.jsx

@@ -44,7 +44,7 @@ export default class Index extends Component {
   handleBannerClick = (item) => {
     if(item.type_jpath==1){
       Taro.navigateTo({
-        url: `${item.jpath}?isBanner=true`
+        url: `${item.jpath}&isBanner=true`
       })
     }
   };
@@ -174,7 +174,7 @@ export default class Index extends Component {
                     <Image
                       className="banner-img"
                       src={item.img}
-                      mode="aspectFill"
+                      mode="widthFix"
                     />
                   </SwiperItem>
                 ))}

src/pages/index/index.less

@@ -132,7 +132,10 @@
       }
     }
   }
-
+  // 商品列表
+  .product-list-wrap {
+    margin-top: 0;
+  }
   // 添加浮动按钮样式
   .float-buttons {
     position: fixed;

src/pages/indexSub/productDetail/index.jsx

@@ -30,8 +30,8 @@ export default class Index extends Component {
     productDetail: [], //商品详情
     productLikeList: [], //推荐商品列表
     productPromotion: [], //商品推广转链
-    isHighCommission: false, //是否是高佣金页面
-    isSeckill: false, //是否是秒杀页面
+    isSeckill: false, //是否是专项区域页面
+    tagTitle:'',//专项跳转标题
     shareJump: "", //分享跳转标识
     shareTitle: "", //分享标题
     shareUserId: "", //分享用户id
@@ -68,7 +68,7 @@ export default class Index extends Component {
     Taro.hideShareMenu({
       menus: ["shareAppMessage", "shareTimeline"],
     });
-    const { id, isShare, isHighCommission, isSeckill, shareJump, shareUserId } =
+    const { id, isShare, isSeckill, shareJump, shareUserId,tagTitle } =
       Taro.getCurrentInstance().router.params;
     let session_key = Taro.getStorageSync("session_key");
     let userInfo = Taro.getStorageSync("userInfo");
@@ -77,9 +77,9 @@ export default class Index extends Component {
       {
         id,
         isShare,
-        isHighCommission: isHighCommission === "true",
         isSeckill: isSeckill === "true",
         shareUserId: shareUserId,
+        tagTitle:tagTitle,
       },
       () => {
         // 获取分享跳转标识
@@ -93,7 +93,7 @@ export default class Index extends Component {
         if (session_key && shareJump) {
           this.bindShareJump(); //绑定分享跳转标识
         }
-        if (this.state.isHighCommission || this.state.isSeckill) {
+        if (this.state.isSeckill) {
           this.handleLog("direct_to_product"); //埋点
         }
       }
@@ -142,7 +142,7 @@ export default class Index extends Component {
   // 埋点
   handleLog = (event_type) => {
     if (!isDebounce(500)) return; // 如果在300ms内重复触发，直接返回
-    if (this.state.isHighCommission || this.state.isSeckill) {
+    if (this.state.isSeckill) {
       const dayid = formatDate(new Date(), "YYYY-MM-DD");
       const event_type_title =
         event_type == "share_product_link"
@@ -202,7 +202,7 @@ export default class Index extends Component {
   onShareAppMessage() {
     return {
       title: this.state.shareTitle || this.state.productDetail.item_title,
-      path: `/pages/indexSub/productDetail/index?id=${this.state.id}&&isShare=true&&isHighCommission=${this.state.isHighCommission}&&isSeckill=${this.state.isSeckill}&&shareJump=${this.state.shareJump}`,
+      path: `/pages/indexSub/productDetail/index?id=${this.state.id}&&isShare=true&&isSeckill=${this.state.isSeckill}&&shareJump=${this.state.shareJump}&&tagTitle=${this.state.tagTitle}`,
       imageUrl: this.state.productDetail.images[0].img,
     };
   }
@@ -218,7 +218,7 @@ export default class Index extends Component {
     }
   };
   render() {
-    const { productDetail } = this.state;
+    const { productDetail,tagTitle } = this.state;
     return (
       <View
         className="index"
@@ -247,10 +247,8 @@ export default class Index extends Component {
           {/* 商品名称 */}
           <Text className="product-name">
             <Text className="self-tag">
-              {this.state.isHighCommission
-                ? "高佣专项"
-                : this.state.isSeckill
-                ? "鱼市秒杀"
+              {this.state.isSeckill
+                ? tagTitle
                 : "自营"}
             </Text>
             {productDetail.item_title}
@@ -368,7 +366,6 @@ export default class Index extends Component {
           linkText={this.state.productPromotion.short_tpwd}
           id={this.state.id}
           shareUserId={this.state.shareUserId}
-          isHighCommission={this.state.isHighCommission}
           isSeckill={this.state.isSeckill}
         />
         {/* 分享弹窗 */}

src/pages/indexSub/seckillIndex/index.config.js

@@ -1,3 +1,3 @@
 export default definePageConfig({
-  navigationBarTitleText: '鱼市秒杀'
+  navigationBarTitleText: '鱼市专项'
 })

src/pages/indexSub/seckillIndex/index.jsx

@@ -2,13 +2,14 @@ import { Component } from "react";
 import { View, Image } from "@tarojs/components";
 import "./index.less";
 import Taro from "@tarojs/taro";
-import seckillImg from "../../../images/seckill/seckillTop.jpg";
 import ProductList from "../../../components/index/ProductList";
 import { getRecommendProductList, addLog } from "../../../service";
 import { formatDate } from "../../../common/time";
 import { getShareContent } from "../../../common/share";
 export default class Index extends Component {
   state = {
+    title: "", // 页面标题
+    id: "", // 页面类型id
     productList: [], //推荐商品列表
     page: 1, //页数
     loading: false, //加载状态
@@ -18,9 +19,10 @@ export default class Index extends Component {
     isBanner: false, // 是否是banner跳转
     isShare: false, // 是否是分享跳转
     shareUserId: "", // 分享用户id
+    img: "", // 图片
   };
   componentDidMount() {
-    const { isDirect, isBanner, isShare, shareUserId } =
+    const { isDirect, isBanner, isShare, shareUserId, title, id } =
       Taro.getCurrentInstance().router.params || "";
     this.setState(
       {
@@ -28,20 +30,26 @@ export default class Index extends Component {
         isBanner: isBanner || false,
         isShare: isShare || false,
         shareUserId: shareUserId || "",
+        title: title || "",
+        id: id || "",
       },
       () => {
+        // 设置页面标题
+        Taro.setNavigationBarTitle({
+          title: this.state.title || "鱼市",
+        });
         this.handleLog(
           isDirect
-            ? "direct_to_fish_seckill"
+            ? `direct_to_${this.state.id}_${this.state.title}`
             : isBanner
-            ? "banner_to_fish_seckill"
+            ? `banner_to_${this.state.id}_${this.state.title}`
             : isShare
-            ? "share_to_fish_seckill"
-            : "direct_to_fish_seckill"
+            ? `share_to_${this.state.id}_${this.state.title}`
+            : `direct_to_${this.state.id}_${this.state.title}`
         );
+        this.getRecommendProductList();
       }
     );
-    this.getRecommendProductList();
   }
   // 获取推荐商品列表
   getRecommendProductList = async () => {
@@ -49,7 +57,7 @@ export default class Index extends Component {
     this.setState({ loading: true });
 
     const res = await getRecommendProductList({
-      tag_id: 120,
+      tag_id: this.state.id,
       page,
       page_size: 10,
     });
@@ -59,19 +67,20 @@ export default class Index extends Component {
       totalPages: res.total_pages,
       loading: false,
       isNoMore: res.total_pages <= page,
+      img: res.img,
     }));
   };
   // 埋点
   handleLog = (event_type) => {
     const dayid = formatDate(new Date(), "YYYY-MM-DD");
     const event_type_title =
-      event_type == "banner_to_fish_seckill"
-        ? "从banner 跳转到鱼市秒杀"
-        : event_type == "share_to_fish_seckill"
-        ? "从分享链接跳转到鱼市秒杀"
-        : event_type == "direct_to_fish_seckill"
-        ? "直接点击进入鱼市秒杀"
-        : "直接点击进入鱼市秒杀";
+      event_type == `banner_to_${this.state.id}_${this.state.title}`
+        ? `从banner 跳转到${this.state.title}`
+        : event_type == `share_to_${this.state.id}_${this.state.title}`
+        ? `从分享链接跳转到${this.state.title}`
+        : event_type == `direct_to_${this.state.id}_${this.state.title}`
+        ? `直接点击进入${this.state.title}`
+        : `直接点击进入${this.state.title}`;
     let userId = "";
     if (Taro.getStorageSync("loginInfo")) {
       userId = Taro.getStorageSync("loginInfo").id;
@@ -84,7 +93,7 @@ export default class Index extends Component {
       });
     }
     addLog({
-      users_id: userId||0,
+      users_id: userId || 0,
       goods_id: 0,
       event_type_title,
       event_type,
@@ -98,11 +107,10 @@ export default class Index extends Component {
     if (Taro.getStorageSync("loginInfo")) {
       shareUserId = Taro.getStorageSync("loginInfo").id;
     }
-    const shareConfig = getShareContent();
     if (res.from == "menu") {
       return {
-        title: "鱼市秒杀",
-        path: `/pages/indexSub/seckillIndex/index?isShare=true&shareUserId=${shareUserId}`,
+        title: `${this.state.title}`,
+        path: `/pages/indexSub/seckillIndex/index?isShare=true&shareUserId=${shareUserId}&title=${this.state.title}&id=${this.state.id}`,
         imageUrl: "",
       };
     } else {
@@ -122,7 +130,7 @@ export default class Index extends Component {
   render() {
     return (
       <View className="index">
-        <Image className="seckill" src={seckillImg} mode="aspectFill" />
+        <Image className="seckill" src={this.state.img} mode="widthFix" />
         {/* 商品列表 */}
         <View className="product-list">
           <ProductList
@@ -131,6 +139,7 @@ export default class Index extends Component {
             loading={this.state.loading}
             isNoMore={this.state.isNoMore}
             shareUserId={this.state.shareUserId}
+            tagTitle={this.state.title}
           />
         </View>
       </View>

src/pages/indexSub/seckillIndex/index.less

@@ -2,6 +2,7 @@
     width: 100%;
     padding-bottom: 40px;
     box-sizing: border-box;
+    background-color: #f9f9f9;
     .seckill{
         width: 100%;
         height: 300px;

src/pages/memberSub/earningsOrder/index.jsx

@@ -222,15 +222,17 @@ export default class Index extends Component {
                 />
                 <View className="product-details">
                   <Text className="product-name">{item.item_title}</Text>
-                  <View className="promotion-info">
-                    <View className="tag">预估收入</View>
-                    <Text className="amount">
+                  {item.state_code != 3 && (
+                    <View className="promotion-info">
+                      <View className="tag">预估收入</View>
+                      <Text className="amount">
                       ¥
                       {orderType == 2
                         ? item.assess_amount_text_promotion_yuan
                         : item.assess_amount_text_buy_yuan}
                     </Text>
                   </View>
+                  )}
                   <View className="payment-info">
                     <Text className="label">实付金额:</Text>
                     <Text className="amount">¥{item.actual_paid_fee}</Text>

src/service/index.js

@@ -36,7 +36,7 @@ export const getProductLikeList = data =>
     method: 'POST',
     data,
   })
-// 获取推荐商品列表   (包括鱼市商品 = 120;高佣专属 = 121)
+// 获取推荐商品列表
 export const getRecommendProductList = data =>
   Request({
     url: '/api/get_goods_data_list_recommend',