licc 3 napja
szülő
commit
72f7a4d29c
2 módosított fájl, 16 hozzáadás és 10 törlés
  1. 15 9
      src/views/orders/list.vue
  2. 1 1
      src/views/shop/info.vue

+ 15 - 9
src/views/orders/list.vue

@@ -22,14 +22,14 @@
 <!--                    <el-date-picker v-model="createTime" @change="setCreateTime" type="datetimerange"-->
 <!--                        range-separator="-" start-placeholder="开始时间" end-placeholder="结束时间" />-->
 <!--                </el-form-item>-->
-                <el-form-item label="下单时间" class="w-[440px]">
-                    <el-date-picker v-model="checkoutTime" @change="setCheckoutTime" type="datetimerange"
-                        range-separator="-" start-placeholder="开始时间" end-placeholder="结束时间" />
+                <el-form-item label="下单日期" class="w-[340px]">
+                    <el-date-picker v-model="checkoutTime" @change="setCheckoutTime" type="daterange"
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" />
                 </el-form-item>
                 <el-form-item class="w-[280px]">
                     <el-button type="primary" @click="resetPage">查询</el-button>
                     <el-button @click="resetParams">重置</el-button>
-                    <el-button type="success" @click="download">下载</el-button>
+                    <el-button type="success" @click="download">导出</el-button>
                 </el-form-item>
             </el-form>
         </el-card>
@@ -220,11 +220,17 @@
     }
     const setCheckoutTime = (v : any) => {
       queryParams.checkoutTime = ''
-      if (v.length > 0) {
-        queryParams.checkoutTime =
-            Math.round(v[0].getTime() / 1000).toString() +
-            ',' +
-            Math.round(v[1].getTime() / 1000).toString()
+      if (v && v.length === 2) {
+        // 开始时间保持不变
+        const startTime = Math.round(v[0].getTime() / 1000).toString()
+
+        // 结束时间设置为当天的23:59:59
+        const endDate = new Date(v[1])
+        endDate.setHours(23, 59, 59, 999)
+        console.log('End Date:', endDate) // 调试输出
+        const endTime = Math.round(endDate.getTime() / 1000).toString()
+
+        queryParams.checkoutTime = startTime + ',' + endTime
       }
     }
     // watch(queryParams, (newV, oldV) => {

+ 1 - 1
src/views/shop/info.vue

@@ -21,7 +21,7 @@
                             :rows="5"
                             type="textarea"
                             placeholder="请输入店铺介绍"
-                            maxlength="100"
+                            maxlength="90"
                             show-word-limit
                         ></el-input>
                     </div>