From e5e909770a3d7a9094e901706ba301b74e11430c Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Mon, 30 Oct 2023 16:02:21 +0800
Subject: [PATCH] =?UTF-8?q?webview=E7=9A=84=E9=93=BE=E6=8E=A5=E6=9C=89?=
 =?UTF-8?q?=E7=89=B9=E6=AE=8A=E5=AD=97=E7=AC=A6=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/webView/webView.js                                | 6 ++++--
 pages/work/work.js                                      | 2 +-
 project.private.config.json                             | 7 +++++++
 subpages/communitySelfInsp/pages/synthesis/synthesis.js | 2 +-
 4 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/pages/webView/webView.js b/pages/webView/webView.js
index 8d37869..9b1a479 100644
--- a/pages/webView/webView.js
+++ b/pages/webView/webView.js
@@ -4,14 +4,16 @@ Page({
     url: ''
   },
   onLoad: function (options) {
+    console.log(options);
+    console.log( decodeURIComponent(options.url));
     if (options.token) {
       this.setData({
-        url: `${options.url}?token=${options.token}&deptName=${options.deptName}&gridId=${options.gridId}`
+        url: `${options.url}`
       })
       console.log('url',this.data.url)
     } else {
       this.setData({
-        url: options.url
+        url: decodeURIComponent(options.url)
         // url:`${options.url}?deptName=${options.deptName}&gridId=${options.gridId}`
       })
     }
diff --git a/pages/work/work.js b/pages/work/work.js
index 1cba83e..d0268e5 100644
--- a/pages/work/work.js
+++ b/pages/work/work.js
@@ -121,7 +121,7 @@ Page({
     onShareAppMessage() {
         return{
             title:`${this.data.communitySelfInspTop.agencyName}${this.data.communitySelfInspTop.monthName}月份满意度调查`,
-            path:'/pages/webView/webView?url=' + this.data.questionnaireUrl,
+            path:'/pages/webView/webView?url=' + encodeURIComponent(this.data.communitySelfInspTop.questionnaireUrl),
             imageUrl:'../../images/work/shareBg.png'
           }
     },
diff --git a/project.private.config.json b/project.private.config.json
index af4eb30..1420c69 100644
--- a/project.private.config.json
+++ b/project.private.config.json
@@ -8,6 +8,13 @@
     "condition": {
         "miniprogram": {
             "list": [
+                {
+                    "name": "",
+                    "pathName": "pages/webView/webView",
+                    "query": "url=https://epmet-preview.elinkservice.cn/questionnaire/s/8ac9e858e42b4d87bc15812e60e930c4?agencyId=1691779171481239553&anonymous=1",
+                    "launchMode": "default",
+                    "scene": null
+                },
                 {
                     "name": "身份识别",
                     "pathName": "subpages/OCRCard/pages/index/index",
diff --git a/subpages/communitySelfInsp/pages/synthesis/synthesis.js b/subpages/communitySelfInsp/pages/synthesis/synthesis.js
index d66191d..b3cc7e7 100644
--- a/subpages/communitySelfInsp/pages/synthesis/synthesis.js
+++ b/subpages/communitySelfInsp/pages/synthesis/synthesis.js
@@ -107,7 +107,7 @@ Page({
     onShareAppMessage() {
         return{
             title:`${this.data.agencyName}${this.data.monthName}月份满意度调查`,
-            path:'/pages/webView/webView?url=' + this.data.questionnaireUrl,
+            path:'/pages/webView/webView?url=' +  encodeURIComponent(this.data.questionnaireUrl),
             imageUrl:'../../../../images/work/shareBg.png'
           }
     },