From ee2213fe0d27bb8c32592a5a80acd96720760340 Mon Sep 17 00:00:00 2001
From: xuechunyuan <17853500702@163.com>
Date: Fri, 25 Aug 2023 17:26:53 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E8=97=8F=E9=A1=B6=E9=83=A8=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=A1=86=EF=BC=8C=E8=AE=A2=E5=8D=95=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E9=80=BB=E8=BE=91=E5=88=A4=E6=96=AD=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3=EF=BC=8C=E4=BC=98=E5=8C=96=E8=AE=A2=E5=8D=95=E5=BE=85?=
 =?UTF-8?q?=E6=94=B6=E8=B4=A7=E6=96=87=E6=9C=AC=E6=A0=B7=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                     |  1 +
 src/store/modules/common.js    |  2 +-
 src/views/order/index.vue      | 10 +++++-----
 src/views/statistics/index.vue |  2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 07c8fe4..8c3a7bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ yarn-error.log*
 *.sln
 *.sw*
 *.lock
+*.zip
diff --git a/src/store/modules/common.js b/src/store/modules/common.js
index ec24a59..93d5e1f 100644
--- a/src/store/modules/common.js
+++ b/src/store/modules/common.js
@@ -18,7 +18,7 @@ const common = {
     showTag: true,
     showDebug: true,
     showCollapse: true,
-    showSearch: true,
+    showSearch: false,
     showLock: true,
     showFullScren: true,
     showTheme: true,
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index 00588eb..0c035cd 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -28,7 +28,7 @@
         </el-select>
       </template> -->
       <template slot-scope="scope" slot="nameSearch">
-        <el-input v-model="form.name" placeholder="请输入来访人姓名"></el-input>
+        <el-input v-model="form.name" placeholder="请输入购买人昵称"></el-input>
       </template>
       <template slot-scope="scope" slot="phonenumberSearch">
         <el-input
@@ -45,7 +45,7 @@
       <template slot-scope="{ row }" slot="menu">
         <el-button type="text" icon="el-icon-view" size="small" @click="handleDetail(row)">查看详情</el-button>
         <!-- <el-button size="small" @click="handleDelete(row)">删除</el-button> -->
-        <el-button type="text" icon="el-icon-s-promotion" :disabled='row.status == 1 || row.status == 3 ||  row.status == 4'  size="small" @click="handleSend(row)">发货</el-button>
+        <el-button type="text" icon="el-icon-s-promotion" :disabled='row.status != 2'  size="small" @click="handleSend(row)">发货</el-button>
       </template>
       <!-- <template slot-scope="scope" slot="sleepingPosture">
         <div v-show="scope.row.sleepingPosture == 1">仰睡</div>
@@ -54,7 +54,7 @@
       <template slot-scope="scope" slot="status">
         <div v-show="scope.row.status == 1">待付款</div>
         <div v-show="scope.row.status == 2">待发货</div>
-        <div v-show="scope.row.status == 3">待收货</div>
+        <div style="color:#1fb24d;" v-show="scope.row.status == 3">待收货</div>
         <div v-show="scope.row.status == 4">已完成</div>
         <div v-show="scope.row.status == 0">已取消</div>
       </template>
@@ -235,7 +235,7 @@ export default {
         delBtn: false,
         column: [
           {
-            label: "姓名",
+            label: "昵称",
             prop: "name",
             search: true,
             searchslot: true,
@@ -259,7 +259,7 @@ export default {
             // searchSpan: 4,
           },
           {
-            label: "姓名",
+            label: "昵称",
             prop: "buyerName",
             align: "center",
             overHidden:true,
diff --git a/src/views/statistics/index.vue b/src/views/statistics/index.vue
index d709410..5659c5e 100644
--- a/src/views/statistics/index.vue
+++ b/src/views/statistics/index.vue
@@ -30,7 +30,7 @@
         </el-select>
       </template>
       <template slot-scope="scope" slot="nameSearch">
-        <el-input v-model="form.name" placeholder="请输入来访人姓名"></el-input>
+        <el-input v-model="form.name" placeholder="请输入购买人姓名"></el-input>
       </template>
       <template slot-scope="scope" slot="orderNumberSearch">
         <el-input v-model="form.orderNumber" placeholder="请输入订单编号"></el-input>