From d8d2c5d7af1ac6e25f9b83338f070b928678d67c Mon Sep 17 00:00:00 2001
From: yvette <pypcwt@163.com>
Date: Sun, 7 Feb 2021 16:36:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/activity/suyear/index.js | 2 +-
 pages/login/index.js           | 2 +-
 pages/map/index.wxml           | 2 +-
 pages/user/bindtel/index.js    | 2 +-
 utils/https.js                 | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pages/activity/suyear/index.js b/pages/activity/suyear/index.js
index 3ab4768..d7d6e19 100644
--- a/pages/activity/suyear/index.js
+++ b/pages/activity/suyear/index.js
@@ -77,7 +77,7 @@ Page({
     if(item.title=='沙家浜景区'){
       wx.navigateToMiniProgram({
         appId: 'wx98a352b4689e46d8',
-        path:'pages/sightspots/booking?id=24&type=default'
+        path:'pages/sightspots/booking?id=32&type=default'
       })
       return;
     }
diff --git a/pages/login/index.js b/pages/login/index.js
index 34ace56..eb02fb5 100644
--- a/pages/login/index.js
+++ b/pages/login/index.js
@@ -38,7 +38,7 @@ Page({
           // 已经注册的用户返回userinfo
           if (r.data.isBindMobile === 0) {
             wx.redirectTo({
-              url: '/pages/user/bindtel/index?regToken=' + r.data.openid,
+              url: '/pages/user/bindtel/index?regToken=' + encodeURIComponent(r.data.openid),
             })
           }
           else if(r.data && r.data.id && r.data.token){
diff --git a/pages/map/index.wxml b/pages/map/index.wxml
index e59ba95..ed91ecb 100644
--- a/pages/map/index.wxml
+++ b/pages/map/index.wxml
@@ -49,6 +49,6 @@
   <view class="info" style="{{info.info.headimg?'':'width:100%'}}">
     <view class="title textOver">{{info.info.title}}</view>
     <view class="subtitle textOver2">地址：{{info.info.address}}</view>
-    <view wx:if="{{item.type!='academes'}}" bindtap="gotoDetail" class="info-btn">查看详情</view>
+    <view wx:if="{{info.info.type!='academes'}}" bindtap="gotoDetail" class="info-btn">查看详情</view>
   </view>
 </view>
\ No newline at end of file
diff --git a/pages/user/bindtel/index.js b/pages/user/bindtel/index.js
index 9769642..2379540 100644
--- a/pages/user/bindtel/index.js
+++ b/pages/user/bindtel/index.js
@@ -25,7 +25,7 @@ Page({
   onLoad: function (options) {
     this.changeImgCode();
     this.setData({
-      regToken: options.regToken || null
+      regToken: decodeURIComponent(options.regToken) || null
     })
   },
   cancel:function(){
diff --git a/utils/https.js b/utils/https.js
index 1bb20b3..7d95ce3 100644
--- a/utils/https.js
+++ b/utils/https.js
@@ -231,7 +231,7 @@ const checkLogin = () => {
                   // 已经注册的用户返回userinfo
                   else if (r.data.isBindMobile === 0 && page[page.length-1].route!='pages/user/bindtel/index') {
                     wx.navigateTo({
-                      url: '/pages/user/bindtel/index?regToken=' + r.data.openid,
+                      url: '/pages/user/bindtel/index?regToken=' + encodeURIComponent(r.data.openid),
                     })
                   }
                 }).catch(err => {