From cbb1d0bb177081a54c60a9e48afd41bbabd88520 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Mon, 27 Mar 2023 16:37:36 +0800
Subject: [PATCH] =?UTF-8?q?improve:=20=E6=A0=B7=E5=BC=8F=E5=8F=8A=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/src/pages/marketing/point_record/index.vue | 11 ++++++-----
 .../storeIntegralOrder/components/tableFrom.vue      | 12 +++++++-----
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/template/admin/src/pages/marketing/point_record/index.vue b/template/admin/src/pages/marketing/point_record/index.vue
index c87679487..7f5f18ddb 100644
--- a/template/admin/src/pages/marketing/point_record/index.vue
+++ b/template/admin/src/pages/marketing/point_record/index.vue
@@ -9,32 +9,33 @@
         @submit.native.prevent
       >
         <Row :gutter="24" type="flex">
-          <Col span="24">
+          <Col span="6">
             <FormItem label="订单时间：">
               <!-- <dateRadio @selectDate="onSelectDate"></dateRadio> -->
               <DatePicker
                 :editable="false"
-                :clearable="false"
                 @on-change="onchangeTime"
                 :value="timeVal"
                 format="yyyy/MM/dd"
                 type="daterange"
                 placement="bottom-start"
                 placeholder="请选择时间"
-                style="width: 200px"
+                style="width: 100%"
                 :options="options"
+                clearable
                 class="mr20"
               ></DatePicker>
             </FormItem>
           </Col>
-          <Col span="24">
+          <Col span="6">
             <FormItem label="交易类型：">
               <Select
                 type="button"
                 v-model="formValidate.trading_type"
                 class="mr15"
                 @on-change="selChange"
-                style="width: 30%"
+                style="width: 100%"
+                clearable
               >
                 <Option
                   :label="item"
diff --git a/template/admin/src/pages/marketing/storeIntegralOrder/components/tableFrom.vue b/template/admin/src/pages/marketing/storeIntegralOrder/components/tableFrom.vue
index 5f0480cd4..0e9e9689b 100644
--- a/template/admin/src/pages/marketing/storeIntegralOrder/components/tableFrom.vue
+++ b/template/admin/src/pages/marketing/storeIntegralOrder/components/tableFrom.vue
@@ -8,10 +8,10 @@
       class="tabform"
       @submit.native.prevent
     >
-      <Row :gutter="24" type="flex" justify="end">
+      <Row :gutter="24">
         <Col span="8" class="ivu-text-left">
           <FormItem label="订单状态：">
-            <RadioGroup v-model="orderData.status" type="button" @on-change="selectChange2(orderData.status)">
+            <RadioGroup v-model="orderData.status" type="button" @on-change="selectChange2(orderData.status)" style="width: 400px">
               <Radio label="">全部 {{ '(' + orderChartType.statusAll ? orderChartType.statusAll : 0 + ')' }}</Radio>
               <Radio label="1">未发货 {{ '(' + orderChartType.unshipped ? orderChartType.unshipped : 0 + ')' }}</Radio>
               <Radio label="2">待收货 {{ '(' + orderChartType.untake ? orderChartType.untake : 0 + ')' }}</Radio>
@@ -35,7 +35,9 @@
             ></DatePicker>
           </FormItem>
         </Col>
-        <Col span="8">
+      </Row>
+      <Row :gutter="24" type="flex">
+        <Col span="12">
           <div class="df">
             <FormItem label="搜索：" prop="real_name" label-for="real_name">
               <Input
@@ -268,7 +270,7 @@ export default {
   },
   watch: {
     $route() {
-      if (this.$route.fullPath === (this.$routeProStr + '/order/list?status=1')) {
+      if (this.$route.fullPath === this.$routeProStr + '/order/list?status=1') {
         this.getPath();
       }
     },
@@ -276,7 +278,7 @@ export default {
   created() {
     // this.timeVal = this.today;
     // this.orderData.data = this.timeVal.join('-');
-    if (this.$route.fullPath === (this.$routeProStr + '/order/list?status=1')) {
+    if (this.$route.fullPath === this.$routeProStr + '/order/list?status=1') {
       this.getPath();
     }
     // this.getToken();