diff --git a/src/views/reports/productOrder.vue b/src/views/reports/productOrder.vue
index e4b9852..e426460 100644
--- a/src/views/reports/productOrder.vue
+++ b/src/views/reports/productOrder.vue
@@ -7,11 +7,12 @@
       </lx-header>
     </div>
     <div style="margin-bottom:20px">
-      <el-date-picker  v-model="dateRange" type="daterange" value-format="yyyy-MM-dd" range-separator="至"
+      <el-date-picker v-model="dateRange" type="daterange" value-format="yyyy-MM-dd" range-separator="至"
         start-placeholder="开始日期" end-placeholder="结束日期" @change="dateChange">
       </el-date-picker>
     </div>
-    <xy-table :isPage='false' :list="list" :table-item="table">
+    <xy-table :isPage='false' :sumText="'合计'" :showSummary='true' :summaryMethod='summaryMethod' :list="list"
+      :table-item="table">
       <template slot="btns">
         <div></div>
       </template>
@@ -33,11 +34,11 @@
     data() {
       return {
         select: {
-          start_date:'2000-01-01',
-          end_date:""
-        },
-        today:'',
-        dateRange:[],
+          start_date: '2000-01-01',
+          end_date: ""
+        },
+        today: '',
+        dateRange: [],
         list: [],
         table: [{
             prop: 'name',
@@ -53,11 +54,11 @@
             prop: 'total_order_all',
             label: '下单总订单数(不含取消)',
             width: 180
-          },
-          {
-            prop: 'total_order_cancel_all',
-            label: '下单取消数',
-            width: 180
+          },
+          {
+            prop: 'total_order_cancel_all',
+            label: '下单取消数',
+            width: 180
           },
           {
             prop: 'total_order',
@@ -80,38 +81,68 @@
         ]
       }
     },
