Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/sale/orderlist.vue

@@ -214,6 +214,11 @@
                   补交提成：{{ item.CommissionBack }}
                 </div>
               </template>
+              <template v-if="item.BrokerageMoney >0">
+                <div style="color:red;cursor: pointer;text-decoration: underline;" @click="gourlfy(item)">
+                  累计返佣：{{ item.BrokerageMoney}}
+                </div>
+              </template>
             </td>
             <td style="border:none;width:7%">{{ item.GuestNum }}人</td>
             <td style="border:none;width:7%">
@@ -1950,6 +1955,11 @@
           }
         }
       },
+      gourlfy(obj) {
+        this.OpenNewUrl("/financial/returnPassbook/returnpassbookStatistics", {
+              OrderId: obj.OrderId
+            });
+      },
       //合同提交审核
       goContractAudit(subItem) {
         let msg = {

src/pages/sale/myOrder.vue

@@ -84,6 +84,10 @@
         <span class="stics-name">额外奖励</span>
         <span>{{data.Statistics.ExtraRewardMoney}}</span>
       </div>
+      <div class="col stics">
+        <span class="stics-name">累计返佣</span>
+        <span>{{ data.Statistics.BrokerageMoney }}</span>
+      </div>
     </div>
     <div class="row col" style="justify-content: flex-end">
       <div class="row tis">

src/pages/sale/orderStatistics.vue

@@ -120,6 +120,10 @@
         <span class="stics-name">额外奖励</span>
         <span>{{ data.Statistics.ExtraRewardMoney }}</span>
       </div>
+      <div class="col stics">
+        <span class="stics-name">累计返佣</span>
+        <span>{{ data.Statistics.BrokerageMoney }}</span>
+      </div>
     </div>
     <div class="row col" style="justify-content: flex-end">
       <div class="row tis">

src/pages/sale/studyOrder.vue

@@ -61,6 +61,10 @@
         <span class="stics-name">额外奖励</span>
         <span>{{data.Statistics.ExtraRewardMoney}}</span>
       </div>
+      <div class="col stics">
+        <span class="stics-name">累计返佣</span>
+        <span>{{ data.Statistics.BrokerageMoney }}</span>
+      </div>
     </div>
     <div class="row col" style="justify-content: flex-end">
       <div class="row tis">

src/pages/sale/studyOrderStatistics.vue

@@ -70,6 +70,10 @@
         <span class="stics-name">额外奖励</span>
         <span>{{data.Statistics.ExtraRewardMoney}}</span>
       </div>
+      <div class="col stics">
+        <span class="stics-name">累计返佣</span>
+        <span>{{ data.Statistics.BrokerageMoney }}</span>
+      </div>
     </div>
     <div class="row col" style="justify-content: flex-end">
       <div class="row tis">