diff --git a/src/utils/enums.js b/src/utils/enums.js index 6103bb0..b28c743 100644 --- a/src/utils/enums.js +++ b/src/utils/enums.js @@ -148,6 +148,7 @@ export const DeviceLockStatus = { export const AreaJoinType = { JOIN: "1", // 加盟 COOPERATE: "2", // 合伙 + OPERATION: "3", // 运维 } // 订单状态 diff --git a/src/views/bst/areaJoin/components/AreaJoinEditDialog.vue b/src/views/bst/areaJoin/components/AreaJoinEditDialog.vue index 0d59571..b4bf172 100644 --- a/src/views/bst/areaJoin/components/AreaJoinEditDialog.vue +++ b/src/views/bst/areaJoin/components/AreaJoinEditDialog.vue @@ -14,18 +14,20 @@ - + - + @@ -70,6 +72,10 @@ export default { initData: { type: Object, default: () => ({}) + }, + types: { + type: Array, + default: () => [] } }, data() { @@ -123,7 +129,7 @@ export default { reset() { this.form = { id: null, - type: AreaJoinType.JOIN, + type: this.types?.[0], areaId: null, userId: null, point: null, diff --git a/src/views/bst/areaJoin/index.vue b/src/views/bst/areaJoin/index.vue index 97fc135..b24f787 100644 --- a/src/views/bst/areaJoin/index.vue +++ b/src/views/bst/areaJoin/index.vue @@ -11,12 +11,14 @@ - + @@ -145,6 +147,7 @@ :id="editId" :init-data="initData" @success="getList" + :types="types" /> @@ -212,10 +215,13 @@ export default { userId: null, remark: null, createId: null - } + }, + types: [], // 类型列表 }; }, created() { + this.types = this.$route.query?.types?.split(',') || []; + this.queryParams.types = this.types; this.getList(); }, methods: { diff --git a/src/views/bst/device/components/DeviceSn.vue b/src/views/bst/device/components/DeviceSn.vue index 2cf4d87..d75d89c 100644 --- a/src/views/bst/device/components/DeviceSn.vue +++ b/src/views/bst/device/components/DeviceSn.vue @@ -41,7 +41,7 @@ export default { computed: { // 二维码文本 qrCodeText() { - return "https://wc.chuangtewl.com/xl/xd?s=" + this.sn; + return "https://wx.ccttiot.com/x/d?s=" + this.sn; }, }, methods: { diff --git a/src/views/bst/device/view/view.vue b/src/views/bst/device/view/view.vue index b07ff26..45b48f9 100644 --- a/src/views/bst/device/view/view.vue +++ b/src/views/bst/device/view/view.vue @@ -77,7 +77,7 @@ {{ detail.areaName | dv }} - {{ detail.mchName | dv }} + {{ detail.mchName | dv }} {{ detail.modelName | dv }}