-    methods: {
-      dateChange(e){
-        if(e){
-          this.select.start_date = e[0]
-          this.select.end_date = e[1]
-        }else{
-          this.select.start_date = '2000-01-01'
-          this.select.end_date = this.today
-        }
-        this.getTotal()
-      },
-      async initTotal(){
-        const res = await reporttotal({
-          start_date:'2000-01-01',
-          end_date:this.select.end_date
-        })
-        // this.total = res.total
-        this.list = res
+    methods: {
+      summaryMethod(param) {
+        console.log("para", param)
+        const {
+          columns,
+          data
+        } = param;
+        const sums = [];
+        columns.forEach((column, index) => {
+          if (index === 0) {
+            sums[index] = '合计';
+            return;
+          }
+          const values = data.map(item => Number(item[column.property]));
+          if (!values.every(value => isNaN(value))) {
+            sums[index] = values.reduce((prev, curr) => {
+              const value = Number(curr);
+              if (!isNaN(value)) {
+                return prev + curr;
+              } else {
+                return prev;
+              }
+            }, 0);
+            sums[index] += '';
+          } else {
+            sums[index] = '';
+          }
+        });
+
+        return sums;
+      },
+      dateChange(e) {
+        if (e) {
+          this.select.start_date = e[0]
+          this.select.end_date = e[1]
+        } else {
+          this.select.start_date = '2000-01-01'
+          this.select.end_date = this.today
+        }
+        this.getTotal()
+      },
+      async initTotal() {
+        const res = await reporttotal({
+          start_date: '2000-01-01',
+          end_date: this.select.end_date
+        })
+        // this.total = res.total
+        this.list = res
       },
       async getTotal() {
         const res = await reporttotal({
-          start_date:this.select.start_date,
-          end_date:this.select.end_date
+          start_date: this.select.start_date,
+          end_date: this.select.end_date
         })
         this.list = res
       }
     },
-    mounted() {
-      let date = new Date()
-      let month = date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1):date.getMonth()+1
-      let dateDay = date.getDate() < 10 ? '0'+(date.getDate()):date.getDate()
-      this.today = date.getFullYear()+'-'+month+'-'+dateDay
+    mounted() {
+      let date = new Date()
+      let month = date.getMonth() + 1 < 10 ? '0' + (date.getMonth() + 1) : date.getMonth() + 1
+      let dateDay = date.getDate() < 10 ? '0' + (date.getDate()) : date.getDate()
+      this.today = date.getFullYear() + '-' + month + '-' + dateDay
       this.select.end_date = this.today
       this.initTotal()
     }
diff --git a/src/views/reports/typeOrder.vue b/src/views/reports/typeOrder.vue
index 87ec3d7..e83aa29 100644
--- a/src/views/reports/typeOrder.vue
+++ b/src/views/reports/typeOrder.vue
@@ -16,7 +16,9 @@
     </div>
     <div class="totals">
       <p><span>下单人数：</span><span>{{list.add_total_members}}</span></p>
-      <p><span>下单订单数：</span><span>{{list.add_total_order}}</span></p>
+      <p><span>下单订单数：</span><span>{{list.add_total_order}}</span></p>
+      <p><span>下单取消数：</span><span>{{list.add_total_order_canceled}}</span></p>
+      <p><span>下单完成数：</span><span>{{list.add_total_order_finished}}</span></p>
       <p><span>多板块下单人数：</span><span>{{list.total_order_more_type_person}}</span></p>
     </div>
 
diff --git a/src/views/reports/userOrder.vue b/src/views/reports/userOrder.vue
index 20f5b6b..eaddce7 100644
--- a/src/views/reports/userOrder.vue
+++ b/src/views/reports/userOrder.vue
@@ -7,17 +7,17 @@
           <div class="selector">
             <div class="selector-item">
               <div class="selector-item__label">关键词：</div>
-              <Input v-model="select.keywords" clearable style="width: 200px;" placeholder="关键字搜索" />
+              <Input v-model="select.keywords" clearable style="width: 100px;" placeholder="关键字搜索" />
             </div>
             <div class="selector-item">
               <div class="selector-item__label">区域：</div>
-              <Select clearable v-model="select.area" style="width: 130px;" placeholder="选择区域搜索">
+              <Select clearable v-model="select.area" style="width: 100px;" placeholder="选择区域搜索">
                 <Option v-for="item in areas" :value="item">{{item}}</Option>
               </Select>
             </div>
             <div class="selector-item">
               <div class="selector-item__label">建卡医院：</div>
-              <Input clearable v-model="select.hospital" style="width: 200px;" placeholder="建卡医院搜索" />
+              <Input clearable v-model="select.hospital" style="width: 100px;" placeholder="建卡医院搜索" />
             </div>
             <div class="selector-item">
               <el-checkbox v-model="select.is_phone">存在手机号</el-checkbox>
@@ -33,6 +33,16 @@
                     start-placeholder="开始日期"
                     end-placeholder="结束日期">
                   </el-date-picker>
+            </div>
+            <div class="selector-item">
+              <div class="selector-item__label">核销数</div>
+              <Input clearable v-model="select.write_off" style="width: 50px;margin:0 3px" placeholder="" />
+              <div class="selector-item__label">及以上</div>
+            </div>
+            <div class="selector-item">
+              <div class="selector-item__label">下单数</div>
+              <Input clearable v-model="select.order_count" style="width: 50px;margin:0 3px" placeholder="" />
+              <div class="selector-item__label">及以上</div>
             </div>
             <div class="selector-item">
               <Button type="primary" @click="doSearch">查询</Button>
@@ -83,7 +93,9 @@
           hospital: "",
           is_phone: true,
           create_time:'',
-          over_time:''
+          over_time:'',
+          order_count:'',
+          write_off:''
         },
         dateRange:[],
         areas: ["吴中区", "吴江区", "姑苏区", "工业园区", "高新区", "相城区", "昆山", "常熟", "张家港", "太仓"],
@@ -256,7 +268,9 @@
               area: this.select.area,
               is_phone: this.select.is_phone ? 1 : "",
               create_time:this.select.create_time,
-              over_time:this.select.over_time
+              over_time:this.select.over_time,
+              write_off:this.select.write_off,
+              order_count:this.select.order_count
             })
             this.total = res.total
             this.list = res.data