From 62a3b15f0e7cd73adf6ec999eb929a0c741e9999 Mon Sep 17 00:00:00 2001
From: sjm <1191068887@qq.com>
Date: Fri, 11 Aug 2023 13:53:22 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=A4=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/ums/member.js              |  7 +++++
 src/views/oms/aftersale/index.vue  |  1 +
 src/views/oms/order/index.vue      | 12 +++++--
 src/views/ums/member/index.vue     | 50 ++++++++++++++++++++++++++++--
 src/views/ums/memberCart/index.vue |  8 ++++-
 5 files changed, 71 insertions(+), 7 deletions(-)

diff --git a/src/api/ums/member.js b/src/api/ums/member.js
index d26648a..28a4a32 100644
--- a/src/api/ums/member.js
+++ b/src/api/ums/member.js
@@ -35,6 +35,13 @@ export function updateUmsMember(data) {
     data: data
   })
 }
+export function updateUmsMemberMark(data) {
+  return request({
+    url: '/ums/member/mark/update',
+    method: 'post',
+    data: data
+  })
+}
 
 // 删除会员信息
 export function delUmsMember(id) {
diff --git a/src/views/oms/aftersale/index.vue b/src/views/oms/aftersale/index.vue
index b642751..8a9cb03 100644
--- a/src/views/oms/aftersale/index.vue
+++ b/src/views/oms/aftersale/index.vue
@@ -46,6 +46,7 @@
         <template v-slot="scope">
           <div>{{ scope.row.nickName }}</div>
           <div>{{ scope.row.phone }}</div>
+          <div>{{scope.row.mark}}</div>
         </template>
       </el-table-column>
       <el-table-column label="退款金额" align="center" prop="applyReturnAmount" width="120"/>
diff --git a/src/views/oms/order/index.vue b/src/views/oms/order/index.vue
index e69b169..4dcf9ae 100644
--- a/src/views/oms/order/index.vue
+++ b/src/views/oms/order/index.vue
@@ -64,6 +64,12 @@
           </div>
         </template>
       </el-table-column>
+      <el-table-column label="客户信息" prop="receiverName" width="160">
+        <template v-slot="scope">
+          <p>{{scope.row.nickName}}</p>
+          <p>{{scope.row.mark}}</p>
+        </template>
+      </el-table-column>
       <el-table-column label="备注留言"  prop="note" width="160">
         <template v-slot="scope">
           <div>
@@ -79,7 +85,7 @@
           <div v-if="scope.row.note">{{ scope.row.note }}</div>
         </template>
       </el-table-column>
-      <el-table-column label="下单时间/支付时间"  prop="payTime" width="200" >
+      <el-table-column label="下单时间/支付时间"  prop="payTime" width="140" >
         <template slot-scope="scope">
           <div v-if="scope.row.createTime">{{ parseTime(scope.row.createTime, '{mm}-{dd} {hh}:{ii}')}} 下单</div>
           <div v-if="scope.row.payTime">{{ parseTime(scope.row.payTime, '{mm}-{dd} {hh}:{ii}')}} 支付</div>
@@ -94,7 +100,7 @@
           <div>总价： ￥{{ scope.row.totalAmount }}</div>
         </template>
       </el-table-column>
-      <el-table-column label="商品规格"  prop="productList" width="340">
+      <el-table-column label="商品规格"  prop="productList" width="280">
         <template v-slot="scope">
           <div v-for="item in scope.row.productList" class="product-container">
             <el-popover
@@ -115,7 +121,7 @@
           </div>
         </template>
       </el-table-column>
-      <el-table-column label="订单状态"  prop="status" width="270">
+      <el-table-column label="订单状态"  prop="status" width="160">
         <template v-slot="scope">
           <div>
             <el-tag :type="getOrderStatusTag(scope.row.status)" style="margin-right: 10px">
diff --git a/src/views/ums/member/index.vue b/src/views/ums/member/index.vue
index d0f5f93..c0e9791 100644
--- a/src/views/ums/member/index.vue
+++ b/src/views/ums/member/index.vue
@@ -39,6 +39,12 @@
           size="small"
         />
       </el-form-item>
+      <el-form-item label="备注" prop="mark">
+        <el-select v-model="queryParams.hasMark" clearable size="small">
+          <el-option value="1" label="有备注" />
+          <el-option value="0" label="无备注" />
+        </el-select>
+      </el-form-item>
       <el-form-item class="flex_one tr">
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
         <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
@@ -74,6 +80,12 @@
           <div>{{ parseTime(scope.row.createTime) }}</div>
         </template>
       </el-table-column>
+      <el-table-column label="备注">
+        <template v-slot="scope">
+          <span class="mr10">{{scope.row.mark}}</span>
+          <i class="el-icon-edit pointer" @click="showUpdateMark(scope.row)"></i>
+        </template>
+      </el-table-column>
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width" fix="right" width="200">
         <template slot-scope="scope">
           <el-button
@@ -111,12 +123,18 @@
         <el-descriptions-item label="售后数">{{ statisticsObj.data.aftersaleCount }}</el-descriptions-item>
       </el-descriptions>
     </el-dialog>
-
+    <el-dialog title="修改备注" :visible.sync="remarkModal.visible" width="30%" append-to-body>
+      <el-input type='textarea' :rows='3' placeholder='请输入内容' v-model='remarkModal.mark'/>
+      <span class="dialog-footer" slot="footer">
+        <el-button @click="remarkModal.visible = false">取 消</el-button>
+        <el-button type='primary' @click='updateRemark'>确 定</el-button>
+      </span>
+    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listUmsMember, getUmsMember, delUmsMember, addUmsMember, updateUmsMember, exportUmsMember, changeAccountStatus, decryptedPhone, viewStatistics } from "@/api/ums/member";
+import { listUmsMember, getUmsMember, delUmsMember, addUmsMember, updateUmsMember,updateUmsMemberMark, exportUmsMember, changeAccountStatus, decryptedPhone, viewStatistics } from "@/api/ums/member";
 import dateUtil from '@/utils/DateUtil';
 import moment from "moment";
 
