From 4ad4f8468cb0859c916baa3cec44a8b4b4b23c9a Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Sun, 14 Jan 2024 18:23:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E6=8F=90=E8=B4=A7?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../marketing/exchange/pickupPoint/index.vue  | 61 ++++++++++++++++---
 1 file changed, 53 insertions(+), 8 deletions(-)

diff --git a/src/views/marketing/exchange/pickupPoint/index.vue b/src/views/marketing/exchange/pickupPoint/index.vue
index 6fb885f..ba1f596 100644
--- a/src/views/marketing/exchange/pickupPoint/index.vue
+++ b/src/views/marketing/exchange/pickupPoint/index.vue
@@ -22,6 +22,7 @@
         <el-tab-pane label="提货点管理" name="list">
           <el-table v-loading="listLoading" :data="tableData.data" style="width: 100%" size="mini">
             <el-table-column prop="id" label="ID" min-width="100" align="center"/>
+            <el-table-column label="名称" prop="title" align="center"/>
             <el-table-column label="地址" prop="address" align="center"/>
             <el-table-column label="状态" align="center">
               <template slot-scope="scope">
@@ -51,10 +52,46 @@
           </el-table>
         </el-tab-pane>
         <el-tab-pane label="提货记录" name="record">
-
-
-
-
+          <el-table v-loading="listLoading" :data="tableData.data" style="width: 100%" size="mini">
+            <el-table-column prop="id" label="ID" min-width="100" align="center"/>
+            <el-table-column label="提货用户" min-width="150" align="center">
+              <template slot-scope="scope">
+                <div class="user-content">
+                  <div class="user-avatar" v-if="scope.row.avatar && scope.row.avatar != 1">
+                    <img :src="scope.row.avatar" />
+                  </div>
+                  <div class="user-info">
+                    <div class="nickname">{{ scope.row.nickname }}</div>
+                    <div class="user-id">ID：{{ scope.row.uid }}</div>
+                  </div>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="操作员" min-width="150" align="center">
+              <template slot-scope="scope">
+                <div class="user-content">
+                  <div class="user-avatar" v-if="scope.row.staff_avatar && scope.row.staff_avatar != 1">
+                    <img :src="scope.row.staff_avatar" />
+                  </div>
+                  <div class="user-info">
+                    <div class="nickname">{{ scope.row.staff_nickname }}</div>
+                    <div class="user-id">ID：{{ scope.row.staff_uid }}</div>
+                  </div>
+                </div>
+              </template>
+            </el-table-column>
+            <el-table-column label="提货点" min-width="150" align="center">
+              <template slot-scope="scope">
+                {{ scope.row.point_title }}<br />
+                {{ scope.row.point_address }}
+              </template>
+            </el-table-column>
+            <el-table-column label="总价值" prop="total_money" min-width="80"  align="center"/>
+            <el-table-column label="使用积分" prop="use_integral" min-width="80"  align="center"/>
+            <el-table-column label="差价" prop="diff_money" min-width="80"  align="center"/>
+            <el-table-column label="实付差价" prop="diff_money_pay" min-width="80"  align="center"/>
+            <el-table-column label="兑换时间" prop="create_time" min-width="80"  align="center"/>
+          </el-table>
         </el-tab-pane>
       </el-tabs>
       <!--分页-->
@@ -77,9 +114,9 @@
           <div class="section">
             <div class="title">取货点信息</div>
             <el-row>
-              <el-col :span="24">
-                <el-form-item label="地址：" prop="address">
-                  <el-input v-model="editInfo.address" placeholder="请填写取货点详细地址" />
+              <el-col :span="12">
+                <el-form-item label="名称：" prop="title">
+                  <el-input v-model="editInfo.title" placeholder="请填写取货点名称" />
                 </el-form-item>
               </el-col>
               <el-col :span="12">
@@ -87,6 +124,11 @@
                   <el-switch v-model="editInfo.is_show" :active-value="1" :inactive-value="0" :width="55" active-text="开启" inactive-text="关闭" />
                 </el-form-item>
               </el-col>
+              <el-col :span="24">
+                <el-form-item label="地址：" prop="address">
+                  <el-input v-model="editInfo.address" placeholder="请填写取货点详细地址" />
+                </el-form-item>
+              </el-col>
             </el-row>
             <div class="title">
               负责人
@@ -185,6 +227,7 @@ export default {
       // 编辑弹框
       drawer_show: false,
       editInfo: {
+        title: '',
         address: '',
         is_show: 1,
         uid_list: [],
@@ -192,6 +235,7 @@ export default {
       },
       activeName: 'list',
       ruleValidate: {
+        title: [{ required: true, message: '请填写取货点名称', trigger: 'blur' }],
         address: [{ required: true, message: '请填写取货点详细地址', trigger: 'blur' }],
       },
       // 用户选择弹框
@@ -218,7 +262,8 @@ export default {
         page: 1,
         limit: 20,
         uid: '',
-        address: ''
+        address: '',
+        title:'',
       },
       loading: false,
       cardLists: [],