storeBelieveInLight před 1 rokem
rodič
revize
43800cab24
2 změnil soubory, kde provedl 9 přidání a 8 odebrání
  1. 6 6
      pages/cashier/index.vue
  2. 3 2
      pages/cashier/latestRecords.vue

+ 6 - 6
pages/cashier/index.vue

@@ -52,7 +52,7 @@
52
     <view class="cashier-list" v-if="Number(zhuangi) != 7 ? false : true">
52
     <view class="cashier-list" v-if="Number(zhuangi) != 7 ? false : true">
53
       <view class="cashier-list-top">
53
       <view class="cashier-list-top">
54
         <view class="cashier-jilu-top" style="font-weight: bold">
54
         <view class="cashier-jilu-top" style="font-weight: bold">
55
-          总贡献值: {{ gongxian || 0 }}
55
+          总分润值: {{ gongxian || 0 }}
56
         </view>
56
         </view>
57
         <view class="cashier-jilu-top" style="font-weight: bold">
57
         <view class="cashier-jilu-top" style="font-weight: bold">
58
           总京豆: {{ jingdou || 0 }}
58
           总京豆: {{ jingdou || 0 }}
@@ -144,22 +144,22 @@
144
           </view>
144
           </view>
145
           <view class="sf"> 京豆 </view>
145
           <view class="sf"> 京豆 </view>
146
         </view>
146
         </view>
147
-         <view class="yis">
147
+         <!-- <view class="yis">
148
           <view class="sgjd">
148
           <view class="sgjd">
149
             {{
149
             {{
150
               dataList.fenrunzhi == undefined ? 0 : dataList.fenrunzhi
150
               dataList.fenrunzhi == undefined ? 0 : dataList.fenrunzhi
151
             }}
151
             }}
152
           </view>
152
           </view>
153
           <view class="sf"> 分润值 </view>
153
           <view class="sf"> 分润值 </view>
154
-        </view>
155
-        <!-- <view class="yis">
154
+        </view> -->
155
+        <view class="yis">
156
           <view class="sgjd">
156
           <view class="sgjd">
157
             {{
157
             {{
158
               dataList.gongxianSumsum == undefined ? 0 : dataList.gongxianSumsum
158
               dataList.gongxianSumsum == undefined ? 0 : dataList.gongxianSumsum
159
             }}
159
             }}
160
           </view>
160
           </view>
161
           <view class="sf"> 贡献值 </view>
161
           <view class="sf"> 贡献值 </view>
162
-        </view> -->
162
+        </view>
163
         <!-- 默认 -->
163
         <!-- 默认 -->
164
         <view class="yis">
164
         <view class="yis">
165
           <view class="sgjd"> </view>
165
           <view class="sgjd"> </view>
@@ -556,7 +556,7 @@ export default {
556
           console.log(res.data);
556
           console.log(res.data);
557
           console.log(res.data.data.list.gongxian);
557
           console.log(res.data.data.list.gongxian);
558
           if (res.data.status == 200) {
558
           if (res.data.status == 200) {
559
-            this.gongxian = res.data.data.list.gongxian;
559
+            this.gongxian = res.data.data.list.fenrunzhi || 0;
560
             this.jingdou = res.data.data.list.jingdou;
560
             this.jingdou = res.data.data.list.jingdou;
561
           }
561
           }
562
         },
562
         },

+ 3 - 2
pages/cashier/latestRecords.vue

@@ -15,7 +15,7 @@
15
         <view class="record-time">{{ item.pay_time }}</view>
15
         <view class="record-time">{{ item.pay_time }}</view>
16
         <view class="pv-info">pv: {{ item.pv }}</view>
16
         <view class="pv-info">pv: {{ item.pv }}</view>
17
         <view v-for="(reward, rewardIndex) in rewards" :key="rewardIndex" class="reward-info">
17
         <view v-for="(reward, rewardIndex) in rewards" :key="rewardIndex" class="reward-info">
18
-         {{ reward.name }} : {{ reward.type=="jingdou"?item.jingdou||0 :item.gongxian ||0}} 
18
+         {{ reward.name }} : {{ reward.type=="jingdou"?item.jingdou||0 :item.fenrunzhi ||0}} 
19
         </view>
19
         </view>
20
       </view>
20
       </view>
21
     </view>
21
     </view>
@@ -34,7 +34,8 @@ export default {
34
     return {
34
     return {
35
         isError:false,
35
         isError:false,
36
          rewards: [
36
          rewards: [
37
-            { type:"gongxian", name: '贡献值' },
37
+            // { type:"gongxian", name: '贡献值' },
38
+            { type:"fenrunzhi", name: '分润值' },
38
             { type:"jingdou", name: '京豆' }
39
             { type:"jingdou", name: '京豆' }
39
           ],
40
           ],
40
     };
41
     };