@@ -127,6 +145,11 @@ export default {
       pickerOptions: {
         shortcuts: dateUtil.getTimeShort()
       },
+      remarkModal: {
+        visible: false,
+        mark: null,
+        memberId: null,
+      },
       // 遮罩层
       loading: true,
       // 导出遮罩层
@@ -153,7 +176,8 @@ export default {
         pageSize: 10,
         nickname: null,
         phone: null,
-        status: undefined
+        status: undefined,
+        hasMark: undefined
       },
       dateRange:[],
       // 表单参数
@@ -184,6 +208,26 @@ export default {
     this.getList();
   },
   methods: {
+    showUpdateMark(record){
+      this.remarkModal = {
+        visible: true,
+        mark: record.mark,
+        memberId: record.id
+      }
+    },
+    updateRemark(){
+      updateUmsMemberMark({id:this.remarkModal.memberId,mark:this.remarkModal.mark})
+        .then(res=>{
+          if (res > 0) {
+            this.$message.success('修改成功');
+            this.remarkModal.visible = false;
+            const obj = this.umsMemberList.filter(it=>it.id === this.remarkModal.memberId)[0]
+            obj.mark = this.remarkModal.mark;
+          } else {
+            this.$message.success('修改失败');
+          }
+        })
+    },
     /** 查询会员信息列表 */
     getList() {
       this.loading = true;
diff --git a/src/views/ums/memberCart/index.vue b/src/views/ums/memberCart/index.vue
index 96decde..9039ecd 100644
--- a/src/views/ums/memberCart/index.vue
+++ b/src/views/ums/memberCart/index.vue
@@ -27,7 +27,13 @@
 
     <el-table v-loading="loading" :data="umsMemberCartList" @selection-change="handleSelectionChange" border cell-class-name="my-cell">
 <!--      <el-table-column type="selection" width="55"  />-->
-      <el-table-column label="用户手机号"  prop="phoneHidden" width="100"/>
+      <el-table-column label="用户信息"  prop="phoneHidden">
+        <template v-slot="scope">
+          <p>{{scope.row.phoneHidden}}</p>
+          <p>{{scope.row.nickname}}</p>
+        </template>
+      </el-table-column>
+      <el-table-column label="用户备注"  prop="mark" />
       <el-table-column label="商品名称"  prop="productName" />
       <el-table-column label="商品规格"  prop="spData">
         <template v-slot="scope">