绑定关系重复展示隐藏&分享后页面按钮展示&订单类型展示

project.private.config.json

@@ -10,6 +10,13 @@
     "miniprogram": {
       "list": [
         {
+          "name": "pages/memberSub/earningsOrder/index",
+          "pathName": "pages/memberSub/earningsOrder/index",
+          "query": "type=2",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
           "name": "pages/memberSub/cashOut/index",
           "pathName": "pages/memberSub/cashOut/index",
           "query": "",

src/api/request.js

@@ -42,12 +42,15 @@ export default async (options = { method: 'GET', data: {} }) => {
       case 200:
         return data;
       case 400:
-        if (msg) {
-          Taro.showToast({
-            title: msg,
-            icon: 'none',
-            mask: true,
-          });
+        if (options.url.includes('/user/get_share_unique_value')) {
+        } else {
+          if (msg) {
+            Taro.showToast({
+              title: msg,
+              icon: 'none',
+              mask: true,
+            });
+          }
         }
         return Promise.reject(msg);
       case 422:

src/components/ProductCard/index.jsx

@@ -2,9 +2,9 @@ import { View, Text, Image } from '@tarojs/components'
 import Taro from '@tarojs/taro'
 import './index.less'
 
-const ProductCard = ({ product }) => {
+const ProductCard = ({ product,isShare }) => {
   return (
-    <View onClick={() => Taro.navigateTo({ url: `/pages/indexSub/productDetail/index?id=${product.id}` })} className='product-card'>
+    <View onClick={() => Taro.navigateTo({ url: `/pages/indexSub/productDetail/index?id=${product.id}&isShare=${isShare}` })} className='product-card'>
       <Image className='product-img' src={product.image_url} mode='aspectFill' />
       <View className='product-content'>
         <Text className='title'>{product.item_title}</Text>

src/components/index/ProductList/index.jsx

@@ -16,6 +16,7 @@ import joinStoreBg from "../../../images/index/jionStore.png";
 import joinStoreAc from "../../../images/index/joinStoreAc.png";
 import saveMoneyBg from "../../../images/index/save-money.png";
 import buy from "../../../images/index/buy.png";
+import shareBuy from "../../../images/index/shareBuy.png";
 import shareEarnBg from "../../../images/index/share-earn.png";
 import seckillIcon from "../../../images/seckill/seckillIcon.png";
 import { isDebounce } from "../../../common/debounce";
@@ -24,7 +25,7 @@ const ProductList = forwardRef((props, ref) => {
     productList, // 商品列表数据
     loading, // 加载状态
     isSeckill, // 是否专项区域页面使用
-    tagTitle,//专项区域名称
+    tagTitle, //专项区域名称
     isManagement, // 是否管理页面使用
     isManagementStatus, // 是否管理状态
     isProductClassify, // 是否分类页面使用
@@ -34,6 +35,7 @@ const ProductList = forwardRef((props, ref) => {
     isNoMore, // 是否没有更多
     shareUserId, // 分享用户id
     isEmpty, // 是否为空
+    isShare, //是否是分享
   } = props;
 
   const [selectedProducts, setSelectedProducts] = useState([]); // 商品选择状态
@@ -69,7 +71,7 @@ const ProductList = forwardRef((props, ref) => {
       selectProduct(id);
     } else {
       Taro.navigateTo({
-        url: `/pages/indexSub/productDetail/index?id=${id}&&isSeckill=${isSeckill}&&shareUserId=${shareUserId}&&tagTitle=${tagTitle}`,
+        url: `/pages/indexSub/productDetail/index?id=${id}&&isSeckill=${isSeckill}&&shareUserId=${shareUserId}&&tagTitle=${tagTitle}&&isShare=${isShare}`,
       });
     }
   };
@@ -197,9 +199,7 @@ const ProductList = forwardRef((props, ref) => {
                   style={{ WebkitBoxOrient: "vertical" }}
                 >
                   <Text className="self-tag">
-                    {isSeckill
-                      ? tagTitle
-                      : "自营"}
+                    {isSeckill ? tagTitle : "自营"}
                   </Text>
                   {product.item_title}
                 </View>
@@ -238,40 +238,55 @@ const ProductList = forwardRef((props, ref) => {
                     </View>
                   )}
                 </View>
-                <View className="profit-line">
-                  {Number(product.estimated_commission_buy) > 0 ? (
-                    <View className="save-money">
+                <View className={`profit-line ${isShare ? 'flexEnd' : ''}`}>
+                  {!isShare ? (
+                    Number(product.estimated_commission_buy) > 0 ? (
+                      <View className="save-money">
+                        <Image
+                          className="bg"
+                          src={saveMoneyBg}
+                          mode="aspectFit"
+                        />
+                        <View className="content">
+                          <Text className="label">自购省</Text>
+                          <Text className="money">
+                            ¥{product.estimated_commission_buy}
+                          </Text>
+                        </View>
+                      </View>
+                    ) : (
+                      <View className="buy">
+                        <Image className="bg" src={buy} mode="aspectFit" />
+                        <View className="content">立 即 购 买</View>
+                      </View>
+                    )
+                  ) : (
+                    // 这里添加 isShare 为 true 时要显示的内容
+                    <View className="shareBuy">
+                      <Image className="bg" src={shareBuy} />
+                      <View className="content">立 即 购 买</View>
+                    </View>
+                  )}
+
+                  {!isShare && (
+                    <View className="share-earn">
                       <Image
                         className="bg"
-                        src={saveMoneyBg}
+                        src={shareEarnBg}
                         mode="aspectFit"
                       />
                       <View className="content">
-                        <Text className="label">自购省</Text>
-                        <Text className="money">
-                          ¥{product.estimated_commission_buy}
-                        </Text>
+                        <Button
+                          onClick={(e) => shareProduct(product, e)} // 传递事件对象
+                        >
+                          <Text className="label">分享赚</Text>
+                          <Text className="money">
+                            ¥{product.estimated_commission_promotion}
+                          </Text>
+                        </Button>
                       </View>
                     </View>
-                  ) : (
-                    <View className="buy">
-                      <Image className="bg" src={buy} mode="aspectFit" />
-                      <View className="content">立 即 购 买</View>
-                    </View>
                   )}
-                  <View className="share-earn">
-                    <Image className="bg" src={shareEarnBg} mode="aspectFit" />
-                    <View className="content">
-                      <Button
-                        onClick={(e) => shareProduct(product, e)} // 传递事件对象
-                      >
-                        <Text className="label">分享赚</Text>
-                        <Text className="money">
-                          ¥{product.estimated_commission_promotion}
-                        </Text>
-                      </Button>
-                    </View>
-                  </View>
                 </View>
               </View>
             </View>
@@ -313,7 +328,7 @@ const ProductList = forwardRef((props, ref) => {
 
 ProductList.defaultProps = {
   isSeckill: false,
-  tagTitle:'',
+  tagTitle: "",
   productList: [],
   loading: false,
   isManagement: false,
@@ -323,6 +338,7 @@ ProductList.defaultProps = {
   isNoMore: false,
   shareUserId: "",
   isEmpty: false, // 是否为空
+  isShare: false, //分享
   onAddProduct: () => {}, // 添加商品方法
   onDeleteProductSelect: () => {}, // 删除商品选中id数组
 };

src/components/index/ProductList/index.less

@@ -126,11 +126,12 @@
           }
         }
       }
-
+      .flexEnd{
+        justify-content: flex-end;
+      }
       .profit-line {
         display: flex;
         gap: 20px;
-
         .save-money {
           color: #F6C71A;
           // color: #F6C71A;
@@ -145,7 +146,8 @@
           //   text-align: center;
           // }
         }
-        .buy{
+
+        .buy {
           color: #F6C71A;
           display: flex;
           align-items: center;
@@ -161,6 +163,7 @@
             top: 0;
             left: 0;
           }
+
           .content {
             width: 74px;
             height: 80px;
@@ -169,6 +172,33 @@
             text-align: center;
           }
         }
+
+        .shareBuy {
+          color: #F6C71A;
+          display: flex;
+          align-items: center;
+          justify-content: center;
+          position: relative;
+          width: 60%;
+          height: 84px;
+          .bg {
+            width: 100%;
+            height: 100%;
+            position: absolute;
+            top: 0;
+            left: 0;
+          }
+
+          .content {
+            width: 100%;
+            height: 80px;
+            font-size: 30px;
+            text-align: center;
+            line-height: 80px;
+            letter-spacing:8px;
+          }
+        }
+
         .share-earn {
           color: #fff;
         }

src/pages/indexSub/productDetail/index.jsx

@@ -31,7 +31,7 @@ export default class Index extends Component {
     productLikeList: [], //推荐商品列表
     productPromotion: [], //商品推广转链
     isSeckill: false, //是否是专项区域页面
-    tagTitle:'',//专项跳转标题
+    tagTitle: "", //专项跳转标题
     shareJump: "", //分享跳转标识
     shareTitle: "", //分享标题
     shareUserId: "", //分享用户id
@@ -68,18 +68,27 @@ export default class Index extends Component {
     Taro.hideShareMenu({
       menus: ["shareAppMessage", "shareTimeline"],
     });
-    const { id, isShare, isSeckill, shareJump, shareUserId,tagTitle,shareType } =
-      Taro.getCurrentInstance().router.params;
+    const {
+      id,
+      isShare,
+      isSeckill,
+      shareJump,
+      shareUserId,
+      tagTitle,
+      shareType,
+    } = Taro.getCurrentInstance().router.params;
+    console.log(isShare);
+
     let session_key = Taro.getStorageSync("session_key");
     let userInfo = Taro.getStorageSync("userInfo");
     let isShowSign = Taro.getStorageSync("isShowSign");
     this.setState(
       {
         id,
-        isShare,
+        isShare: isShare === "true",
         isSeckill: isSeckill === "true",
         shareUserId: shareUserId,
-        tagTitle:tagTitle,
+        tagTitle: tagTitle,
       },
       () => {
         // 获取分享跳转标识
@@ -224,17 +233,17 @@ export default class Index extends Component {
     }
   };
   render() {
-    const { productDetail,tagTitle } = this.state;
+    const { productDetail, tagTitle } = this.state;
     return (
       <View
         className="index"
         style={{ paddingTop: Taro.navigationBarHeight + "px" }}
       >
-        {!this.state.isShare && (
-          <View className="back-btn" onClick={this.handleBack}>
-            <AtIcon value="chevron-left" size="24" color="#999999"></AtIcon>
-          </View>
-        )}
+        {/* {!this.state.isShare && ( */}
+        <View className="back-btn" onClick={this.handleBack}>
+          <AtIcon value="chevron-left" size="24" color="#999999"></AtIcon>
+        </View>
+        {/* )} */}
         {/* 轮播图 */}
         <Swiper className="swiper" autoplay circular>
           {productDetail.images &&
@@ -253,9 +262,7 @@ export default class Index extends Component {
           {/* 商品名称 */}
           <Text className="product-name">
             <Text className="self-tag">
-              {this.state.isSeckill
-                ? tagTitle
-                : "自营"}
+              {this.state.isSeckill ? tagTitle : "自营"}
             </Text>
             {productDetail.item_title}
           </Text>
@@ -275,11 +282,13 @@ export default class Index extends Component {
               )}
             </View>
             {/* 标签区域 */}
-            <View className="tag-box">
-              <Text className="tag">
-                分享赚￥{productDetail.estimated_commission_promotion}
-              </Text>
-            </View>
+            {!this.state.isShare && (
+              <View className="tag-box">
+                <Text className="tag">
+                  分享赚￥{productDetail.estimated_commission_promotion}
+                </Text>
+              </View>
+            )}
           </View>
 
           {/* 分割线 */}

src/pages/indexSub/seckillIndex/index.jsx

@@ -175,6 +175,7 @@ export default class Index extends Component {
             isNoMore={this.state.isNoMore}
             shareUserId={this.state.shareUserId}
             tagTitle={this.state.title}
+            isShare={this.state.isShare}
           />
         </View>
       </View>

src/pages/login/index.jsx

@@ -67,9 +67,10 @@ export default class Index extends Component {
           icon: "none",
         });
 
-        // 再获取用户信息
-        const userInfoRes = await getUserInfo();
-        Taro.setStorageSync("userInfo", userInfoRes);
+        // 获取用户信息
+        getUserInfo().then(userInfoRes => {
+          Taro.setStorageSync("userInfo", userInfoRes);
+        });
         try {
           // 先处理分享跳转
           let shareJump = Taro.getStorageSync("shareJump");

src/pages/memberSub/earningsOrder/index.jsx

@@ -193,16 +193,23 @@ export default class Index extends Component {
               <View className="order-info">
                 <View className="order-details">
                   <View className="detail-item">
-                    <Text className="label">订单编号:</Text>
-                    <Text className="value">{item.order_number}</Text>
-                    <Text
-                      className="copy-text"
-                      onClick={() => this.handleCopy(item.order_number)}
-                    >
-                      复制
-                    </Text>
+                    <View className="left">
+                      <Text className="label">订单编号:</Text>
+                      <Text className="value">{item.order_number}</Text>
+                      <Text
+                        className="copy-text"
+                        onClick={() => this.handleCopy(item.order_number)}
+                      >
+                        复制
+                      </Text>
+                    </View>
+                    <View className="right">
+                      <Text className="order-status">
+                        {tabList[item.state + 1].title}
+                      </Text>
+                    </View>
                   </View>
-                  <View className="detail-item">
+                  <View className="detail-item fixWidth">
                     <Text className="label">下单时间:</Text>
                     <Text className="value">{item.pay_time}</Text>
                   </View>
@@ -226,12 +233,12 @@ export default class Index extends Component {
                     <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>
+                        ¥
+                        {orderType == 2
+                          ? item.assess_amount_text_promotion_yuan
+                          : item.assess_amount_text_buy_yuan}
+                      </Text>
+                    </View>
                   )}
                   <View className="payment-info">
                     <Text className="label">实付金额:</Text>

src/pages/memberSub/earningsOrder/index.less

@@ -2,6 +2,7 @@
     background-color: #f9f9f9; // ... 其他样式 ...
     min-height: 100vh;
 }
+
 // 订单类型切换
 .order-type-switch {
     display: flex;
@@ -10,6 +11,7 @@
     padding: 20px 134px 10px 134px;
     align-items: center;
     box-sizing: border-box;
+
     .order-type-item {
         font-size: 30px;
         color: #999999;
@@ -18,11 +20,13 @@
         box-sizing: border-box;
         border-radius: 40px;
     }
+
     .order-type-item.active {
         color: #fff;
         background-color: #fa9703;
     }
 }
+
 // tab切换
 .tab-container {
     display: flex;
@@ -31,6 +35,7 @@
     padding: 22px 34px;
     box-sizing: border-box;
     align-items: center;
+
     .tab-item {
         font-size: 26px;
         color: #000000;
@@ -68,7 +73,7 @@
         display: flex;
         align-items: center;
         border-radius: 14px;
-        padding:18px;
+        padding: 18px;
         background-color: #f6f6f6;
 
         .search-icon {
@@ -142,32 +147,40 @@
             justify-content: space-between;
             padding-bottom: 24px;
             padding-top: 24px;
+
             .order-details {
+                width: 100%;
                 .detail-item {
                     display: flex;
                     align-items: center;
+                    justify-content: space-between;
                     margin-bottom: 8px;
-
-                    .label {
-                        color: #999;
-                        font-size: 22px;
-                        margin-right: 12px;
-                        line-height: 32px;
+                    color: #999;
+                    font-size: 22px;
+                    line-height: 32px;
+                    .left{
+                        display: flex;
+                        align-items: center;
+                        .label {
+                            margin-right: 12px;
+                        }
+                        .copy-text {
+                            color: #F6C71A;
+                            margin-left: 30px;
+                        }
                     }
-
-                    .value {
-                        color: #999;
-                        font-size: 22px;
-                        line-height: 32px;
-                    }
-
-                    .copy-text {
-                        color: #F6C71A;
-                        font-size: 22px;
-                        margin-left: 30px;
-                        line-height: 32px;
+                    .right{
+                        display: flex;
+                        align-items: center;
+                        .order-status {
+                            font-size: 24px;
+                            color: #F6C71A;
+                        }
                     }
                 }
+                .fixWidth{
+                    width: fit-content;
+                }
             }
 
             .member-info {
@@ -272,17 +285,20 @@
         }
     }
 }
+
 // 加载中
 .loading {
     width: 100%;
     position: relative;
     height: 60px;
-  }
+}
+
 // 没有更多
 .no-more {
-    padding:0 33px;
+    padding: 0 33px;
     box-sizing: border-box;
-    .at-divider__content{
+
+    .at-divider__content {
         background-color: #f9f9f9;
     }
 }

src/pages/memberSub/storeManagement/index.jsx

@@ -137,7 +137,7 @@ export default class Index extends Component {
     });
   }
   render() {
-    const { shopDetail, productList, loading, isNoMore } = this.state;
+    const { shopDetail, productList, loading, isNoMore,isShare } = this.state;
     return (
       <View className="index">
         {/* 头部卡片 */}
@@ -177,7 +177,7 @@ export default class Index extends Component {
           {productList && (
             <View className="product-card-list">
               {productList.map((product) => (
-                <ProductCard key={product.id} product={product} />
+                <ProductCard key={product.id} product={product} isShare={isShare}/>
               ))}
             </View>
           )}