From 84183cb2171cc29af1128bd5cae1375e6c7afb14 Mon Sep 17 00:00:00 2001
From: lwh <2679599887@qq.com>
Date: Thu, 15 Jun 2023 15:16:19 +0800
Subject: [PATCH] =?UTF-8?q?feat=20=E6=B7=BB=E5=8A=A0=E5=BA=97=E9=93=BA?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E5=AE=A1=E6=A0=B8=E5=90=8E=E5=88=86=E5=8F=91?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=EF=BC=8C=E5=90=8E=E5=8F=B0=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   2 +-
 src/api/business/ShopManager/Shops/shop.js    |   2 +
 .../ShopManager/Shops/shopOperator.js         |  28 +++++
 src/api/system/user.js                        |   2 +-
 src/views/business/Custom/Customers/index.vue |  15 ++-
 .../ShopManager/ShopOperator/index.vue        | 103 ++++++++++++++++++
 .../business/ShopManager/Shops/index.vue      |   7 +-
 src/views/system/user/index.vue               |   1 +
 8 files changed, 156 insertions(+), 4 deletions(-)
 create mode 100644 src/api/business/ShopManager/Shops/shopOperator.js
 create mode 100644 src/views/business/ShopManager/ShopOperator/index.vue

diff --git a/.env.development b/.env.development
index 5729747..488868c 100644
--- a/.env.development
+++ b/.env.development
@@ -1,7 +1,7 @@
 # 开发环境配置
 ENV = 'development'
 
-VITE_APP_API_HOST = 'http://192.168.1.102:8888'
+VITE_APP_API_HOST = 'http://localhost:8888'
 
 # 开发环境
 VITE_APP_BASE_API = '/dev-api'
diff --git a/src/api/business/ShopManager/Shops/shop.js b/src/api/business/ShopManager/Shops/shop.js
index d4ad10c..8a305fa 100644
--- a/src/api/business/ShopManager/Shops/shop.js
+++ b/src/api/business/ShopManager/Shops/shop.js
@@ -79,3 +79,5 @@ export function audit(data) {
     data: data
   })
 }
