From b80265f3e88ba5f89fc8566f10f9ebc21eb3003c Mon Sep 17 00:00:00 2001
From: monanxiao <monanxiao@qq.com>
Date: Thu, 24 Oct 2024 17:57:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=AD=97=E6=AE=B5=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E5=B7=B2=E9=87=8D=E6=96=B0=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/request.js                 |  2 +-
 src/views/goods/index.vue          | 29 ++++++++++++++++++++++-------
 src/views/order/index.vue          | 10 +++++-----
 src/views/users/index.vue          | 17 +++++++++++++++++
 src/views/users/maintain.vue       | 15 +++++++++++++++
 src/views/users/reconnaissance.vue | 17 +++++++++++++++++
 6 files changed, 77 insertions(+), 13 deletions(-)

diff --git a/src/api/request.js b/src/api/request.js
index 8391f85..730d5de 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -11,7 +11,7 @@ const errorCode = {
 
 // const url = "https://repair.cpolar.top"; // 开发地址
 const url = "https://api.cqcxj.cn"; // 正式地址
-// const url = "https://cqjql.scdswj.cn:9443"; // 临时地址n
+// const url = "https://cqjql.scdswj.cn:9443"; // 临时地址
 
 const service = axios.create({
     baseURL: url,
diff --git a/src/views/goods/index.vue b/src/views/goods/index.vue
index 968d2ed..e5c164f 100644
--- a/src/views/goods/index.vue
+++ b/src/views/goods/index.vue
@@ -205,14 +205,14 @@ const formData = ref({
 })
 
 const fileBannerList = ref([]); // 轮播图
-const fileDetail = ref(); // 详情图
+const fileDetail = ref([]); // 详情图
 
 // 页面初始化
 const initData = () => {
 
   getGoodsList(queryData.value).then((res) => {
 
-    let itemData = res.data.map(item => {
+    tableData.value = res.data.map(item => {
       try {
         // 尝试将字符串转换为 JSON 对象
         item.carouselImage = JSON.parse(item.carouselImage);
@@ -222,8 +222,6 @@ const initData = () => {
       }
       return item;
     });
-
-    tableData.value = itemData;
     total.value = res.total
   })
 }
@@ -377,15 +375,30 @@ const onSubmit = () => {
     return;
   }
 
-  formData.value.carouselImage = JSON.stringify(formData.value.carouselImage); // 转为字符串
+  let params = {...formData.value}
+  params.carouselImage = JSON.stringify(params.carouselImage); // 转为字符串
 
-  addGoods(formData.value)
+  addGoods(params)
       .then((res) => {
+
+        drawer.value = false;
+
+        formData.value = {
+          goodsName: '',
+          price: '',
+          carouselImage: [],
+          details: '',
+          isList: false
+        }
+
+        fileBannerList.value = [];
+        fileDetail.value = [];
+
         ElMessage({
           message: '添加成功',
           type: 'success',
         })
-        drawer.value = false;
+
         initData();
       })
       .catch((err) => {
@@ -422,6 +435,8 @@ const cancelDrawer = () => {
     details: '',
     isList: false
   }
+  fileBannerList.value = [];
+  fileDetail.value = [];
 }
 
 // 分页切换
diff --git a/src/views/order/index.vue b/src/views/order/index.vue
index 75e4020..a8ecef2 100644
--- a/src/views/order/index.vue
+++ b/src/views/order/index.vue
@@ -81,11 +81,11 @@
       </el-form-item>
 
       <br>
-      <el-form-item label="用户昵称">
+      <el-form-item label="用户姓名">
         <el-input
             v-model="formSearch.username"
             style="max-width: 300px"
-            placeholder="用户昵称"
+            placeholder="用户姓名"
             class="input-with-select"
         />
       </el-form-item>
@@ -94,7 +94,7 @@
         <el-input
             v-model="formSearch.surveyorsName"
             style="max-width: 300px"
-            placeholder="用户昵称"
+            placeholder="工程师姓名"
             class="input-with-select"
         />
       </el-form-item>
@@ -102,7 +102,7 @@
         <el-input
             v-model="formSearch.repairerName"
             style="max-width: 300px"
-            placeholder="用户昵称"
+            placeholder="工程师姓名"
             class="input-with-select"
         />
       </el-form-item>
@@ -224,7 +224,7 @@
       </el-table-column>
 
       <el-table-column
-          label="微信昵称"
+          label="用户姓名"
           prop="username"
           width="300"
           align="center"
diff --git a/src/views/users/index.vue b/src/views/users/index.vue
index 3158f00..06f6765 100644
--- a/src/views/users/index.vue
+++ b/src/views/users/index.vue
@@ -52,6 +52,23 @@
           <el-avatar :size="50" :src="scope.row.avatar" />
         </template>
       </el-table-column>
+
+      <el-table-column
+          label="关注公众号"
+          width="300"
+          align="center"
+          show-overflow-tooltip
+      >
+        <template #default="scope">
+          <template v-if="scope.row.ampOpenid">
+            <el-tag type="success">已关注</el-tag>
+          </template>
+          <template v-else>
+            <el-tag type="info">未关注</el-tag>
+          </template>
+        </template>
+      </el-table-column>
+
       <el-table-column
           label="微信昵称"
           prop="nickName"
diff --git a/src/views/users/maintain.vue b/src/views/users/maintain.vue
index d1459f6..3c4bd08 100644
--- a/src/views/users/maintain.vue
+++ b/src/views/users/maintain.vue
@@ -67,6 +67,21 @@
           align="center"
           show-overflow-tooltip
       />
+      <el-table-column
+          label="关注公众号"
+          width="300"
+          align="center"
+          show-overflow-tooltip
+      >
+        <template #default="scope">
+          <template v-if="scope.row.ampOpenid">
+            <el-tag type="success">已关注</el-tag>
+          </template>
+          <template v-else>
+            <el-tag type="info">未关注</el-tag>
+          </template>
+        </template>
+      </el-table-column>
       <el-table-column
           label="注册时间"
           prop="createTime"
diff --git a/src/views/users/reconnaissance.vue b/src/views/users/reconnaissance.vue
index 51ebbb7..79f80bd 100644
--- a/src/views/users/reconnaissance.vue
+++ b/src/views/users/reconnaissance.vue
@@ -68,6 +68,23 @@
           align="center"
           show-overflow-tooltip
       />
+
+      <el-table-column
+          label="关注公众号"
+          width="300"
+          align="center"
+          show-overflow-tooltip
+      >
+        <template #default="scope">
+          <template v-if="scope.row.ampOpenid">
+            <el-tag type="success">已关注</el-tag>
+          </template>
+          <template v-else>
+            <el-tag type="info">未关注</el-tag>
+          </template>
+        </template>
+      </el-table-column>
+
       <el-table-column
           label="注册时间"
           prop="createTime"