Merge remote-tracking branch 'origin/development' into development

src/components/yunji/index.vue

@@ -2,10 +2,16 @@
   <div class="sms">
     <el-form ref="searchFrom" inline :model="searchFrom" label-width="100px">
       <el-form-item label="交易订单号">
-        <el-input v-model="searchFrom.order_id" @change="getList"></el-input>
+        <el-input v-model="searchFrom.order_id"></el-input>
+      </el-form-item>
+       <el-form-item label="购买人">
+        <el-input v-model="searchFrom.nickname"></el-input>
+      </el-form-item>
+       <el-form-item label="购买人ID">
+        <el-input v-model="searchFrom.user_id"></el-input>
       </el-form-item>
       <el-form-item label="手机号">
-        <el-input v-model="searchFrom.mobile" @change="getList"></el-input>
+        <el-input v-model="searchFrom.mobile"></el-input>
       </el-form-item>
       <el-form-item label="绑定状态">
         <el-select v-model="searchFrom.user_buy" placeholder="请选择" @change="getList" clearable>
@@ -25,30 +31,6 @@
           </el-option>
         </el-select>
       </el-form-item>
-      <!-- <el-form-item label="创建时间">
-            <el-date-picker
-              v-model="searchFrom.payTime"
-               unlink-panels
-              type="daterange"
-              value-format="yyyy-MM-dd"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              @change="getList">
-            </el-date-picker>
-          </el-form-item> -->
-      <!-- <el-form-item label="同步时间">
-            <el-date-picker
-              v-model="searchFrom.syncTime"
-               unlink-panels
-              type="daterange"
-              value-format="yyyy-MM-dd"
-              range-separator="至"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-              @change="getList">
-            </el-date-picker>
-          </el-form-item> -->
       <el-form-item>
         <el-button type="primary" @click="getList">搜索</el-button>
         <el-button type="primary" plain @click="exportTable(list)">导出</el-button>
@@ -106,7 +88,6 @@
        <el-table-column prop="num" label="预计入班人数">
       </el-table-column>
     </el-table>
-
       <span slot="footer" class="dialog-footer">
       </span>
     </el-dialog>
@@ -148,8 +129,8 @@ export default {
         mobile: "",
         order_id: "",
         teacher_id: "",
-        payTime: [],
-        syncTime: []
+        user_id:"",
+        nickname:"",
       },
       list: [],
       teacherList: [],
@@ -217,6 +198,12 @@ export default {
       };
       if (this.searchFrom.mobile) {
         json.mobile = this.searchFrom.mobile;
+      }
+       if (this.searchFrom.nickname) {
+        json.nickname = this.searchFrom.nickname;
+      }
+       if (this.searchFrom.user_id) {
+        json.user_id = this.searchFrom.user_id;
       }
       if (this.searchFrom.teacher_id) {
         json.teacher_id = this.searchFrom.teacher_id;
@@ -233,14 +220,6 @@ export default {
       if (this.searchFrom.goods_id) {
         json.goods_id = this.searchFrom.goods_id;
       }
-      if (this.searchFrom.payTime && this.searchFrom.payTime.length > 0) {
-        json.start_at = this.searchFrom.payTime[0];
-        json.end_at = this.searchFrom.payTime[1];
-      }
-      if (this.searchFrom.syncTime && this.searchFrom.syncTime.length > 0) {
-        json.pull_start_at = this.searchFrom.syncTime[0];
-        json.pull_end_at = this.searchFrom.syncTime[1];
-      }
       getyunjiApi(json).then(res => {
         this.total = res.total;
         this.list = res.list ? res.list : [];
@@ -289,21 +268,18 @@ export default {
         if (this.searchFrom.mobile) {
           json.mobile = this.searchFrom.mobile;
         }
+          if (this.searchFrom.nickname) {
+        json.nickname = this.searchFrom.nickname;
+      }
+       if (this.searchFrom.user_id) {
+        json.user_id = this.searchFrom.user_id;
+      }
         if (this.searchFrom.goods_id) {
           json.goods_id = this.searchFrom.goods_id;
         }
         if (this.searchFrom.teacher_id) {
           json.teacher_id = this.searchFrom.teacher_id;
         }
-
-        if (this.searchFrom.payTime && this.searchFrom.payTime.length > 0) {
-          json.start_at = this.searchFrom.payTime[0];
-          json.end_at = this.searchFrom.payTime[1];
-        }
-        if (this.searchFrom.syncTime && this.searchFrom.syncTime.length > 0) {
-          json.pull_start_at = this.searchFrom.syncTime[0];
-          json.pull_end_at = this.searchFrom.syncTime[1];
-        }
         exportExcelApi(`api/admin/yunji/order/export`, json);
       }
     },