Merge branch 'master' into dev

dist/_nuxt/3092e70e6fd805f4e5bc.css

@@ -0,0 +1 @@
+.i-title[data-v-309bb20a]{margin:0 0 10px 10px;font-size:20px;font-weight:600}.table[data-v-309bb20a]{height:calc(100% - 80px)}.text-title[data-v-309bb20a]{font-weight:600}.header-bar>div[data-v-309bb20a]{margin-bottom:5px}.green[data-v-309bb20a]{color:#259b24}.orange[data-v-309bb20a]{color:#ff9800}.red[data-v-309bb20a]{color:#ff021e}

dist/_nuxt/634d736965e662dad7ed.css

@@ -1 +0,0 @@
-.i-title[data-v-7164a11c]{margin:0 0 10px 10px;font-size:20px;font-weight:600}.table[data-v-7164a11c]{height:calc(100% - 80px)}.text-title[data-v-7164a11c]{font-weight:600}.header-bar>div[data-v-7164a11c]{margin-bottom:5px}.green[data-v-7164a11c]{color:#259b24}.orange[data-v-7164a11c]{color:#ff9800}.red[data-v-7164a11c]{color:#ff021e}

dist/_nuxt/75fa376221c1ed9ff22a.css

@@ -1 +0,0 @@
-.table[data-v-4a5ccbf0]{height:100%;height:calc(100% - 80px)}

dist/_nuxt/abe6b6afa3f9e3cafec0.css

@@ -0,0 +1 @@
+.table[data-v-02932408]{height:100%;height:calc(100% - 80px)}

pages/main/index/gongmall.vue

@@ -165,10 +165,10 @@ export default {
             (rData.projectList[i.entity_id]?rData.projectList[i.entity_id].origin_price || 0:0) / 100
           ).toFixed(2);
           servicePay = (
-            (rData.periodList[i.entity_id].person_platform_fee || 0) / 100
+            (rData.periodList[i.entity_id]?rData.periodList[i.entity_id].person_platform_fee  || 0:0) / 100
           ).toFixed(2);
-          getPay = rData.periodList[i.entity_id].total_person_tax_fee || 0;
-          realGet = rData.periodList[i.entity_id].developer_fee || 0;
+          getPay = rData.periodList[i.entity_id]?rData.periodList[i.entity_id].total_person_tax_fee || 0:0;
+          realGet = rData.periodList[i.entity_id]?rData.periodList[i.entity_id].developer_fee || 0:0;
         } else {
           if (i.entity_type === "1")
             projectName = rData.projectList[i.entity_id].pro_name;
@@ -177,10 +177,10 @@ export default {
             (rData.projectList[i.entity_id]?rData.projectList[i.entity_id].origin_price || 0:0) / 100
           ).toFixed(2);
           servicePay = (
-            (rData.projectList[i.entity_id].person_platform_fee || 0) / 100
+            (rData.periodList[i.entity_id]?rData.periodList[i.entity_id].person_platform_fee  || 0:0) / 100
           ).toFixed(2);
-          getPay = rData.projectList[i.entity_id].total_person_tax_fee || 0;
-          realGet = rData.projectList[i.entity_id].developer_fee || 0;
+          getPay = rData.projectList[i.entity_id]?rData.projectList[i.entity_id].total_person_tax_fee || 0:0;
+          realGet = rData.projectList[i.entity_id]?rData.projectList[i.entity_id].developer_fee || 0:0;
         }
         return {
           ...i,

pages/main/index/project_form.vue

@@ -423,9 +423,11 @@ export default {
           this.headerBar.refund = data.refundAmount * 1;
           this.headerBar.trusteeshipCount = data.trusteeshipCount;
           this.headerBar.refundCount = data.refundCount;
-          let amount = data.trusteeshipAmount - data.refundAmount;
+
+          // let amount = data.trusteeshipAmount - data.refundAmount;
           let count = data.trusteeshipCount - data.refundCount;
-          this.headerBar.revenue = amount > 0 ? amount : 0;
+          // this.headerBar.revenue = amount > 0 ? amount : 0;
+          this.headerBar.revenue = data.revenue * 1;
           this.headerBar.revenueCount = count > 0 ? count : 0;
         }
       });
@@ -479,6 +481,7 @@ export default {
         product_type: query.product_type,          //项目类型2整包4雇佣9云端
         start_time: query.start_time,
         end_time: query.end_time,
+        order_type:1,
         date_type: query.date_type || 2,           //1到账时间2创建时间
         status: 401,                               //401订单支付成功
         artificial_mark: 0,                        //0为开启人工财务1开启
@@ -486,11 +489,11 @@ export default {
         page_size: this.pageInfo.size
 
       }
-      if (this.orderType !== "") {
-        data.order_type = this.orderType;
-      } else {
-        data.active_name = 'all';
-      }
+      // if (this.orderType !== "") {
+      //   data.order_type = this.orderType;
+      // } else {
+      //   data.active_name = 'all';
+      // }
       this.formatTitle(data.product_type);
       this.queryData = data;
       return true;