From a0f011528fcd9b8f01520d3be4d3e48e245069d3 Mon Sep 17 00:00:00 2001
From: peng <peng.com>
Date: 星期三, 23 七月 2025 17:00:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
manager/src/views/sys/user-manage/userManage.vue | 4 +++-
manager/src/views/member/list/index.vue | 7 ++++---
manager/src/views/member/list/memberDetail.vue | 16 ++++++++++++++++
manager/src/views/member/list/memberDetail.scss | 2 +-
manager/src/api/memberCustomerTag.js | 8 ++++++++
5 files changed, 32 insertions(+), 5 deletions(-)
diff --git a/manager/src/api/memberCustomerTag.js b/manager/src/api/memberCustomerTag.js
new file mode 100644
index 0000000..2630053
--- /dev/null
+++ b/manager/src/api/memberCustomerTag.js
@@ -0,0 +1,8 @@
+import service from "../libs/axios";
+
+export const detailById = (param) =>{
+ return service({
+ url:"/memberCustomerTag/detail/"+ param,
+ method:"GET",
+ })
+}
diff --git a/manager/src/views/member/list/index.vue b/manager/src/views/member/list/index.vue
index 0d346e4..e930b40 100644
--- a/manager/src/views/member/list/index.vue
+++ b/manager/src/views/member/list/index.vue
@@ -83,9 +83,9 @@
</Radio>
</RadioGroup>
</FormItem>
- <FormItem label="淇敼瀵嗙爜" prop="password">
- <Input type="password" style="width: 220px" password v-model="form.newPassword" />
- </FormItem>
+<!-- <FormItem label="淇敼瀵嗙爜" prop="password">-->
+<!-- <Input type="password" style="width: 220px" password v-model="form.newPassword" />-->
+<!-- </FormItem>-->
<FormItem label="鐢熸棩" prop="birthday">
<DatePicker type="date" format="yyyy-MM-dd" v-model="form.birthday" style="width: 220px"></DatePicker>
</FormItem>
@@ -427,6 +427,7 @@
},
// 閫変腑鐨勫浘鐗�
callbackSelected(val) {
+ console.log(val)
this.picModelFlag = false;
this.form.face = val.url;
},
diff --git a/manager/src/views/member/list/memberDetail.scss b/manager/src/views/member/list/memberDetail.scss
index 1e30914..9e846a8 100644
--- a/manager/src/views/member/list/memberDetail.scss
+++ b/manager/src/views/member/list/memberDetail.scss
@@ -31,7 +31,7 @@
.ant-col-md-6 {
display: block;
box-sizing: border-box;
- width: 25%;
+ width: 28%;
float: left;
}
.info-2{
diff --git a/manager/src/views/member/list/memberDetail.vue b/manager/src/views/member/list/memberDetail.vue
index a03c260..ad305c6 100644
--- a/manager/src/views/member/list/memberDetail.vue
+++ b/manager/src/views/member/list/memberDetail.vue
@@ -60,6 +60,10 @@
<span class="label">娉ㄥ唽鏃堕棿锛�</span>
<span class="info">{{memberInfo.createTime}}</span>
</p>
+ <p class="item">
+ <span class="label">鐢ㄦ埛鑷畾涔夋爣绛撅細</span>
+ <span class="inf0o" v-for="(item,index) in memberTags" :key="index">{{item.tagName}}<span v-if="index < memberTags.length - 1">, </span></span>
+ </p>
</div>
</div>
</Card>
@@ -359,6 +363,8 @@
<script>
import * as API_Member from "@/api/member.js";
+ import { detailById } from "@/api/memberCustomerTag.js"
+
import ossManage from "@/views/sys/oss-manage/ossManage";
import multipleMap from "@/components/map/multiple-map";
import * as RegExp from '@/libs/RegExp.js';
@@ -372,6 +378,7 @@
},
data() {
return {
+ memberTags:null,
id: "",//浼氬憳id
loading: true, // 琛ㄥ崟鍔犺浇鐘舵��
memberInfo: {},//浼氬憳淇℃伅
@@ -838,11 +845,20 @@
};
},
methods: {
+
init() {
//鏌ヨ浼氬憳淇℃伅
this.getMemberInfo();
//鏌ヨ浼氬憳鐨勫巻鍙茬Н鍒嗘暟鎹�
this.getPointData();
+ this.getMemberTags();
+ },
+ getMemberTags(){
+ detailById(this.id).then(res =>{
+ if (res.code === 200){
+ this.memberTags = res.data;
+ }
+ });
},
//浼氬憳淇℃伅tab鏀瑰彉浜嬩欢
memberInfoChange(v) {
diff --git a/manager/src/views/sys/user-manage/userManage.vue b/manager/src/views/sys/user-manage/userManage.vue
index 2dc31a6..90fa8a9 100644
--- a/manager/src/views/sys/user-manage/userManage.vue
+++ b/manager/src/views/sys/user-manage/userManage.vue
@@ -163,7 +163,7 @@
{validator: validateMobile, trigger: "blur"}
],
email: [
- {required: true, message: "璇疯緭鍏ラ偖绠卞湴鍧�"},
+ {required: false, message: "璇疯緭鍏ラ偖绠卞湴鍧�"},
{type: "email", message: "閭鏍煎紡涓嶆纭�"}
]
},
@@ -459,6 +459,7 @@
//todo
params.password = this.md5(params.password)
this.submitLoading = true;
+ console.log(params)
addUser(params).then(res => {
this.submitLoading = false;
if (res.success) {
@@ -470,6 +471,7 @@
} else {
// 缂栬緫
this.submitLoading = true;
+ console.log(this.form)
editOtherUser(this.form).then(res => {
this.submitLoading = false;
if (res.success) {
--
Gitblit v1.8.0