From 261aa615f3e5926a52dd8299b15111c706184e98 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B0=A2=E6=AC=A3=E6=82=A6?= <2289014031@qq.com>
Date: Thu, 29 Aug 2024 19:16:51 +0800
Subject: [PATCH] Revert "ok"

This reverts commit 0d078797e5f25241e31432128b356cd60dab33f5.
---
 src/views/market/orders/index.vue | 72 ++++++++++---------------------
 vue.config.js                     |  2 +-
 2 files changed, 23 insertions(+), 51 deletions(-)

diff --git a/src/views/market/orders/index.vue b/src/views/market/orders/index.vue
index 27436ad..98d63a6 100644
--- a/src/views/market/orders/index.vue
+++ b/src/views/market/orders/index.vue
@@ -6,30 +6,24 @@
         <el-button style="float: right; padding: 3px 30px" type="text" @click="findShop">查询结果</el-button>
         <el-button style="float: right; padding: 3px 10px" type="text" @click="chong">重置</el-button>
       </div>
-
       <div class="text item">
         <el-form ref="form" :model="orders" label-width="100px">
           <el-form-item>
-            输入搜索： <el-input v-model="orders.productName" placeholder="商品名称" style="width: 180px;margin-right: 50px"></el-input>
-            订单编号： <el-input v-model="orders.ordersNum" placeholder="编号" style="width: 180px;margin-right: 50px"></el-input>
-            订单款项状态：
-            <el-select v-model="orders.ordersState" placeholder="请选择状态" style="margin-right: 30px" clearable>
-              <el-option v-for="item in options"
-                         :key="item.value"
-                         :label="item.label"
-                         :value="item.value">
-              </el-option>
-            </el-select>
-            <br/> <br/>
-            选择时间:
-            <el-date-picker v-model="orders.startDate" type="date" placeholder="开始时间" />
-            -----
-            <el-date-picker v-model="orders.endDate" type="date" placeholder="结束时间"/>
-           </el-form-item>
+            输入搜索：<el-input v-model="orders.productName" placeholder="商品名称" style="width: 180px;margin-right: 50px"></el-input>
+            订单编号：<el-input v-model="orders.ordersNum" placeholder="编号" style="width: 180px;margin-right: 50px"></el-input>
+            <el-col :span="8">
+              <el-date-picker v-model="orders.startDate" type="date" placeholder="选择开始时间"></el-date-picker>
+              <el-col :span="8">
+              <el-date-picker v-model="orders.endDate" type="date" placeholder="选择结束时间"></el-date-picker>
+            </el-col>
+            订单款项状态：<el-select v-model="orders.ordersState" placeholder="请选择状态" style="margin-right: 30px" clearable>
+            <el-option v-for="item in orders.ordersState" :label="item.label" :value="item.value" :key="item.value"></el-option>
+          </el-select>
+          </el-form-item>
         </el-form>
       </div>
     </el-card>
-.
+
 
     <el-card class="box-card" style="width: 94%;transform: translateX(3%);margin-top: 10px">
       <div slot="header" class="clearfix">
@@ -133,31 +127,10 @@ export default {
       },
       arr:[],
       type:[],
-
       Cascader:{ expandTrigger:'hover',value:'id',label:'typeName',children:'parentPOS' },
       typeId:[],
       startDate: null,
       endDate: null,
-
-      options: [{
-        value: ' ',
-        label: '全选'
-      }, {
-        value: '0',
-        label: '待支付'
-      }, {
-        value: '1',
-        label: '已付款'
-      }, {
-        value: '2',
-        label: '未付款'
-      }, {
-        value: '3',
-        label: '售后中(申请退款) '
-      } ,{
-        value: '4',
-        label: '已退款 '
-      }]
     };
   },
   //计算属性 类似于data概念",
@@ -167,6 +140,7 @@ export default {
   //方法集合",
   methods: {
 
+    },
     // 删除
     handleDelete(orders){
       handleDelete(orders.id).then(
@@ -216,28 +190,26 @@ export default {
   },
     // 添加跳转路径
     add(){
-      this.$router.push('add')
+      this.$router.push('index')
     },
     // 多选框
     handleSelectionChange(val) {
       this.multipleSelection = val;
     },
     //商品列表
-    selectList() {
+  selectList(){
     selectList(this.orders).then(
-      res => {
-        console.log(res)
-        this.arr = res.data.list
-        this.orders.total = res.data.total
-      }
-    )
-  }
+        res => {
+          console.log(res)
+          this.arr=res.data.list
+          this.orders.total=res.data.total
+        }
+      )
   },
   //生命周期 - 创建完成（可以访问当前this实例）",
   created() {
     // this.diGui()
-      this.selectList()
-      this.selected = this.options[0].value
+    this.selectList()
   },
   //生命周期 - 挂载完成（可以访问DOM元素）",
   mounted() {
diff --git a/vue.config.js b/vue.config.js
index 6ab44f3..24fa436 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -35,7 +35,7 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        target: `http: //21.12.0.10/prod-api/`,
+        target: `http://21.12.0.10/prod-api/`,
         changeOrigin: true,
         pathRewrite: {
           ['^' + process.env.VUE_APP_BASE_API]: ''