From fa5bc9f385cf7de24772eb6641e7f05d7da01f09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A2=A8=E5=A4=A7=E5=8F=94?= <494979559@qq.com>
Date: Thu, 30 May 2024 15:52:59 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E8=B7=B3=E8=BD=AC=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/SimpleVerifyDialog/index.vue |  2 +-
 src/utils/wx.js                             |  4 ++--
 src/views/ss/ad/index.vue                   | 25 ++++++++++++++++-----
 src/views/system/device/detail.vue          |  2 +-
 src/views/system/device/index.vue           |  2 +-
 5 files changed, 24 insertions(+), 11 deletions(-)

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 @@
 <template>
-  <el-dialog :title="title" :visible.sync="show" width="500px" center @open="open" @close="close">
+  <el-dialog :title="title" :visible="show" width="500px" center @open="open" @close="close">
     <el-form :model="form" :rules="rules" ref="form">
       <el-form-item label="审核意见" prop="remark">
         <el-input
diff --git a/src/utils/wx.js b/src/utils/wx.js
index 72400d3..06aff92 100644
--- a/src/utils/wx.js
+++ b/src/utils/wx.js
@@ -6,13 +6,13 @@ export function getWxSchemeUrl(path, query) {
 }
 
 export function getWxIndexUrl(query) {
-  let url = `https://kaiguan.chuantewulian.cn/wxjump/index?action=device`;
+  let url = `https://kg.chuantewulian.cn/w`;
   if (query != null ) {
     if (query instanceof Object) {
       query = tansParams(query).slice(0, -1);
     }
     if (query.length > 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 @@
           <image-preview :src="scope.row.picture" :width="50" :height="50"/>
         </template>
       </el-table-column>
+      <el-table-column label="跳转类型" align="center" prop="urlType">
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.ss_ad_url_type" :value="scope.row.urlType"/>
+        </template>
+      </el-table-column>
       <el-table-column label="跳转链接" align="center" prop="url" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -130,6 +135,16 @@
         <el-form-item label="广告图片" prop="picture">
           <image-upload v-model="form.picture" :limit="1"/>
         </el-form-item>
+        <el-form-item label="跳转类型" prop="urlType">
+          <el-select v-model="form.urlType" placeholder="请选择跳转类型">
+            <el-option
+              v-for="dict in dict.type.ss_ad_url_type"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="跳转链接" prop="url">
           <el-input v-model="form.url" placeholder="请输入跳转链接" />
         </el-form-item>
@@ -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});
       }
     },
   },