列表tab筛选优化&鱼市说明样式优化

project.private.config.json

@@ -10,6 +10,13 @@
     "miniprogram": {
       "list": [
         {
+          "name": "pages/mineSub/explain/index",
+          "pathName": "pages/mineSub/explain/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
           "name": "pages/indexSub/seckillIndex/index",
           "pathName": "pages/indexSub/seckillIndex/index",
           "query": "isDirect=true&title=%E5%90%83%E5%96%9D%E7%8E%A9%E4%B9%90&id=128",

src/components/Modal/index.jsx

@@ -1,12 +1,22 @@
-import { AtModal, AtModalContent } from "taro-ui";
+import { AtModal, AtModalContent, ActivityIndicator } from "taro-ui";
 import { View, Image, Text } from "@tarojs/components";
 import { handleLog } from "../../common/track";
 import "./index.less";
 import Taro from "@tarojs/taro";
 export default function Modal(props) {
-  const { productPromotion, isOpened, title, linkText, id, shareUserId,isSeckill } =
-    props;
+  const {
+    productPromotion,
+    isOpened,
+    title,
+    linkText,
+    id,
+    shareUserId,
+    isSeckill,
+  } = props;
   const handleCopyLink = () => {
+    if (!productPromotion.short_tpwd) {
+      return;
+    }
     Taro.setClipboardData({
       data: productPromotion.short_tpwd,
     }).then(() => {
@@ -16,7 +26,7 @@ export default function Modal(props) {
       });
       if (isSeckill) {
         handleLog({
-          shareUserId:shareUserId,
+          shareUserId: shareUserId,
           event_type: "buy_product_link",
           event_type_title: "点击购买",
           goods_id: Number(id),
@@ -39,7 +49,10 @@ export default function Modal(props) {
                 </View>
                 <View className="step-box">
                   <View className="step-One">复制口令</View>
-                  <Image className="step-img-one" src='https://yushi.tos-cn-beijing.volces.com/productDetail/selectStep.png'/>
+                  <Image
+                    className="step-img-one"
+                    src="https://yushi.tos-cn-beijing.volces.com/productDetail/selectStep.png"
+                  />
                 </View>
               </View>
               <View className="step-item">
@@ -48,8 +61,14 @@ export default function Modal(props) {
                   <Text className="desc">打开闲鱼APP</Text>
                 </View>
                 <View className="step-box">
-                  <Image className="step-img-t" src='https://yushi.tos-cn-beijing.volces.com/productDetail/xianyu.png' />
-                  <Image className="step-img-two" src='https://yushi.tos-cn-beijing.volces.com/productDetail/selectStep.png' />
+                  <Image
+                    className="step-img-t"
+                    src="https://yushi.tos-cn-beijing.volces.com/productDetail/xianyu.png"
+                  />
+                  <Image
+                    className="step-img-two"
+                    src="https://yushi.tos-cn-beijing.volces.com/productDetail/selectStep.png"
+                  />
                 </View>
               </View>
               <View className="step-item">
@@ -61,14 +80,14 @@ export default function Modal(props) {
                   <Image
                     mode="heightFix"
                     className="step-img-three"
-                    src='https://yushi.tos-cn-beijing.volces.com/productDetail/stepThree.png'
+                    src="https://yushi.tos-cn-beijing.volces.com/productDetail/stepThree.png"
                   />
                 </View>
               </View>
             </View>
             {/* 复制口令 */}
             <View className="copy-link" onClick={handleCopyLink}>
-              复制口令
+              {productPromotion.short_tpwd ? "复制口令" : "获取中..."}
             </View>
           </View>
         </View>

src/pages/index/index.jsx

@@ -45,9 +45,10 @@ export default class Index extends Component {
   };
   // 修改 tab 切换处理函数
   handleClick(value) {
+    if (this.state.current == value) return;
     // 添加回到顶部方法
-      Taro.pageScrollTo({
-        scrollTop: 500, // 滚动到顶部位置
+    Taro.pageScrollTo({
+      scrollTop: 500, // 滚动到顶部位置
         duration: 200, // 滚动动画持续时间,单位 ms
       });
     this.setState(

src/pages/indexSub/activity/index.jsx

@@ -89,6 +89,7 @@ export default class Index extends Component {
   };
   // 切换tab
   tabClick = (index) => {
+    if (this.state.current == index) return;
     this.setState(
       {
         current: index,

src/pages/indexSub/productDetail/index.jsx

@@ -57,6 +57,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:红包购买
     });
     this.setState({
       productPromotion:
@@ -155,12 +156,12 @@ export default class Index extends Component {
 
   // 立即购买
   handleBuy = async () => {
-    if (!this.state.productPromotion.short_tpwd) {
-      await this.getProductPromotion();
-    }
     this.setState({
       isOpened: "self",
     });
+    if (!this.state.productPromotion.short_tpwd) {
+      await this.getProductPromotion();
+    }
   };
   // 绑定分享跳转标识
   bindShareJump = async () => {

src/pages/indexSub/seckillIndex/index.jsx

@@ -100,9 +100,11 @@ export default class Index extends Component {
   }
   // 获取标签
   getFishMarketTags = async () => {
-    let res = await getFishMarketTags();
+    let res = await getFishMarketTags({
+      tag_id: this.state.id,
+    });
     res = res.map((item, index) => ({
-      title: item.name,
+      title: item.tab_name
     }));
     this.setState({ tabList: res }, () => {
       this.getRecommendProductList(); //获取商品
@@ -142,15 +144,12 @@ export default class Index extends Component {
   };
   // 点击标签页
   handleClick(value) {
-    // 跳转到顶部
-    Taro.pageScrollTo({
-      scrollTop: 0,
-      duration: 300,
-    });
+    if (this.state.current == value) return;
     this.setState(
       {
         current: value,
         page: 1,
+        productList: [],
       },
       () => {
         this.getRecommendProductList(true);

src/pages/indexSub/seckillIndex/index.less

@@ -3,23 +3,26 @@
     padding-bottom: 40px;
     box-sizing: border-box;
     background-color: #f9f9f9;
-
+    min-height: 100vh;
     .seckill {
         width: 100%;
         height: 300px;
     }
+
     // 顶部固定
     .tabs {
         width: 100%;
         background: #fff;
         z-index: 100;
-        
+
         &.fixed {
             position: fixed;
             top: 0;
             left: 0;
         }
-
+        .at-tabs__header{
+            text-align: left;
+        }
         .at-tabs__item {
             color: #787878;
         }
@@ -43,19 +46,17 @@
     }
 
     .product-list {
+        min-height: calc(100vh - 300px);
         background-color: #fff;
-        margin:0 16px;
+        margin: 0 16px;
         margin-top: -196px;
         border-radius: 16px;
         overflow: hidden;
         z-index: 100;
         position: relative;
-        .product-list-wrap{
+
+        .product-list-wrap {
             margin: 0;
         }
     }
-}
-
-.tabs-placeholder {
-    height: 80px; // 设置为tabs的实际高度
 }

src/pages/memberSub/productClassify/index.jsx

@@ -18,28 +18,25 @@ export default class Index extends Component {
     page: 1, //页数
     loading: false, //加载状态
     totalPages: 1, // 添加总页数
-    tabList: [], // 所有闲鱼tags
     value: "", // 搜索
   };
   // 点击标签页
   handleClick(value) {
+    if (this.state.current == value) return;
     this.setState(
       {
         current: value,
         page: 1,
         value: "",
+        productList: [],
       },
       () => {
-        Taro.pageScrollTo({
-          scrollTop: 0,
-          duration: 300,
-        });
         this.getBrowseShopProductList(true);
       }
     );
   }
   componentDidMount() {
-    this.getAllTags();
+    this.getAllTags(); //获取所有闲鱼tags
   }
   // 获取商品列表
   getBrowseShopProductList = async (isAdd = false) => {
@@ -70,7 +67,6 @@ export default class Index extends Component {
     this.setState(
       {
         tabList: res,
-        productList: [],
       },
       () => {
         this.getBrowseShopProductList(true);
@@ -85,6 +81,7 @@ export default class Index extends Component {
   handleSearch = () => {
     this.setState({
       page: 1,
+      productList: [],
     },()=>{
       this.getBrowseShopProductList(true);
     })

src/pages/mineSub/explain/index.jsx

@@ -14,6 +14,8 @@ export default class Index extends Component {
     const res = await getUserAgreement({
       type:2
     })
+    // 替换图片样式
+    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
     })