diff --git a/chenhai-ui/src/views/login.vue b/chenhai-ui/src/views/login.vue
index 1dc3346..2317532 100644
--- a/chenhai-ui/src/views/login.vue
+++ b/chenhai-ui/src/views/login.vue
@@ -325,6 +325,21 @@ export default {
this.open = true
},
+ // 重置注册表单
+ resetRegisterForm() {
+ this.registerForm = {
+ phone: "",
+ password: "",
+ confirmPassword: "",
+ clientType: "vet-pc"
+ };
+ this.registerPwdVisible = false;
+ this.confirmPwdVisible = false;
+ if (this.$refs.registerForm) {
+ this.$refs.registerForm.resetFields();
+ }
+ },
+
handleRegister() {
this.$refs.registerForm.validate(valid => {
if (valid) {
@@ -337,7 +352,9 @@ export default {
this.open = false;
this.registerloading = false;
this.resetRegisterForm();
- }).catch(() => {})
+ }).catch(() => {
+ this.registerloading = false;
+ })
})
}
})
diff --git a/chenhai-ui/src/views/syd.vue b/chenhai-ui/src/views/syd.vue
index 7dc56a7..640d9b8 100644
--- a/chenhai-ui/src/views/syd.vue
+++ b/chenhai-ui/src/views/syd.vue
@@ -269,7 +269,7 @@
-
+
-
+
diff --git a/chenhai-ui/src/views/system/recommendation/index.vue b/chenhai-ui/src/views/system/recommendation/index.vue
index beef90a..d9e1e19 100644
--- a/chenhai-ui/src/views/system/recommendation/index.vue
+++ b/chenhai-ui/src/views/system/recommendation/index.vue
@@ -658,6 +658,9 @@ export default {
medicineType: [
{ required: true, message: "药品类型不能为空", trigger: "change" }
],
+ salesType: [
+ { required: true, message: "销售类型不能为空", trigger: "change" }
+ ],
price: [
{ required: true, message: "当前价格不能为空", trigger: "blur" },
{ pattern: /^\d+(\.\d{1,2})?$/, message: "请输入正确的价格格式", trigger: "blur" }
@@ -1050,30 +1053,31 @@ export default {
},
/** 修改按钮操作 */
- async handleUpdate(row) {
+ // async handleUpdate(row) {
+ handleUpdate(row) {
this.reset();
const id = row.id || this.ids[0];
getRecommendation(id).then(response => {
this.form = response.data;
- // 初始化药品图片文件列表（单张）
- if (this.form.images) {
- this.medicineFileList = [{
- name: 'medicine_image.jpg',
- url: this.form.images,
- status: 'success'
- }];
- }
-
- // 初始化轮播图片文件列表（多张）
- if (this.form.imageUrl) {
- const imageUrls = this.form.imageUrl.split(',');
- this.carouselFileList = imageUrls.map((url, index) => ({
- name: `carousel_${index + 1}.jpg`,
- url: url.trim(),
- status: 'success'
- }));
- }
+ // // 初始化药品图片文件列表（单张）
+ // if (this.form.images) {
+ // this.medicineFileList = [{
+ // name: 'medicine_image.jpg',
+ // url: this.form.images,
+ // status: 'success'
+ // }];
+ // }
+ //
+ // // 初始化轮播图片文件列表（多张）
+ // if (this.form.imageUrl) {
+ // const imageUrls = this.form.imageUrl.split(',');
+ // this.carouselFileList = imageUrls.map((url, index) => ({
+ // name: `carousel_${index + 1}.jpg`,
+ // url: url.trim(),
+ // status: 'success'
+ // }));
+ // }
this.open = true;
this.title = "修改药品推荐";
diff --git a/chenhai-ui/src/views/vet/experts/index.vue b/chenhai-ui/src/views/vet/experts/index.vue
index 3d4fe8c..d562bcf 100644
--- a/chenhai-ui/src/views/vet/experts/index.vue
+++ b/chenhai-ui/src/views/vet/experts/index.vue
@@ -240,7 +240,8 @@ export default {
// 是否显示弹出层
open: false,
detailViews: false,
-
+ // 聊天咨询
+ chatViews: false,
// 当前查看的详情
currentDetail: {},
// 查询参数
@@ -371,35 +372,36 @@ export default {
/** 聊天咨询按钮操作 */
handleChat(row) {
- // 获取当前用户信息
- const userInfo = this.$store.getters.userInfo || {}
- const roles = userInfo.roles || []
- const userRole = roles[0] || '' // 获取第一个角色
-
- console.log('当前用户角色:', roles, '主要角色:', userRole)
-
- // 根据角色跳转到不同的聊天页面
- if (userRole === 'vetnotshenhe' || userRole === 'admin') {
- // 专家或管理员登录 - 跳转到专家聊天页面
- this.$router.push({
- path: '@/views/chat/expert',
- query: {
- expertId: row.expertId,
- expertName: row.realName,
- // 专家主动发起聊天需要选择用户
- mode: 'expert_initiate'
- }
- })
- } else {
- // 普通用户（muhu或其他角色）- 跳转到用户聊天页面
- this.$router.push({
- path: '/chat/index',
- query: {
- expertId: row.expertId,
- expertName: row.realName
- }
- })
- }
+ this.$modal.msgWarning("该功能正在开发中");
+ // // 获取当前用户信息
+ // const userInfo = this.$store.getters.userInfo || {}
+ // const roles = userInfo.roles || []
+ // const userRole = roles[0] || '' // 获取第一个角色
+ //
+ // console.log('当前用户角色:', roles, '主要角色:', userRole)
+ //
+ // // 根据角色跳转到不同的聊天页面
+ // if (userRole === 'vetnotshenhe' || userRole === 'admin') {
+ // // 专家或管理员登录 - 跳转到专家聊天页面
+ // this.$router.push({
+ // path: '@/views/chat/expert',
+ // query: {
+ // expertId: row.expertId,
+ // expertName: row.realName,
+ // // 专家主动发起聊天需要选择用户
+ // mode: 'expert_initiate'
+ // }
+ // })
+ // } else {
+ // // 普通用户（muhu或其他角色）- 跳转到用户聊天页面
+ // this.$router.push({
+ // path: '/chat/index',
+ // query: {
+ // expertId: row.expertId,
+ // expertName: row.realName
+ // }
+ // })
+ // }
},
/** 提交按钮 */
submitForm() {
diff --git a/chenhai-ui/src/views/vet/info/index.vue b/chenhai-ui/src/views/vet/info/index.vue
index 35a9528..bdef75c 100644
--- a/chenhai-ui/src/views/vet/info/index.vue
+++ b/chenhai-ui/src/views/vet/info/index.vue
@@ -87,6 +87,11 @@
+
+
+
+
+
@@ -150,8 +155,11 @@
+
+
+
-
+
@@ -181,7 +189,7 @@
-
+
@@ -301,7 +309,6 @@ export default {
infoList: [],
// 资质证书列表
certificateList: [],
-
// 弹出层标题
title: "",
// 详情弹出层标题
@@ -318,6 +325,7 @@ export default {
pageNum: 1,
pageSize: 10,
userId: null,
+ avatar: null,
realName: null,
gender: null,
birthday: null,
@@ -333,13 +341,16 @@ export default {
// 表单校验
rules: {
realName: [
- { required: true, message: "真实姓名不能为空", trigger: "blur" }
+ {required: true, message: "真实姓名不能为空", trigger: "blur"},
+ { min: 2, max: 10, message: "长度在2到10个字符", trigger: "blur" },
],
gender: [
{ required: true, message: "性别不能为空", trigger: "change" }
],
idCard: [
- { required: true, message: "身份证号不能为空", trigger: "blur" }
+ {required: true, message: "身份证号不能为空", trigger: "blur"},
+ { pattern: /^[1-9]\d{5}(18|19|20)\d{2}((0[1-9])|(10|11|12))(([0-2][1-9])|10|20|30|31)\d{3}(\d|X|x)$/, message: "身份证号码不合法", trigger: "blur" },
+ { min: 1, max: 18, message: "长度在18个字符", trigger: "blur" },
]
}
}
@@ -384,6 +395,7 @@ export default {
id: null,
userId: null,
realName: null,
+ avatar: null,
gender: null,
birthday: null,
idCard: null,
diff --git a/chenhai-ui/src/views/vet/knowledge/index.vue b/chenhai-ui/src/views/vet/knowledge/index.vue
index bfb5ca5..2deaf5a 100644
--- a/chenhai-ui/src/views/vet/knowledge/index.vue
+++ b/chenhai-ui/src/views/vet/knowledge/index.vue
@@ -314,6 +314,9 @@
提示：选择为您推荐药品的专家
+
+
+
@@ -429,7 +432,7 @@ import {
offlineVetKnowledge
} from "@/api/vet/knowledge"
import { getDicts } from "@/api/system/dict/data"
-import {listExperts} from "@/api/vet/experts"; // 导入字典接口
+import {listExperts} from "@/api/vet/experts";
export default {
name: "Knowledge",
diff --git a/chenhai-ui/src/views/vet/merchant/index.vue b/chenhai-ui/src/views/vet/merchant/index.vue
index c22721e..f57b297 100644
--- a/chenhai-ui/src/views/vet/merchant/index.vue
+++ b/chenhai-ui/src/views/vet/merchant/index.vue
@@ -153,6 +153,7 @@
icon="el-icon-view"
@click="handleView(scope.row)"
class="info-btn view-btn"
+ v-if="scope.row.auditStatus === '2'"
>详情
{{ scope.row.certName }}
-
+
{{ scope.row.issueOrg }}
-
-
+
@@ -310,7 +310,7 @@
type="text"
icon="el-icon-view"
@click="previewCertificate(scope.row.certificateFiles)"
- style="color: #409EFF;"
+ style="color: #409EFF;font-size: 20px"
>
@@ -319,7 +319,7 @@
type="text"
icon="el-icon-download"
@click="downloadFile(scope.row.certificateFiles)"
- style="color: #287c07;"
+ style="color: #287c07;font-size: 20px"
>