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

* 'master' of http://code.qutaovip.com/lihai/fish_app:
  自购&&隐藏导购等级

project.private.config.json

@@ -10,6 +10,13 @@
     "miniprogram": {
       "list": [
         {
+          "name": "pages/memberSub/cashOut/index",
+          "pathName": "pages/memberSub/cashOut/index",
+          "query": "",
+          "launchMode": "default",
+          "scene": null
+        },
+        {
           "name": "pages/indexSub/productDetail/index",
           "pathName": "pages/indexSub/productDetail/index",
           "query": "id=2312&isHighCommission=false&isSeckill=false&shareUserId=",

src/common/share.js

@@ -1,5 +1,5 @@
 const shareConfig = {
-    title: '默认分享标题',
+    title: '鱼市',
     path: '/pages/index/index',
     imageUrl: '',
   };

src/components/index/ProductList/index.jsx

@@ -240,9 +240,18 @@ const ProductList = forwardRef((props, ref) => {
                 </View>
                 <View className="profit-line">
                   <View className="save-money">
+                  <Image className="bg" src={saveMoneyBg} mode="aspectFit" />
+                    <View className="content">
+                        <Text className="label">自购省</Text>
+                        <Text className="money">
+                          ¥{product.estimated_commission}
+                        </Text>
+                    </View>
+                  </View>
+                  {/* <View className="save-money">
                     <Image className="bg" src={saveMoneyBg} mode="aspectFit" />
                     <View className="content">立 即 购 买</View>
-                  </View>
+                  </View> */}
                   <View className="share-earn">
                     <Image className="bg" src={shareEarnBg} mode="aspectFit" />
                     <View className="content">

src/components/index/ProductList/index.less

@@ -133,16 +133,17 @@
 
         .save-money {
           color: #F6C71A;
-          display: flex;
-          align-items: center;
-          justify-content: center;
-          .content {
-            width: 74px;
-            height: 88px;
-            font-size: 28px;
-            line-height: 41px;
-            text-align: center;
-          }
+          // color: #F6C71A;
+          // display: flex;
+          // align-items: center;
+          // justify-content: center;
+          // .content {
+          //   width: 74px;
+          //   height: 88px;
+          //   font-size: 28px;
+          //   line-height: 41px;
+          //   text-align: center;
+          // }
         }
 
         .share-earn {

src/pages/indexSub/productDetail/index.jsx

@@ -335,8 +335,8 @@ export default class Index extends Component {
                   onClick={this.handleBuy}
                   className="bottom-buy-right-share"
                 >
-                  {/* <Image src={selfBuy} mode="aspectFit" /> */}
-                  <Text className="bottom-buy-text">立即购买</Text>
+                  <Image src={selfBuy} mode="aspectFit" />
+                  <Text className="bottom-buy-text">自购省</Text>
                 </View>
               </>
             ) : (

src/pages/memberSub/earningsOrder/index.jsx

@@ -210,7 +210,7 @@ export default class Index extends Component {
                 </Text>
                 {orderType == 2 && (
                   <View className="promotion-info">
-                    <View className="tag">推广收入</View>
+                    <View className="tag">预估收入</View>
                     <Text className="amount">¥{item.assess_amount_text}</Text>
                   </View>
                 )}

src/pages/memberSub/myPartner/index.jsx

@@ -50,10 +50,10 @@ export default class Index extends Component {
               </View>
               <View className="partner-item-top-right">
                 <View className="name">{item.name}</View>
-                <View className="level">
+                {/* <View className="level">
                   <Image src={level} className="level-icon" />
                   <Text className="level-text">导购员</Text>
-                </View>
+                </View> */}
               </View>
               <View onClick={() => Taro.navigateTo({ url: `/pages/memberSub/partnerDetail/index?id=${item.id}` })} className="detail">详情
                 <AtIcon value='chevron-right' size='10' color='#A1A1A1'></AtIcon>

src/pages/memberSub/partnerDetail/index.jsx

@@ -80,10 +80,10 @@ export default class Index extends Component {
             <View className="header">
               <View className="header-left">
                 <Text className="name">{partnerDetail.name}</Text>
-                <View className="level">
+                {/* <View className="level">
                   <Image className="level-icon" src={level} />
                   <Text className="level-text">导购员</Text>
-                </View>
+                </View> */}
               </View>
               <View className="header-right">
                 <Image className="header-right-avatar" src={partnerDetail.icon} />

src/pages/mine/index.jsx

@@ -89,12 +89,12 @@ export default class Index extends Component {
             <View className="user-info">
               <View onClick={this.Login} className="name">
                 {userInfo.name ? userInfo.name : "去登录"}
-                {userInfo.user_identity === 1 && (
+                {/* {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>