签约功能

project.private.config.json

@@ -5,11 +5,18 @@
     "compileHotReLoad": false,
     "urlCheck": true
   },
-  "libVersion": "3.7.2",
+  "libVersion": "3.7.1",
   "condition": {
     "miniprogram": {
       "list": [
         {
+          "name": "pages/indexSub/productDetail/index",
+          "pathName": "pages/indexSub/productDetail/index",
+          "query": "id=2312&isHighCommission=false&isSeckill=false&shareUserId=",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
           "name": "pages/memberSub/partnerDetail/index",
           "pathName": "pages/memberSub/partnerDetail/index",
           "query": "",

src/components/index/ProductList/index.jsx

@@ -169,11 +169,19 @@ const ProductList = forwardRef((props, ref) => {
         <View key={product.id}>
           <View onClick={() => toDetail(product.id)} className="product-item">
             {isManagement && isManagementStatus && (
-              <AtCheckbox
-                options={[{ value: product.id.toString(), label: "" }]} // 确保每个复选框的 options 是独立的
-                selectedList={selectedProducts.map((id) => id.toString())}
-                onChange={(selectedList) => selectProduct(product.id)} // 传递当前 product.id
-              />
+              <View 
+                className="checkbox-wrapper" 
+                onClick={(e) => {
+                  e.stopPropagation();
+                  selectProduct(product.id);  // 直接调用 selectProduct
+                }}
+              >
+                <AtCheckbox
+                  options={[{ value: product.id.toString(), label: "" }]}
+                  selectedList={selectedProducts.map((id) => id.toString())}
+                  onChange={() => {}} // 移除这里的 onChange 处理
+                />
+              </View>
             )}
             <View className="right">
               <Image

src/components/signModal/index.jsx

@@ -0,0 +1,86 @@
+import { View, RichText, Image } from "@tarojs/components";
+import { getSign, getUserAgreement } from "../../service";
+import { AtCheckbox } from "taro-ui";
+import "./index.less";
+import Taro from "@tarojs/taro";
+import sign from "../../images/productDetail/sign.png";
+import close from "../../images/productDetail/close.png";
+import { useState, useEffect } from "react";
+
+// 签约模态框组件
+export default function signModal(props) {
+  const { isOpened, onClose, isMine } = props;
+  const [agreement, setAgreement] = useState("");
+  const [isChecked, setIsChecked] = useState(false);
+  const checkboxOption = [
+    {
+      value: "agree",
+      label: "",
+    },
+  ];
+  // 获取协议
+  const getAgreement = async () => {
+    const res = await getUserAgreement({
+      type: 3,
+    });
+    setAgreement(res.content);
+  };
+  useEffect(() => {
+    getAgreement();
+  }, []);
+  // 同意协议
+  const handleCheckboxChange = (value) => {
+    setIsChecked(value.length > 0);
+  };
+  // 签约
+  const handleSign = async () => {
+    const res = await getSign({
+      type: 1,
+    });
+    // 签约后更新用户信息
+    Taro.setStorageSync("userInfo", res);
+    Taro.showToast({
+      title: '签约成功',
+      icon: "none",
+    });
+    onClose();
+  };
+  // 关闭弹窗
+  const closeModal = () => {
+    if (isChecked) {
+      Taro.setStorageSync("isShowSign", false);
+    }
+    onClose();
+  };
+  return (
+    <>
+      {isOpened && (
+        <View className="modal-container">
+          <View className="modal-mask" />
+          <View className="modal-content">
+            <Image onClick={closeModal} src={close} className="close-icon" />
+            <View className="content-box">
+              <Image src={sign} className="sign-icon" />
+              <View className="sign-title">
+                鱼市招募推广者！自购享折扣，省钱多多；分享有佣金，赚钱轻松。速来开启共赢之旅!
+              </View>
+              <View onClick={handleSign} className="btn">
+                签约
+              </View>
+              {!isMine && (
+                <View className="checkbox-container">
+                  <AtCheckbox
+                    options={checkboxOption}
+                    selectedList={isChecked ? ["agree"] : []}
+                    onChange={handleCheckboxChange}
+                  />
+                  <View className="checkbox-text">不再提示</View>
+                </View>
+              )}
+            </View>
+          </View>
+        </View>
+      )}
+    </>
+  );
+}

src/components/signModal/index.less

@@ -0,0 +1,165 @@
+.modal-container {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  z-index: 1000;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+
+.modal-mask {
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0, 0, 0, 0.6);
+}
+
+.modal-content {
+  position: relative;
+  background-color: #fff;
+  border-radius: 16px;
+  width: 80%;
+  max-width: 600px;
+  z-index: 1001;
+  animation: modalFadeIn 0.3s ease;
+
+  .content-box {
+    padding: 0 32px;
+    padding-bottom: 30px;
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    justify-content: center;
+    position: relative;
+
+    // 签约图标
+    .sign-icon {
+      width: 310px;
+      height: 413px;
+    }
+
+    // 签约标题
+    .sign-title {
+      font-size: 28px;
+      color: #3D3D3D;
+      line-height: 41px;
+      margin-top: 38px;
+    }
+
+    // 按钮
+    .btn {
+      width: 100%;
+      height: 88px;
+      background: #ffe000;
+      font-weight: 700;
+      font-size: 30px;
+      color: #000000;
+      border-radius: 80px;
+      text-align: center;
+      margin-top: 50px;
+      line-height: 88px;
+    }
+  }
+
+  // 关闭图标
+  .close-icon {
+    position: absolute;
+    bottom: -90px;
+    left: 50%;
+    transform: translateX(-50%);
+    width: 50px;
+    height: 50px;
+    z-index: 1000;
+  }
+}
+
+@keyframes modalFadeIn {
+  from {
+    opacity: 0;
+    transform: scale(0.9);
+  }
+
+  to {
+    opacity: 1;
+    transform: scale(1);
+  }
+}
+
+// 不再提示
+.checkbox-container {
+  width: 100%;
+  display: flex;
+  margin-top: 30px;
+  justify-content: center;
+
+.checkbox-text {
+  font-size: 26px;
+  line-height: 38px;
+  color: #999999;
+}
+
+.at-checkbox {
+  padding: 0;
+  background-color: #f9f9f9;
+
+  .at-checkbox__option-wrap {
+    padding: 0;
+  }
+
+  &::before {
+    content: none;
+  }
+
+  &::after {
+    content: none;
+  }
+
+  .at-checkbox__option--selected .at-checkbox__icon-cnt {
+    background-color: #f6c71a;
+    border: none;
+    width: 20px;
+    height: 20px;
+  }
+
+  &__option {
+    padding: 0;
+    margin-bottom: 0;
+  }
+
+  &__option:active {
+    background-color: transparent;
+  }
+
+  .at-icon-check {
+    height: 18px;
+    width: 18px;
+    font-size: 18px;
+  }
+
+  .at-checkbox__icon-cnt {
+    height: 20px;
+    width: 20px;
+    min-width: 20px;
+    border: 1px solid #919191;
+    box-sizing: border-box;
+    margin-right: 16px;
+    margin-top: 8px;
+  }
+
+
+}
+
+.at-checkbox__icon--checked {
+  box-shadow: none;
+  transition: none;
+}
+}
+
+.modal-wrapper {
+  position: relative;
+}

src/pages/index/index.jsx

@@ -42,10 +42,10 @@ export default class Index extends Component {
   };
   // 轮播图点击
   handleBannerClick = (item) => {
-    if(item.type_jpath==1){
+    if (item.type_jpath == 1) {
       Taro.navigateTo({
-        url: `${item.jpath}?isBanner=true`
-      })
+        url: `${item.jpath}?isBanner=true`,
+      });
     }
   };
   // 修改 tab 切换处理函数
@@ -66,9 +66,9 @@ export default class Index extends Component {
               Taro.pageScrollTo({
                 scrollTop: top - 40,
                 duration: 300,
-                complete:()=>{
+                complete: () => {
                   this.getProductList(true);
-                }
+                },
               });
             } else {
               console.warn("未找到 .product-list-wrap 元素");
@@ -127,7 +127,7 @@ export default class Index extends Component {
       <View className="index">
         <View
           className="header"
-          style={{ paddingTop: Taro.navigationBarHeight + "px" }}
+          style={{ paddingTop: Taro.navigationBarHeight + 10 + "px" }}
         >
           <View className="header-content">
             <Image
@@ -165,12 +165,17 @@ export default class Index extends Component {
               circular
               autoplay
               indicatorDots
-              indicatorColor="#e8e8e8"banner
+              indicatorColor="#e8e8e8"
+              banner
               indicatorActiveColor="#ffffff"
             >
               {homeData.banner &&
                 homeData.banner.map((item) => (
-                  <SwiperItem onClick={() => this.handleBannerClick(item)} className="banner-item" key={item.id}>
+                  <SwiperItem
+                    onClick={() => this.handleBannerClick(item)}
+                    className="banner-item"
+                    key={item.id}
+                  >
                     <Image
                       className="banner-img"
                       src={item.img}

src/pages/index/index.less

@@ -6,7 +6,6 @@
   .header {
     width: 100%;
     position: relative;
-
     &::before {
       content: '';
       position: absolute;

src/pages/indexSub/productDetail/index.jsx

@@ -21,6 +21,7 @@ import share from "../../../images/productDetail/share.png";
 import ProductCard from "../../../components/ProductCard"; //产品卡片
 import Modal from "../../../components/Modal"; //弹窗
 import ShareModal from "../../../components/shareModal"; //分享弹窗
+import SignModal from "../../../components/signModal"; //签约弹窗
 export default class Index extends Component {
   state = {
     id: "", //商品id
@@ -69,6 +70,9 @@ export default class Index extends Component {
     });
     const { id, isShare, isHighCommission, isSeckill, shareJump, shareUserId } =
       Taro.getCurrentInstance().router.params;
+      let session_key = Taro.getStorageSync("session_key");
+      let userInfo = Taro.getStorageSync("userInfo");
+      let isShowSign = Taro.getStorageSync("isShowSign");
     this.setState(
       {
         id,
@@ -86,7 +90,6 @@ export default class Index extends Component {
           });
         this.fetchProductDetails(id); //获取产品详情
         this.getProductLikeList(); //获取猜你喜欢列表
-        let session_key = Taro.getStorageSync("session_key");
         if (session_key && shareJump) {
           this.bindShareJump(); //绑定分享跳转标识
         }
@@ -95,6 +98,12 @@ export default class Index extends Component {
         }
       }
     );
+    // 判断是否显示签约弹窗
+    if (session_key && isShowSign!==false && userInfo && userInfo.user_identity == 0) {
+      this.setState({
+        isOpened: "sign",
+      });
+    }
   }
   // 复制商品编号
   handleCopy = (text) => {
@@ -362,6 +371,12 @@ export default class Index extends Component {
             onShareTitleChange={this.handleShareTitleChange}
           />
         )}
+        {/* 签约弹窗 */}
+        <SignModal isOpened={this.state.isOpened == "sign"} onClose={() => {
+          this.setState({
+            isOpened: "",
+          });
+        }}/>
       </View>
     );
   }

src/pages/login/index.jsx

@@ -115,7 +115,7 @@ export default class Index extends Component {
             您暂时未获取微信授权，将无法正常使用小程序的功能。请先阅读且同意《鱼市平台用户协议》后再授权登录。
           </View>
           {/* <Button open-type="getPhoneNumber" onGetPhoneNumber={this.handleGetPhoneNumber} className="login-button">授权登录</Button> */}
-          <View className="checkbox-container">
+          <View className="checkbox-login-container">
             <AtCheckbox
               options={checkboxOption}
               selectedList={this.state.isChecked ? ["agree"] : []}

src/pages/login/index.less

@@ -54,7 +54,7 @@
     }
 }
 
-.checkbox-container {
+.checkbox-login-container {
     width: 100%;
     display: flex;
     margin-top: 21px;

src/pages/mine/index.jsx

@@ -8,9 +8,17 @@ import loginOut from "../../images/mine/loginOut.png";
 import edit from "../../images/mine/edit.png";
 import norm from "../../images/mine/norm.png";
 import avatar from "../../images/mine/avatar.png";
+import sign from "../../images/mine/sign.png";
+import SignModal from "../../components/signModal";
+import levelOne from "../../images/mine/levelOne.png";
+import levelTwo from "../../images/mine/levelTwo.png";
+import levelThree from "../../images/mine/levelThree.png";
+import levelFour from "../../images/mine/levelFour.png";
+import levelFive from "../../images/mine/levelFive.png";
 export default class Index extends Component {
   state = {
     userInfo: {}, //用户信息
+    isOpened: false, //是否打开弹窗
   };
   // 退出登录
   handleLogout = () => {
@@ -31,10 +39,10 @@ export default class Index extends Component {
       },
     });
   };
-  componentDidShow(){
-    const session_key = Taro.getStorageSync('session_key')
-    if(session_key){
-      this.getUserInfo()
+  componentDidShow() {
+    const session_key = Taro.getStorageSync("session_key");
+    if (session_key) {
+      this.getUserInfo();
     }
   }
   // 获取用户信息
@@ -46,24 +54,49 @@ export default class Index extends Component {
     });
   };
   // 去登录
-  Login = () => {   
+  Login = () => {
     if (!Taro.getStorageSync("session_key")) {
       Taro.reLaunch({
         url: "/pages/login/index",
       });
     }
   };
+  // 合作签约
+  handleSign = () => {
+    let session_key = Taro.getStorageSync("session_key");
+    if (session_key && this.state.userInfo.user_identity === 0) {
+      this.setState({
+        isOpened: true,
+      });
+    } else {
+      Taro.showToast({
+        title: "您已签约",
+        icon: "none",
+      });
+    }
+  };
   render() {
-    const { userInfo } = this.state;
+    const { userInfo, isOpened } = this.state;
     return (
       <View className="index">
         {/* 个人信息 */}
         <View className="info">
-          <Image src={userInfo.icon?userInfo.icon:avatar} className="avatar" />
+          <Image
+            src={userInfo.icon ? userInfo.icon : avatar}
+            className="avatar"
+          />
           <View className="info-right">
             <View className="user-info">
-              <View onClick={this.Login} className="name">{userInfo.name?userInfo.name:'去登录'}</View>
-              <View className="account">{userInfo.id?userInfo.id:'XXXX'}</View>
+              <View onClick={this.Login} className="name">
+                {userInfo.name ? userInfo.name : "去登录"}
+                {userInfo.user_identity === 1 && (
+                  <View className="level-box">
+                    <Image src={levelOne} className="level-icon" />
+                    <Text className="level-text">Lv 1</Text>
+                  </View>
+                )}
+              </View>
+              <View className="account">{userInfo.id ? userInfo.id : ""}</View>
             </View>
             <Image
               onClick={() =>
@@ -79,6 +112,13 @@ export default class Index extends Component {
           <AtList hasBorder={false}>
             <AtListItem
               hasBorder={false}
+              onClick={this.handleSign}
+              title="合作签约"
+              arrow="right"
+              thumb={sign}
+            />
+            <AtListItem
+              hasBorder={false}
               onClick={() =>
                 Taro.navigateTo({
                   url: `/pages/mineSub/userSpecification/index`,
@@ -98,6 +138,12 @@ export default class Index extends Component {
             /> */}
           </AtList>
         </View>
+        {/* 签约弹窗 */}
+        <SignModal
+          isMine={true}
+          isOpened={isOpened}
+          onClose={() => this.setState({ isOpened: false })}
+        />
       </View>
     );
   }

src/pages/mine/index.less

@@ -31,6 +31,34 @@
                 .name {
                     font-size: 34px;
                     line-height: 49px;
+                    display: flex;
+                    align-items: center;
+                    justify-content: center;
+
+                    .level-box {
+                        display: flex;
+                        align-items: center;
+                        justify-content: center;
+                        position: relative;
+                        margin-left: 11px;
+                        width: 42px;
+                        height: 49px;
+
+                        .level-text {
+                            font-weight: 700;
+                            font-size: 16px;
+                            color: #8AA6F1;
+                            z-index: 1;
+                        }
+
+                        .level-icon {
+                            width: 100%;
+                            height: 100%;
+                            position: absolute;
+                            top: 0;
+                            left: 0;
+                        }
+                    }
                 }
 
                 .account {
@@ -51,11 +79,13 @@
         border-radius: 20px;
         overflow: hidden;
         background-color: #ffffff;
-        .line{
+
+        .line {
             margin: 0 17px;
             height: 1px;
             background-color: #D8D8D8;
         }
+
         .at-list__item .item-extra__icon-arrow {
             font-size: 44px;
         }
@@ -69,7 +99,8 @@
             font-size: 28px;
             color: #000000;
         }
-        .at-list__item{
+
+        .at-list__item {
             padding: 31px 17px;
         }
     }

src/service/index.js

@@ -57,6 +57,13 @@ export const getSearchProductList = data =>
     method: 'POST',
     data,
   })
+// 签约
+export const getSign = data =>
+  Request({
+    url: '/user/user_sign_contract',
+    method: 'POST',
+    data,
+  })
 // -------------------------------------------------------------用户
 // 获取用户详情
 export const getUserInfo = data =>
@@ -79,15 +86,15 @@ export const getUserAgreement = data =>
     method: 'POST',
     data,
   })
-  // 获取分享跳转标识
+// 获取分享跳转标识
 export const getShareJump = data =>
   Request({
     url: '/user/get_not_oneself_store_detail',
     method: 'POST',
     data,
   })
-  // 绑定分享跳转标识
-  export const bindShareJump = data =>
+// 绑定分享跳转标识
+export const bindShareJump = data =>
   Request({
     url: '/user/get_share_unique_value',
     method: 'POST',
@@ -115,14 +122,14 @@ export const getMyShopList = data =>
     method: 'POST',
     data,
   })
-  // 非店长获取店铺详情
+// 非店长获取店铺详情
 export const getShareShopDetail = data =>
   Request({
     url: '/vip/get_not_oneself_store_detail',
     method: 'POST',
     data,
   })
-  // 非店长获取店铺商品数据列表
+// 非店长获取店铺商品数据列表
 export const getShareShopProductList = data =>
   Request({
     url: '/vip/get_not_oneself_store_data_list',
@@ -157,36 +164,36 @@ export const updateProductSort = data =>
     method: 'POST',
     data,
   })
-  // 收益订单tab
-  export const getEarningsOrderTab = data =>
+// 收益订单tab
+export const getEarningsOrderTab = data =>
   Request({
     url: '/vip/get_income_order_tabs',
     method: 'POST',
     data,
   })
-  // 收益订单
-  export const getEarningsOrderList = data =>
+// 收益订单
+export const getEarningsOrderList = data =>
   Request({
     url: '/vip/get_income_order_data',
     method: 'POST',
     data,
   })
-  // 收益详情
-  export const getEarningsDetail = data =>
+// 收益详情
+export const getEarningsDetail = data =>
   Request({
     url: '/vip/get_income_order_detail',
     method: 'POST',
     data,
   })
-  // 获取我的伙伴信息列表
-  export const getMyPartnerList = data =>
+// 获取我的伙伴信息列表
+export const getMyPartnerList = data =>
   Request({
     url: '/vip/get_user_partner_list',
     method: 'POST',
     data,
   })
-  // 获取伙伴详情
-  export const getPartnerDetail = data =>
+// 获取伙伴详情
+export const getPartnerDetail = data =>
   Request({
     url: '/vip/get_user_partner_detail',
     method: 'POST',
@@ -200,9 +207,9 @@ export const login = data =>
     method: 'POST',
     data,
   })
-  // ---------------------------------------埋点
-  // 埋点
-  export const addLog = data =>
+// ---------------------------------------埋点
+// 埋点
+export const addLog = data =>
   Request({
     url: '/user/user_goods_statistics',
     method: 'POST',