Merge branch 'master' of http://code.qutaovip.com/lihai/fish_app

* 'master' of http://code.qutaovip.com/lihai/fish_app:
  修改自购&&分享赚显示字段
  会员页面实名认证完善

src/api/request.js

@@ -38,9 +38,6 @@ export default async (options = { method: 'GET', data: {} }) => {
       method: options.method.toUpperCase(),
     });
     const { code,data, msg } = res.data;
-    console.log('==========',options.url);
-    console.log('options',options.data);
-    console.log('res',res);
     switch (code) {
       case 200:
         return data;
@@ -50,16 +47,9 @@ export default async (options = { method: 'GET', data: {} }) => {
           icon: 'none',
           mask: true,
         });
-        // throw new Error('传参有误');
-        break;
+        return Promise.reject(msg);
       case 422:
-        // Taro.showToast({
-        //   title: 'Validation Error',
-        //   icon: 'none',
-        //   mask: true,
-        // });
-        // throw new Error('Validation Error');
-        break;
+        return Promise.reject(msg);
       case 500:
         Taro.showToast({
           title: '需要登录',
@@ -79,8 +69,7 @@ export default async (options = { method: 'GET', data: {} }) => {
         Taro.reLaunch({
           url: '/pages/login/index',
         });
-        // throw new Error('需要登录');
-        break
+        return Promise.reject(msg);
       default:
         if(msg){
           Taro.showToast({
@@ -89,7 +78,7 @@ export default async (options = { method: 'GET', data: {} }) => {
             mask: true,
           });
         }
-        // throw new Error(msg || '请求失败');
+        return Promise.reject(msg);
     }
   } catch (error) {
     console.error('请求错误:', error);

src/api/request_api.js

@@ -38,9 +38,6 @@ export default async (options = { method: 'GET', data: {} }) => {
       method: options.method.toUpperCase(),
     });
     const { code, data, msg } = res.data;
-    console.log('==========', options.url);
-    console.log('options', options.data);
-    console.log('res', res);
     switch (code) {
       case 500:
         Taro.showToast({

src/components/index/ProductList/index.jsx

@@ -244,7 +244,7 @@ const ProductList = forwardRef((props, ref) => {
                     <View className="content">
                         <Text className="label">自购省</Text>
                         <Text className="money">
-                          ¥{product.estimated_commission}
+                          ¥{product.estimated_commission_promotion}
                         </Text>
                     </View>
                   </View>
@@ -260,7 +260,7 @@ const ProductList = forwardRef((props, ref) => {
                       >
                         <Text className="label">分享赚</Text>
                         <Text className="money">
-                          ¥{product.estimated_commission}
+                          ¥{product.estimated_commission_buy}
                         </Text>
                       </Button>
                     </View>

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 + 10 + "px" }}
+          style={{ paddingTop: Taro.navigationBarHeight + "px" }}
         >
           <View className="header-content">
             <Image
@@ -165,17 +165,12 @@ 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/member/index.jsx

@@ -2,6 +2,7 @@ import { Component } from "react";
 import { View, Text, Image } from "@tarojs/components";
 import { AtIcon } from "taro-ui";
 import { getVipInfo } from "../../service";
+import { get_my_worker_info } from "../../service/money_api";
 import Taro from "@tarojs/taro";
 import "./index.less";
 import vip from "../../images/member/vip.png";
@@ -32,7 +33,6 @@ export default class Index extends Component {
         isAlipay: false
       })
     }
-    console.log(res, 'res');
   }
 
   // 获取会员首页数据
@@ -53,6 +53,7 @@ export default class Index extends Component {
   componentDidShow () {
     if (Taro.getStorageSync("session_key")) {
       this.getVipInfo(); //获取会员首页数据
+      this.getWorkerInfo(); //获取签约信息
     }
   }
   // 去订单列表

src/pages/memberSub/cashOut/index.jsx

@@ -132,7 +132,7 @@ export default class Index extends Component {
             <AtListItem hasBorder={false} onClick={() => Taro.navigateTo({ url: `/pages/memberSub/Alipay/index` })} title='提现认证' arrow='right' />
             <View className='line'></View>
             <AtListItem hasBorder={false} onClick={() => Taro.navigateTo({ url: `/pages/memberSub/cashOutRecord/index` })} title='提现记录' extraText='' arrow='right' />
-            <View className='line'></View>
+            {/* <View className='line'></View> */}
             {/* <AtListItem hasBorder={false} title='支付账户' extraText='需维护支付宝账户信息' arrow='right' /> */}
             {/* <View className='line'></View> */}
             {/* <AtListItem hasBorder={false} onClick={() => Taro.navigateTo({ url: `/pages/memberSub/statementRecords/index` })} title='标题结算单记录' extraText='6月结算单已出' arrow='right' /> */}

src/pages/memberSub/earningsOrder/index.jsx

@@ -9,30 +9,33 @@ import { getEarningsOrderTab, getEarningsOrderList } from "../../../service";
 export default class Index extends Component {
   state = {
     current: 0,
-    orderType: 2,//默认为推广订单
+    orderType: 2, //默认为推广订单
     value: "", //搜索值
     tabList: [{ title: "全部" }],
     page: 1, //页数
     loading: false, //加载状态
     totalPages: 1, // 添加总页数
     isNoMore: false,
-    orderList: [],//订单列表
-    userInfo: {},//个人信息
+    orderList: [], //订单列表
+    userInfo: {}, //个人信息
   };
   componentDidShow() {
     const { router } = Taro.getCurrentInstance();
     const params = router.params;
-    this.setState({
-      orderType: params.type||2,
-    },()=>{
-      this.getEarningsOrderTab();
-    });
+    this.setState(
+      {
+        orderType: params.type || 2,
+      },
+      () => {
+        this.getEarningsOrderTab();
+      }
+    );
   }
   // 获取个人信息
   getUserInfo = async () => {
     const res = await getUserInfo();
     this.setState({ userInfo: res });
-  }
+  };
   // 获取收益订单列表
   getEarningsOrderList = async (isRefresh) => {
     const { page } = this.state;
@@ -43,18 +46,17 @@ export default class Index extends Component {
       page,
       page_size: 10,
       search_name: this.state.value,
-      user_type:this.state.orderType
+      user_type: this.state.orderType,
     });
 
-    this.setState(
-      (prevState) => ({
-        orderList: isRefresh
-          ? res.income_list
-          : [...prevState.orderList, ...res.income_list],
-        totalPages: res.total_pages,
-        loading: false,
-        isNoMore: res.total_pages <= page,
-      }));
+    this.setState((prevState) => ({
+      orderList: isRefresh
+        ? res.income_list
+        : [...prevState.orderList, ...res.income_list],
+      totalPages: res.total_pages,
+      loading: false,
+      isNoMore: res.total_pages <= page,
+    }));
   };
   // 获取收益订单tab
   getEarningsOrderTab = async () => {
@@ -62,21 +64,24 @@ export default class Index extends Component {
     const newTabList = res.tabs.map((item) => ({
       title: item,
     }));
-    this.setState({
-      tabList: newTabList,
-    },()=>{
-      this.getEarningsOrderList(true);
-    });
+    this.setState(
+      {
+        tabList: newTabList,
+      },
+      () => {
+        this.getEarningsOrderList(true);
+      }
+    );
   };
   // 订单类型切换
   handleOrderTypeClick = (type) => {
-    this.setState({ orderType: type, page: 1, value: '' },()=>{
+    this.setState({ orderType: type, page: 1, value: "" }, () => {
       this.getEarningsOrderList(true);
     });
   };
   // tab切换
   handleTabClick = (index) => {
-    this.setState({ current: index, page: 1, value: '' },()=>{
+    this.setState({ current: index, page: 1, value: "" }, () => {
       this.getEarningsOrderList(true);
     });
   };
@@ -119,15 +124,22 @@ export default class Index extends Component {
     }
   };
   render() {
-    const { current, tabList, value, orderList, loading, isNoMore, orderType } = this.state;
+    const { current, tabList, value, orderList, loading, isNoMore, orderType } =
+      this.state;
     return (
       <View className="index">
         {/* 订单类型切换 */}
         <View className="order-type-switch">
-          <View className={`order-type-item ${orderType == 2 ? "active" : ""}`} onClick={() => this.handleOrderTypeClick(2)}>
+          <View
+            className={`order-type-item ${orderType == 2 ? "active" : ""}`}
+            onClick={() => this.handleOrderTypeClick(2)}
+          >
             <Text>推广订单</Text>
           </View>
-          <View className={`order-type-item ${orderType == 1 ? "active" : ""}`} onClick={() => this.handleOrderTypeClick(1)}>
+          <View
+            className={`order-type-item ${orderType == 1 ? "active" : ""}`}
+            onClick={() => this.handleOrderTypeClick(1)}
+          >
             <Text>购买订单</Text>
           </View>
         </View>
@@ -177,49 +189,53 @@ export default class Index extends Component {
               </View>
               <Text className="pay-status">{item.state_text}</Text>
             </View> */}
-            {/* 订单信息 */}
-            <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>
-                <View className="detail-item">
-                  <Text className="label">下单时间:</Text>
-                  <Text className="value">{item.pay_time}</Text>
+              {/* 订单信息 */}
+              <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>
+                  <View className="detail-item">
+                    <Text className="label">下单时间:</Text>
+                    <Text className="value">{item.pay_time}</Text>
+                  </View>
                 </View>
-              </View>
-              {/* <View className="member-info">
+                {/* <View className="member-info">
                 <Image className="member-icon" src={vip} />
                 <Text className="member-text">闲鱼会员</Text>
               </View> */}
-            </View>
+              </View>
 
-            {/* 产品信息 */}
-            <View className="product-info">
-              <Image mode="aspectFill" className="product-image" src={item.item_pic_url} />
-              <View className="product-details">
-                <Text className="product-name">
-                  {item.item_title}
-                </Text>
-                {orderType == 2 && (
+              {/* 产品信息 */}
+              <View className="product-info">
+                <Image
+                  mode="aspectFill"
+                  className="product-image"
+                  src={item.item_pic_url}
+                />
+                <View className="product-details">
+                  <Text className="product-name">{item.item_title}</Text>
                   <View className="promotion-info">
                     <View className="tag">预估收入</View>
-                    <Text className="amount">¥{item.assess_amount_text}</Text>
+                    <Text className="amount">
+                      ¥
+                      {orderType == 2
+                        ? item.assess_amount_text_promotion_yuan
+                        : item.assess_amount_text_buy_yuan}
+                    </Text>
+                  </View>
+                  <View className="payment-info"></View>
+                  <View className="payment-info">
+                    <Text className="label">实付金额:</Text>
+                    <Text className="amount">¥{item.actual_paid_fee}</Text>
                   </View>
-                )}
-                <View className="payment-info">
-                </View>
-                <View className="payment-info">
-                  <Text className="label">实付金额:</Text>
-                  <Text className="amount">¥{item.actual_paid_fee}</Text>
-                </View>
                 </View>
               </View>
             </View>
@@ -239,11 +255,14 @@ export default class Index extends Component {
         {/* 没有更多 */}
         {isNoMore && (
           <View className="no-more">
-            <AtDivider fontSize={18} fontColor="#949494" content="我是有底线的" />
+            <AtDivider
+              fontSize={18}
+              fontColor="#949494"
+              content="我是有底线的"
+            />
           </View>
         )}
       </View>
     );
   }
 }
-

src/pages/memberSub/partnerDetail/index.jsx

@@ -162,8 +162,8 @@ 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.assess_amount_text}</Text>
+                      <View className="tag">预估收入</View>
+                      <Text className="amount">¥{item.assess_amount_text_promotion}</Text>
                     </View>
                     <View className="payment-info">
                       <Text className="label">实付金额:</Text>