Merge remote-tracking branch 'origin/dev' into dev

peng

2025-07-23 a0f011528fcd9b8f01520d3be4d3e48e245069d3

Merge remote-tracking branch 'origin/dev' into dev

 manager/src/api/memberCustomerTag.js

New file
@@ -0,0 +1,8 @@
import service from "../libs/axios";

export const detailById = (param) =>{
  return service({
    url:"/memberCustomerTag/detail/"+ param,
    method:"GET",
  })
}

 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;
    },

 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{

 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) {

 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) {