diff --git a/src/components/SimpleVerifyDialog/index.vue b/src/components/SimpleVerifyDialog/index.vue
index de7b3b4..371732c 100644
--- a/src/components/SimpleVerifyDialog/index.vue
+++ b/src/components/SimpleVerifyDialog/index.vue
@@ -1,5 +1,5 @@
-
+
0) {
- url += `&${query}`;
+ url += `?${query}`;
}
}
console.log("wx_url", url);
diff --git a/src/views/ss/ad/index.vue b/src/views/ss/ad/index.vue
index 08e08ed..23e7512 100644
--- a/src/views/ss/ad/index.vue
+++ b/src/views/ss/ad/index.vue
@@ -84,6 +84,11 @@
+
+
+
+
+
@@ -130,6 +135,16 @@
+
+
+
+
+
@@ -150,7 +165,7 @@ import { listAd, getAd, delAd, addAd, updateAd } from "@/api/ss/ad";
export default {
name: "Ad",
- dicts: ['ss_ad_type'],
+ dicts: ['ss_ad_type', 'ss_ad_url_type'],
data() {
return {
// 遮罩层
@@ -185,12 +200,9 @@ export default {
form: {},
// 表单校验
rules: {
- createTime: [
- { required: true, message: "创建时间不能为空", trigger: "blur" }
+ urlType: [
+ { required: true, message: "跳转链接类型不允许为空", trigger: "blur" }
],
- deleted: [
- { required: true, message: "逻辑删除标志,0否,1是不能为空", trigger: "blur" }
- ]
}
};
},
@@ -218,6 +230,7 @@ export default {
adId: null,
type: null,
picture: null,
+ urlType: "1",
url: null,
createBy: null,
createTime: null,
diff --git a/src/views/system/device/detail.vue b/src/views/system/device/detail.vue
index 6202c73..7f4cf0a 100644
--- a/src/views/system/device/detail.vue
+++ b/src/views/system/device/detail.vue
@@ -99,7 +99,7 @@ export default {
computed: {
qrCodeText() {
return (device) => {
- return getWxIndexUrl({ deviceNo: device.deviceNo});
+ return getWxIndexUrl({ s: device.deviceNo});
}
},
},
diff --git a/src/views/system/device/index.vue b/src/views/system/device/index.vue
index e93c25c..d739718 100644
--- a/src/views/system/device/index.vue
+++ b/src/views/system/device/index.vue
@@ -338,7 +338,7 @@ export default {
// 二维码文本
qrCodeText() {
return (device) => {
- return getWxIndexUrl({ deviceNo: device.deviceNo});
+ return getWxIndexUrl({ s: device.deviceNo});
}
},
},