viczhq 1 місяць тому
батько
коміт
35a453d3a9

+ 1 - 1
src/pages/indexSub/productDetail/index.jsx

@@ -273,7 +273,7 @@ export default class Index extends Component {
273 273
             {/* 标签区域 */}
274 274
             <View className="tag-box">
275 275
               <Text className="tag">
276
-                分享赚¥{productDetail.estimated_commission}
276
+                分享赚¥{productDetail.estimated_commission_promotion}
277 277
               </Text>
278 278
             </View>
279 279
           </View>

+ 24 - 15
src/pages/memberSub/earningsDetail/index.jsx

@@ -13,6 +13,8 @@ export default class Index extends Component {
13 13
   // 获取收益详情
14 14
   getEarningsDetail = async () => {
15 15
     const res = await getEarningsDetail();
16
+    console.log(res);
17
+    
16 18
     this.setState({ earningsDetail: res });
17 19
   }
18 20
 
@@ -28,54 +30,61 @@ export default class Index extends Component {
28 30
           <View className='earnings-list-item'>
29 31
             <View className='item-line title-one'>
30 32
               <Text className='title'>今天预估总收益</Text>
31
-              <Text className='money'>¥{today_data.assess_amount || '0.00'}</Text>
33
+              <Text className='money'>¥{Number(today_data.assess_amount_text_all)/100 || '0.00'}</Text>
32 34
             </View>
33 35
             <View className='dotted-line'></View>
34 36
             <View className='item-line title-two'>
35 37
               <Text className='title'>预估推广收益</Text>
36
-              <Text className='money'>¥{today_data.assess_amount || '0.00'}</Text>
38
+              <Text className='money'>¥{Number(today_data.assess_amount_text_promotion)/100 || '0.00'}</Text>
39
+            </View>
40
+            <View className='item-line title-two'>
41
+              <Text className='title'>预估自购收益</Text>
42
+              <Text className='money'>¥{Number(today_data.assess_amount_text_buy)/100 || '0.00'}</Text>
37 43
             </View>
38 44
           </View>
39 45
           <View className='earnings-list-item'>
40 46
             <View className='item-line title-one'>
41 47
               <Text className='title'>本月预估总收益</Text>
42
-              <Text className='money'>¥{this_month_data.assess_amount || '0.00'}</Text>
48
+              <Text className='money'>¥{Number(this_month_data.assess_amount_text_all)/100 || '0.00'}</Text>
43 49
             </View>
44 50
             <View className='dotted-line'></View>
45 51
             <View className='item-line title-two'>
46 52
               <Text className='title'>预估推广收益</Text>
47
-              <Text className='money'>¥{this_month_data.assess_amount || '0.00'}</Text>
53
+              <Text className='money'>¥{Number(this_month_data.assess_amount_text_promotion)/100 || '0.00'}</Text>
48 54
             </View>
49
-            {/* <View className='line'></View>
50 55
             <View className='item-line title-two'>
51
-              <Text className='title'>预估推广收益</Text>
52
-              <Text className='money'>¥70.00</Text>
56
+              <Text className='title'>预估自购收益</Text>
57
+              <Text className='money'>¥{Number(this_month_data.assess_amount_text_buy)/100 || '0.00'}</Text>
53 58
             </View>
54
-            <View className='item-line'>
55
-              <Text className='title'>惊喜红包</Text>
56
-              <Text className='money'>¥70.00</Text>
57
-            </View> */}
58 59
           </View>
59 60
           <View className='earnings-list-item'>
60 61
             <View className='item-line title-one'>
61 62
               <Text className='title'>上月预估总收益</Text>
62
-              <Text className='money'>¥{last_month_data.assess_amount || '0.00'}</Text>
63
+              <Text className='money'>¥{Number(last_month_data.assess_amount_text_all)/100 || '0.00'}</Text>
63 64
             </View>
64 65
             <View className='dotted-line'></View>
65 66
             <View className='item-line title-two'>
66 67
               <Text className='title'>预估推广收益</Text>
67
-              <Text className='money'>¥{last_month_data.assess_amount || '0.00'}</Text>
68
+              <Text className='money'>¥{Number(last_month_data.assess_amount_text_promotion)/100 || '0.00'}</Text>
69
+            </View>
70
+            <View className='item-line title-two'>
71
+              <Text className='title'>预估自购收益</Text>
72
+              <Text className='money'>¥{Number(last_month_data.assess_amount_text_buy)/100 || '0.00'}</Text>
68 73
             </View>
69 74
           </View>
70 75
           <View className='earnings-list-item'>
71 76
             <View className='item-line title-one'>
72 77
               <Text className='title'>历史预估总收益</Text>
73
-              <Text className='money'>¥{historical_month_data.assess_amount || '0.00'}</Text>
78
+              <Text className='money'>¥{Number(historical_month_data.assess_amount_text_all)/100 || '0.00'}</Text>
74 79
             </View>
75 80
             <View className='dotted-line'></View>
76 81
             <View className='item-line title-two'>
77 82
               <Text className='title'>预估推广收益</Text>
78
-              <Text className='money'>¥{historical_month_data.assess_amount || '0.00'}</Text>
83
+              <Text className='money'>¥{Number(historical_month_data.assess_amount_text_promotion)/100 || '0.00'}</Text>
84
+            </View>
85
+            <View className='item-line title-two'>
86
+              <Text className='title'>预估自购收益</Text>
87
+              <Text className='money'>¥{Number(historical_month_data.assess_amount_text_buy)/100 || '0.00'}</Text>
79 88
             </View>
80 89
           </View>
81 90
         </View>

+ 0 - 1
src/pages/memberSub/earningsOrder/index.jsx

@@ -231,7 +231,6 @@ export default class Index extends Component {
231 231
                         : item.assess_amount_text_buy_yuan}
232 232
                     </Text>
233 233
                   </View>
234
-                  <View className="payment-info"></View>
235 234
                   <View className="payment-info">
236 235
                     <Text className="label">实付金额:</Text>
237 236
                     <Text className="amount">¥{item.actual_paid_fee}</Text>