+
+
diff --git a/src/api/business/ShopManager/Shops/shopOperator.js b/src/api/business/ShopManager/Shops/shopOperator.js
new file mode 100644
index 0000000..7f38514
--- /dev/null
+++ b/src/api/business/ShopManager/Shops/shopOperator.js
@@ -0,0 +1,28 @@
+import request from '@/utils/request'
+	
+/**
+ * @Descripttion: 店详情Api接口
+ * @version: (1.0)
+ * @Author: (黎文豪)
+ * @Date: (2023-06-15)
+ * @LastEditors: (黎文豪)
+ * @LastEditTime: (2023-06-15)
+*/
+
+// 获取商户店铺详情
+export function getShopOperatorDetail(query) {
+  return request({
+    url: '/business/Shop/getShopOperatorDetail',
+    method: 'get',
+    params: query
+  })
+}
+
+// 编辑店铺详情
+export function editShopOperatorDetail(data) {
+  return request({
+    url: '/business/Shop/editShopOperatorDetail',
+    method: 'post',
+    data: data,
+  })
+}
\ No newline at end of file
diff --git a/src/api/system/user.js b/src/api/system/user.js
index c660261..916cc5c 100644
--- a/src/api/system/user.js
+++ b/src/api/system/user.js
@@ -22,7 +22,7 @@ export function getUser(userId) {
 // 新增用户
 export function addUser(data) {
   return request({
-    url: '/system/user/edit',
+    url: '/system/user/add',
     method: 'post',
     data: data
   })
diff --git a/src/views/business/Custom/Customers/index.vue b/src/views/business/Custom/Customers/index.vue
index 3f69141..f4e24f4 100644
--- a/src/views/business/Custom/Customers/index.vue
+++ b/src/views/business/Custom/Customers/index.vue
@@ -66,6 +66,11 @@
     <el-table v-loading="loading" :data="dataList" ref="tableRef"  highlight-current-row @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="50" align="center" />
 	  
+      <el-table-column prop="customerType" label="客户类型" align="center">
+        <template #default="scope">
+          <dict-tag :options=" customer_type " :value="scope.row.customerType" />
+        </template>
+      </el-table-column>
       <el-table-column prop="customerAvatar" label="头像" align="center">
         <template #default="scope">
           <el-image preview-teleported :hide-on-click-modal="true" lazy class="table-td-thumb" fit="contain" :src="scope.row.customerAvatar.split(',')[0]" :preview-src-list="scope.row.customerAvatar.split(',')">
@@ -76,7 +81,7 @@
       <el-table-column prop="customerXcxOpenid" label="小程序openid" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="customerNickname" label="昵称" align="center" :show-overflow-tooltip="true" />
       <el-table-column prop="customerMobilePhoneNumber" label="手机号" align="center" :show-overflow-tooltip="true" />
-      <el-table-column prop="customerGender" label="性别(字典)" align="center">
+      <el-table-column prop="customerGender" label="性别" align="center">
         <template #default="scope">
           <dict-tag :options=" sys_user_sex " :value="scope.row.customerGender" />
         </template>
@@ -165,6 +170,14 @@ async function getsys_user_sex() {
 }
 getsys_user_sex()
 
+// 字典获取
+const customer_type = ref([]);
+async function getcustomer_type() {
+  await proxy.getDicts('customer_type').then((res) => {
+    customer_type.value = res.data
+  })
+}
+getcustomer_type()
 
 
 
diff --git a/src/views/business/ShopManager/ShopOperator/index.vue b/src/views/business/ShopManager/ShopOperator/index.vue
new file mode 100644
index 0000000..3a083b2
--- /dev/null
+++ b/src/views/business/ShopManager/ShopOperator/index.vue
@@ -0,0 +1,103 @@
+<template>
+    <!-- 面包屑 -->
+    <el-breadcrumb>
+        <el-breadcrumb-item>联系方式</el-breadcrumb-item>
+        <el-breadcrumb-item to="/ContactInfo'">联系信息</el-breadcrumb-item>
+    </el-breadcrumb>
+    <el-form ref="formRef" :model="formData" :rules="rules">
+        <el-row>
+
+            <el-col :span='24'>
+                <el-form-item :label-width="labelWidth" label="名称" prop="shopName">
+                    <el-input v-model="formData.shopName" placeholder="请输入名称" />
+                </el-form-item>
+            </el-col>
+
+            <el-col :span="24">
+                <el-form-item :label-width="labelWidth" label="简介" prop="shopIntro">
+                    <el-input v-model="formData.shopIntro" type="textarea" :rows="5" placeholder="请输入简介" />
+                </el-form-item>
+            </el-col>
+
+            <el-col :span='6'>
+                <el-form-item :label-width="labelWidth" label="图标" prop="shopLogo">
+                    <UploadImage ref="uploadRef" v-model="formData.shopLogo" :data=imgData :limit="1" :fileSize="5"
+                        :drag="true" />
+                </el-form-item>
+            </el-col>
+
+
+        </el-row>
+        <el-row>
+            <el-button type="primary" class="sus_button" @click="save(formRef)">
+                保存
+            </el-button>
+        </el-row>
+    </el-form>
+</template>
+<script setup>
+import { ref, reactive } from "vue";
+import { getShopOperatorDetail, editShopOperatorDetail } from "@/api/business/ShopManager/Shops/shopOperator.js";
+import modal from '@/plugins/modal.js'
+
+
+let formData = ref({});
+
+
+const imgData = ref({
+    dirName: "ContactInfo"
+})
+
+//验证规则
+const rules = reactive({
+
+});
+
+const labelWidth = 200;
+const formRef = ref();
+
+//获取
+const getContent = async () => {
+    const { code, data } = await getShopOperatorDetail();
+    if (code == 200) {
+        formData.value = data;
+    }
+};
+getContent()
+
+
+//保存
+const save = async (formEl) => {
+    if (!formEl) return;
+    formEl.validate(async (valid) => {
+        if (!valid) {
+            return;
+        }
+
+        const { code } = await editShopOperatorDetail(formData.value);
+        if (code == 200) {
+            modal.msgSuccess('编辑成功')
+        }
+    });
+};
+
+</script>
+<style lang="scss" scoped>
+.sus_button {
+    width: 300px;
+    height: 50px;
+    margin: 20px auto;
+}
+
+// .upLoadEl {
+//     :deep(.el-upload-list__item) {
+//         height: 200px;
+//         width: 300px;
+//     }
+
+//     :deep(.el-upload-list__item-thumbnail) {
+//         object-fit: contain;
+//     }
+// }
+</style>
+    
\ No newline at end of file
diff --git a/src/views/business/ShopManager/Shops/index.vue b/src/views/business/ShopManager/Shops/index.vue
index 79c8970..f6a03a0 100644
--- a/src/views/business/ShopManager/Shops/index.vue
+++ b/src/views/business/ShopManager/Shops/index.vue
@@ -59,7 +59,12 @@
       @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="50" align="center" />
 
-      <el-table-column prop="userName" label="用户" align="center" />
+      <el-table-column prop="userName" label="用户" align="center">
+        <template #default="scope">
+          <div v-if="!scope.row.userName">暂未绑定</div>
+          <div v-else>{{ scope.row.userName }}</div>
+        </template>
+      </el-table-column>
       <el-table-column prop="customerNickname" label="客户" align="center" />
       <el-table-column prop="shopBusinessCategoryName" label="经营类目" align="center">
         <template #default="scope">
diff --git a/src/views/system/user/index.vue b/src/views/system/user/index.vue
index aa25851..fad059c 100644
--- a/src/views/system/user/index.vue
+++ b/src/views/system/user/index.vue
@@ -550,6 +550,7 @@ function handleUpdate(row) {
 }
 /** 提交按钮 */
 function submitForm() {
+  console.log(form.value,'表单');
   proxy.$refs['userRef'].validate((valid) => {
     if (valid) {
       if (form.value.userId != undefined) {