Merge branch 'master-v' into dev

dist/_nuxt/033f35dddefc793a52d8.css

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

dist/_nuxt/3092e70e6fd805f4e5bc.css

@@ -1 +0,0 @@
-.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}

pages/main/index/project_form.vue

@@ -419,15 +419,15 @@ export default {
       this.$post("/api/admin/ReportForm/getFormBar", data).then(res => {
         let data = res.data;
         if (res.status === 1) {
-          this.headerBar.trusteeship = data.trusteeshipAmount * 1;
-          this.headerBar.refund = data.refundAmount * 1;
+          this.headerBar.trusteeship = (data.trusteeshipAmount * 1).toFixed(2);
+          this.headerBar.refund = (data.refundAmount * 1).toFixed(2);
           this.headerBar.trusteeshipCount = data.trusteeshipCount;
           this.headerBar.refundCount = data.refundCount;
 
           // let amount = data.trusteeshipAmount - data.refundAmount;
           let count = data.trusteeshipCount - data.refundCount;
           // this.headerBar.revenue = amount > 0 ? amount : 0;
-          this.headerBar.revenue = data.revenue * 1;
+          this.headerBar.revenue = (data.revenue * 1).toFixed(2);
           this.headerBar.revenueCount = count > 0 ? count : 0;
         }
       });
@@ -481,7 +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,
+        // order_type:1,
         date_type: query.date_type || 2,           //1到账时间2创建时间
         status: 401,                               //401订单支付成功
         artificial_mark: 0,                        //0为开启人工财务1开启
@@ -489,11 +489,12 @@ 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';
+        data.order_type = 1;
+      }
       this.formatTitle(data.product_type);
       this.queryData = data;
       return true;