- 请选择{{defaultText}}
- {{showText}}
-
-
-
+
+
+
+ {{ currentNode.name }}
+
+
+
+
+
+
+ 其它条件不满足进入此分支（该分支不可编辑和删除）
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 条件组关系
+
+
+
+
+
+
+
+ 条件组
+
+
+ 规则关系
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 确 定
+ 取 消
+
+
+
+
+
+
+
+ {{ nodeName }}
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 字段权限
+
+
+ 字段名称
+
+ 只读
+ 可编辑
+ 隐藏
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+ 确 定
+ 取 消
+
+
+
+
+
+
+
+ {{ nodeName }}
+
+ 待实现
+
+
+ 字段权限
+
+
+ 字段名称
+
+ 只读
+ 可编辑
+ 隐藏
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+ 确 定
+ 取 消
+
+
+
+
+
+
+
+ {{ nodeName }}
+
+
+ 审批类型 :
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+ {{ dict.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 审批人拒绝时
+
+
+
+
+
+
+
+
+
+ 审批人超时未处理时
+
+
+
+
+
+
+
+ 当超过
+
+
+
+
+ 未处理
+
+
+
+
+ 审批人为空时
+
+
+
+
+
+
+
+
+
+ 审批人与提交人为同一人时
+
+
+
+
+
+
+
+
+
+
+ {{ item.label }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 字段权限
+
+
+ 字段名称
+
+ 只读
+ 可编辑
+ 隐藏
+
+
+
+
+
+ {{ item.title }}
+
+
+
+
+
+
+
+ 确 定
+ 取 消
+
+
+
+
+
+
+
+
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes/EndEventNode.vue b/src/components/SimpleProcessDesignerV2/src/nodes/EndEventNode.vue
new file mode 100644
index 00000000..3278e7b8
--- /dev/null
+++ b/src/components/SimpleProcessDesignerV2/src/nodes/EndEventNode.vue
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ currentNode.name }}
+
+
+
+
+
+ {{ currentNode.showText }}
+
+
+ {{ NODE_DEFAULT_TEXT.get(NodeType.COPY_TASK_NODE) }}
+
+
+
+
+
+
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes/ExclusiveNode.vue b/src/components/SimpleProcessDesignerV2/src/nodes/ExclusiveNode.vue
new file mode 100644
index 00000000..385a81ff
--- /dev/null
+++ b/src/components/SimpleProcessDesignerV2/src/nodes/ExclusiveNode.vue
@@ -0,0 +1,207 @@
+
+
+ 结束
+
+
+
+
+
+
+
+
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes/ParallelNode.vue b/src/components/SimpleProcessDesignerV2/src/nodes/ParallelNode.vue
new file mode 100644
index 00000000..3cdd8f8f
--- /dev/null
+++ b/src/components/SimpleProcessDesignerV2/src/nodes/ParallelNode.vue
@@ -0,0 +1,181 @@
+
+
+
+ 添加条件
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+ 优先级{{ index + 1 }}
+
+
+
+
+ {{ item.showText }}
+
+
+ {{ NODE_DEFAULT_TEXT.get(NodeType.CONDITION_NODE) }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/SimpleProcessDesignerV2/src/nodes/StartUserNode.vue b/src/components/SimpleProcessDesignerV2/src/nodes/StartUserNode.vue
new file mode 100644
index 00000000..51116781
--- /dev/null
+++ b/src/components/SimpleProcessDesignerV2/src/nodes/StartUserNode.vue
@@ -0,0 +1,69 @@
+
+
+
+ 添加分支
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.name }}
+ 无优先级
+
+
+
+
+
+
+
+ {{ item.showText }}
+
+
+ {{ NODE_DEFAULT_TEXT.get(NodeType.CONDITION_NODE) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ currentNode.name }}
+
+
+
+
+ {{ currentNode.showText }}
+
+
+ {{ NODE_DEFAULT_TEXT.get(NodeType.START_USER_NODE) }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ currentNode.name }}
+
+
+
+
+
+ {{ currentNode.showText }}
+
+
+ {{ NODE_DEFAULT_TEXT.get(NodeType.USER_TASK_NODE) }}
+
+
-
-
-
- {{ dict.label }}
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
+ {{ dict.label }}
+
+
+ {{ activity.name }}
- {{ activity.assigneeUser.nickname }}
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ task.assigneeUser.nickname.substring(0, 1) }}
+
+
+ {{ task.ownerUser.nickname.substring(0, 1) }}
+
+
+
+
+
+
+
+
+
+ {{ task.assigneeUser.nickname }}
+
+
+ {{ task.ownerUser.nickname }}
+
+
+
+
+
+
+
+
+
+
+ {{ user.nickname.substring(0, 1) }}
+
+
+
+
+
+
+
+
+
+ {{ user.nickname }}
+
+
+
+ {{ getApprovalNodeTime(activity) }}
+
+
+
+
- 
-
-
-
-
-
-
+
+
-
+
-
+
-
+
-
+
-
+
@@ -147,6 +191,10 @@ import TaskSignCreateForm from './dialog/TaskSignCreateForm.vue'
import { registerComponent } from '@/utils/routerHelper'
import { isEmpty } from '@/utils/is'
import * as UserApi from '@/api/system/user'
+import {
+ OperationButtonType,
+ OPERATION_BUTTON_NAME
+} from '@/components/SimpleProcessDesignerV2/src/consts'
defineOptions({ name: 'BpmProcessInstanceDetail' })
@@ -200,8 +248,14 @@ const handleAudit = async (task, pass) => {
// 1.2 校验表单
const elForm = unref(auditFormRef)
if (!elForm) return
- const valid = await elForm.validate()
+ let valid = await elForm.validate()
if (!valid) return
+ // 校验申请表单（可编辑字段）
+ // TODO @jason：之前这里是 if (!fApi.value) return；针对业务表单的情况下，会导致没办法审核，可能要看下。我这里改了点，看看是不是还有别的地方兼容性
+ if (fApi.value) {
+ valid = await fApi.value.validate()
+ if (!valid) return
+ }
// 2.1 提交审批
const data = {
@@ -216,6 +270,11 @@ const handleAudit = async (task, pass) => {
await formCreateApi.validate()
data.variables = approveForms.value[index].value
}
+ // 获取表单可编辑字段的值
+ if (fApi.value) {
+ data.variables = getWritableValueOfForm(task.fieldsPermission)
+ }
+
await TaskApi.approveTask(data)
message.success('审批通过成功')
} else {
@@ -251,11 +310,11 @@ const handleSign = async (task: any) => {
}
/** 获得详情 */
-const getDetail = () => {
- // 1. 获得流程实例相关
+const getDetail = async () => {
+ // 1. 获得流程任务列表（审批记录）。 需要先获取任务，表单的权限设置需要根据任务来设置
+ await getTaskList()
+ // 2. 获得流程实例相关
getProcessInstance()
- // 2. 获得流程任务列表（审批记录）
- getTaskList()
}
/** 加载流程实例 */
@@ -273,16 +332,29 @@ const getProcessInstance = async () => {
// 设置表单信息
const processDefinition = data.processDefinition
if (processDefinition.formType === 10) {
- setConfAndFields2(
- detailForm,
- processDefinition.formConf,
- processDefinition.formFields,
- data.formVariables
- )
+ if (detailForm.value.rule.length > 0) {
+ detailForm.value.value = data.formVariables
+ } else {
+ setConfAndFields2(
+ detailForm,
+ processDefinition.formConf,
+ processDefinition.formFields,
+ data.formVariables
+ )
+ }
nextTick().then(() => {
fApi.value?.btn.show(false)
fApi.value?.resetBtn.show(false)
fApi.value?.disabled(true)
+ // 设置表单权限。后续需要改造成。只处理一个运行中的任务
+ if (runningTasks.value.length > 0) {
+ const task = runningTasks.value.at(0)
+ if (task.fieldsPermission) {
+ Object.keys(task.fieldsPermission).forEach((item) => {
+ setFieldPermission(item, task.fieldsPermission[item])
+ })
+ }
+ }
})
} else {
// 注意：data.processDefinition.formCustomViewPath 是组件的全路径，例如说：/crm/contract/detail/index.vue
@@ -353,6 +425,7 @@ const loadRunningTask = (tasks) => {
if (!task.assigneeUser || task.assigneeUser.id !== userId) {
return
}
+
// 2.3 添加到处理任务
runningTasks.value.push({ ...task })
auditForms.value.push({
@@ -371,6 +444,35 @@ const loadRunningTask = (tasks) => {
})
}
+/**
+ * 设置表单权限
+ */
+const setFieldPermission = (field: string, permission: string) => {
+ if (permission === '1') {
+ fApi.value?.disabled(true, field)
+ }
+ if (permission === '2') {
+ fApi.value?.disabled(false, field)
+ }
+ if (permission === '3') {
+ fApi.value?.hidden(true, field)
+ }
+}
+/**
+ * 获取可以编辑字段的值
+ */
+const getWritableValueOfForm = (fieldsPermission: Object) => {
+ const fieldsValue = {}
+ if (fieldsPermission && fApi.value) {
+ Object.keys(fieldsPermission).forEach((item) => {
+ if (fieldsPermission[item] === '2') {
+ fieldsValue[item] = fApi.value.getValue(item)
+ }
+ })
+ }
+ return fieldsValue
+}
+
/** 初始化 */
const userOptions = ref编号：{{ id }}
-
-
+ {{ processInstance.name }}
-
+
+ ![]()
+
-
-
-
-
-
-
-
-
-
-
+
-
@@ -43,6 +44,31 @@ defineOptions({ name: 'InfraBuild' })
const { t } = useI18n() // 国际化
const message = useMessage() // 消息
+// 表单设计器配置
+const designerConfig = ref({
+ switchType: [], // 是否可以切换组件类型,或者可以相互切换的字段
+ autoActive: true, // 是否自动选中拖入的组件
+ useTemplate: false, // 是否生成vue2语法的模板组件
+ formOptions: {}, // 定义表单配置默认值
+ fieldReadonly: false, // 配置field是否可以编辑
+ hiddenDragMenu: false, // 隐藏拖拽操作按钮
+ hiddenDragBtn: false, // 隐藏拖拽按钮
+ hiddenMenu: [], // 隐藏部分菜单
+ hiddenItem: [], // 隐藏部分组件
+ hiddenItemConfig: {}, // 隐藏组件的部分配置项
+ disabledItemConfig: {}, // 禁用组件的部分配置项
+ showSaveBtn: false, // 是否显示保存按钮
+ showConfig: true, // 是否显示右侧的配置界面
+ showBaseForm: true, // 是否显示组件的基础配置表单
+ showControl: true, // 是否显示组件联动
+ showPropsForm: true, // 是否显示组件的属性配置表单
+ showEventForm: true, // 是否显示组件的事件配置表单
+ showValidateForm: true, // 是否显示组件的验证配置表单
+ showFormConfig: true, // 是否显示表单配置
+ showInputData: true, // 是否显示录入按钮
+ showDevice: true, // 是否显示多端适配选项
+ appendConfigData: [] // 定义渲染规则所需的formData
+})
const designer = ref() // 表单设计器
const dialogVisible = ref(false) // 弹窗的是否展示
const dialogTitle = ref('') // 弹窗的标题
@@ -140,3 +166,13 @@ onMounted(async () => {
hljs.registerLanguage('json', json)
})
+
+
diff --git a/src/views/infra/webSocket/index.vue b/src/views/infra/webSocket/index.vue
index a794344d..37f1322e 100644
--- a/src/views/infra/webSocket/index.vue
+++ b/src/views/infra/webSocket/index.vue
@@ -71,7 +71,7 @@
diff --git a/src/views/iot/device/detail/DeviceDetailsHeader.vue b/src/views/iot/device/detail/DeviceDetailsHeader.vue
new file mode 100644
index 00000000..62960529
--- /dev/null
+++ b/src/views/iot/device/detail/DeviceDetailsHeader.vue
@@ -0,0 +1,76 @@
+
+
+
+
+ {{ product.name }}
+
+
+ {{ product.productKey }}
+ 复制
+
+
+
+
+
+
+
+ {{ product.name }}
+
+ {{ product.productKey }}
+ 复制
+
+
+
+
+ {{ device.deviceName }}
+ 复制
+
+ {{ device.nickname }}
+
+ {{ formatDate(device.createTime) }}
+
+
+ {{ formatDate(device.activeTime) }}
+
+
+ {{ formatDate(device.lastOnlineTime) }}
+
+
+
+
+ {{ formatDate(device.lastOfflineTime) }}
+
+
+ 查看
+
+
+
+
+
+
+
+
+
diff --git a/src/views/iot/device/detail/index.vue b/src/views/iot/device/detail/index.vue
new file mode 100644
index 00000000..2db16bbc
--- /dev/null
+++ b/src/views/iot/device/detail/index.vue
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+
+
+
diff --git a/src/views/iot/device/index.vue b/src/views/iot/device/index.vue
new file mode 100644
index 00000000..784b1482
--- /dev/null
+++ b/src/views/iot/device/index.vue
@@ -0,0 +1,267 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.deviceName }}
+
+
+
+
+ {{ productMap[scope.row.productId] }}
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+
+
+ 编辑
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+ {{ product.productKey }}
+ 复制
+
+
+
+
+ {{ product.deviceCount }}
+ 前往管理
+
+
+
+
+
+
+
+ {{ product.name }}
+
+
+
+ {{ formatDate(product.createTime) }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ product.description }}
+
+
+
+
+
diff --git a/src/views/iot/product/detail/ProductTopic.vue b/src/views/iot/product/detail/ProductTopic.vue
new file mode 100644
index 00000000..c327bb65
--- /dev/null
+++ b/src/views/iot/product/detail/ProductTopic.vue
@@ -0,0 +1,243 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/iot/product/detail/ThinkModelFunction.vue b/src/views/iot/product/detail/ThinkModelFunction.vue
new file mode 100644
index 00000000..5a75d109
--- /dev/null
+++ b/src/views/iot/product/detail/ThinkModelFunction.vue
@@ -0,0 +1,154 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 编辑
+
+
+ 删除
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/views/iot/product/index.vue b/src/views/iot/product/index.vue
new file mode 100644
index 00000000..fa285819
--- /dev/null
+++ b/src/views/iot/product/index.vue
@@ -0,0 +1,191 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.name }}
+
+
+
+
+
+
+
+
+
+
+
+ 查看
+
+
+ 删除
+
+
+
+
+
+
+
+
+
直接领取
指定发放
- 新人卷
+ 新人劵
diff --git a/src/views/mall/promotion/discountActivity/DiscountActivityForm.vue b/src/views/mall/promotion/discountActivity/DiscountActivityForm.vue
index 3004488d..6c2469f6 100644
--- a/src/views/mall/promotion/discountActivity/DiscountActivityForm.vue
+++ b/src/views/mall/promotion/discountActivity/DiscountActivityForm.vue
@@ -190,7 +190,7 @@ const submitForm = async () => {
const products = cloneDeep(spuAndSkuListRef.value.getSkuConfigs('productConfig'))
products.forEach((item: DiscountActivityApi.DiscountProductVO) => {
item.discountPercent = convertToInteger(item.discountPercent)
- item.discountPrice = convertToInteger(yuanToFen(item.discountPrice))
+ item.discountPrice = convertToInteger(item.discountPrice)
})
const data = cloneDeep(formRef.value.formModel) as DiscountActivityApi.DiscountActivityVO
data.products = products
diff --git a/src/views/mall/promotion/discountActivity/discountActivity.data.ts b/src/views/mall/promotion/discountActivity/discountActivity.data.ts
index 217b7ab3..81540b0f 100644
--- a/src/views/mall/promotion/discountActivity/discountActivity.data.ts
+++ b/src/views/mall/promotion/discountActivity/discountActivity.data.ts
@@ -70,17 +70,6 @@ const crudSchemas = reactive([
width: 120
}
},
- {
- label: '优惠类型',
- field: 'discountType',
- dictType: DICT_TYPE.PROMOTION_DISCOUNT_TYPE,
- dictClass: 'number',
- isSearch: true,
- form: {
- component: 'Radio',
- value: 1
- }
- },
{
label: '活动商品',
field: 'spuId',
diff --git a/src/views/mall/promotion/kefu/components/KeFuConversationList.vue b/src/views/mall/promotion/kefu/components/KeFuConversationList.vue
index 0ff3d422..6e011231 100644
--- a/src/views/mall/promotion/kefu/components/KeFuConversationList.vue
+++ b/src/views/mall/promotion/kefu/components/KeFuConversationList.vue
@@ -22,13 +22,15 @@
编号：{{ id }}
+
+
- {{ processInstance.name }}
+
-
+
-
- {{ processInstance?.startUser?.nickname }}
-
-
- {{ processInstance?.startUser?.nickname }}
- {{ formatDate(processInstance.startTime) }} 提交
-
+
-
+
+ {{ processInstance?.startUser?.nickname }}
+
+
+ {{ processInstance?.startUser?.nickname }}
+ {{ formatDate(processInstance.startTime) }} 提交
+
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
- 流转评论
-
+
+
+
+
+
+ 流转评论
+
+
+
\ No newline at end of file
+
diff --git a/src/views/bpm/task/copy/index.vue b/src/views/bpm/task/copy/index.vue
index 93f55c68..045e2074 100644
--- a/src/views/bpm/task/copy/index.vue
+++ b/src/views/bpm/task/copy/index.vue
@@ -111,11 +111,16 @@ const getList = async () => {
/** 处理审批按钮 */
const handleAudit = (row: any) => {
+ const query = {
+ id: row.processInstanceId,
+ activityId: undefined
+ }
+ if (row.activityId) {
+ query.activityId = row.activityId
+ }
push({
name: 'BpmProcessInstanceDetail',
- query: {
- id: row.processInstanceId
- }
+ query: query
})
}
diff --git a/src/views/bpm/task/done/index.vue b/src/views/bpm/task/done/index.vue
index a5137199..98768212 100644
--- a/src/views/bpm/task/done/index.vue
+++ b/src/views/bpm/task/done/index.vue
@@ -158,7 +158,8 @@ const handleAudit = (row: any) => {
push({
name: 'BpmProcessInstanceDetail',
query: {
- id: row.processInstance.id
+ id: row.processInstance.id,
+ taskId: row.id
}
})
}
diff --git a/src/views/bpm/task/todo/index.vue b/src/views/bpm/task/todo/index.vue
index 670fc683..bf32ecb1 100644
--- a/src/views/bpm/task/todo/index.vue
+++ b/src/views/bpm/task/todo/index.vue
@@ -140,7 +140,8 @@ const handleAudit = (row: any) => {
push({
name: 'BpmProcessInstanceDetail',
query: {
- id: row.processInstance.id
+ id: row.processInstance.id,
+ taskId: row.id
}
})
}
diff --git a/src/views/infra/build/index.vue b/src/views/infra/build/index.vue
index 571acffe..05ea7334 100644
--- a/src/views/infra/build/index.vue
+++ b/src/views/infra/build/index.vue
@@ -1,16 +1,17 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
- 生成 JSON
- 生成 Options
- 生成组件
-
-
+
+
+
+
+
+
+ {{ device.deviceName }}
+
+
+
+
+
+
+ 编辑
+
+
+
+
+
+
+
+
+
+ {{ product.name }}
+
+
+
+
+
+
+ 编辑
+
+
+ 发布
+
+
+ 撤销发布
+
+
+
{{ item.userNickname }}
-
@@ -205,7 +207,7 @@ watch(showRightMenu, (val) => {
.active {
border-left: 5px #3271ff solid;
- background-color: var(--left-menu-bg-active-color);
+ background-color: var(--login-bg-color);
}
.pinned {
@@ -215,7 +217,7 @@ watch(showRightMenu, (val) => {
.right-menu-ul {
position: absolute;
background-color: var(--app-content-bg-color);
- padding: 10px;
+ padding: 5px;
margin: 0;
list-style-type: none; /* 移除默认的项目符号 */
border-radius: 12px;
diff --git a/src/views/mall/promotion/kefu/components/message/OrderItem.vue b/src/views/mall/promotion/kefu/components/message/OrderItem.vue
index 84d61779..c50d7c5d 100644
--- a/src/views/mall/promotion/kefu/components/message/OrderItem.vue
+++ b/src/views/mall/promotion/kefu/components/message/OrderItem.vue
@@ -1,8 +1,13 @@
-
+
- 添加优惠卷
+ 添加优惠劵
订单号：{{ getMessageContent.no }}
+
+ 订单号：
+
+ {{ getMessageContent.no }}
+
+
{{ formatOrderStatus(getMessageContent) }}
@@ -113,8 +118,15 @@ function formatOrderStatus(order: any) {
height: 28px;
.order-no {
- font-size: 10px;
+ font-size: 12px;
font-weight: 500;
+
+ span {
+ &:hover {
+ text-decoration: underline;
+ color: var(--left-menu-bg-active-color);
+ }
+ }
}
}
diff --git a/src/views/mall/promotion/kefu/index.vue b/src/views/mall/promotion/kefu/index.vue
index e6b4976f..2b54026b 100644
--- a/src/views/mall/promotion/kefu/index.vue
+++ b/src/views/mall/promotion/kefu/index.vue
@@ -25,7 +25,7 @@
import { KeFuConversationList, KeFuMessageList, MemberBrowsingHistory } from './components'
import { WebSocketMessageTypeConstants } from './components/tools/constants'
import { KeFuConversationRespVO } from '@/api/mall/promotion/kefu/conversation'
-import { getAccessToken } from '@/utils/auth'
+import { getRefreshToken } from '@/utils/auth'
import { useWebSocket } from '@vueuse/core'
defineOptions({ name: 'KeFu' })
@@ -34,7 +34,9 @@ const message = useMessage() // 消息弹窗
// ======================= WebSocket start =======================
const server = ref(
- (import.meta.env.VITE_BASE_URL + '/infra/ws').replace('http', 'ws') + '?token=' + getAccessToken()
+ (import.meta.env.VITE_BASE_URL + '/infra/ws').replace('http', 'ws') +
+ '?token=' +
+ getRefreshToken() // 使用 getRefreshToken() 方法，而不使用 getAccessToken() 方法的原因：WebSocket 无法方便的刷新访问令牌
) // WebSocket 服务地址
/** 发起 WebSocket 连接 */
diff --git a/src/views/mall/promotion/rewardActivity/components/RewardRuleCouponSelect.vue b/src/views/mall/promotion/rewardActivity/components/RewardRuleCouponSelect.vue
index f515e4f1..ccadd0b9 100644
--- a/src/views/mall/promotion/rewardActivity/components/RewardRuleCouponSelect.vue
+++ b/src/views/mall/promotion/rewardActivity/components/RewardRuleCouponSelect.vue
@@ -1,5 +1,5 @@
- ([]) // 选择的优惠券列表
-/** 选择赠送的优惠卷类型拓展 */
+/** 选择赠送的优惠类型拓展 */
interface GiveCouponVO extends CouponTemplateApi.CouponTemplateVO {
giveCount?: number
}
diff --git a/src/views/member/user/index.vue b/src/views/member/user/index.vue
index dc081fa6..1c873bf4 100644
--- a/src/views/member/user/index.vue
+++ b/src/views/member/user/index.vue
@@ -140,7 +140,7 @@
'member:user:update',
'member:user:update-level',
'member:user:update-point',
- 'member:user:update-balance'
+ 'pay:wallet:update-balance'
]"
@command="(command) => handleCommand(command, scope.row)"
>
@@ -169,7 +169,7 @@
修改积分
修改余额
diff --git a/src/views/report/jmreport/index.vue b/src/views/report/jmreport/index.vue
index 9f0ba725..37861519 100644
--- a/src/views/report/jmreport/index.vue
+++ b/src/views/report/jmreport/index.vue
@@ -6,9 +6,10 @@