From f545755e678b8ccb8c08acee3753261a6a7022ef Mon Sep 17 00:00:00 2001
From: jiazhipeng <jiazhipeng@xmainc.com>
Date: Wed, 15 Jan 2025 19:44:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=94=80=E4=BA=8C=E6=AC=A1=E7=A1=AE?=
 =?UTF-8?q?=E8=AE=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app.js                       |  2 +-
 pages/index/index.wxml       | 11 +--------
 pages/user/logout/index.js   | 44 ++++++++++++++++++++++++------------
 pages/user/logout/index.wxml |  9 ++++++++
 4 files changed, 40 insertions(+), 26 deletions(-)

diff --git a/app.js b/app.js
index 170af3f..3429dbc 100644
--- a/app.js
+++ b/app.js
@@ -21,7 +21,7 @@ App({
       unique_key: "wechatxcx"
     }).then(res => {
       let data = JSON.parse(res.data);
-      data.isTest = data.isTest? true : false;
+      data.isTest = data.isTest155? true : false;
       this.globalData.configJson = data
     }).then(() => {
       // 获取ui配置文件
diff --git a/pages/index/index.wxml b/pages/index/index.wxml
index ca9bc60..b405320 100644
--- a/pages/index/index.wxml
+++ b/pages/index/index.wxml
@@ -568,16 +568,7 @@
         <view class="dot{{smBannerIndex==index?' active':''}}" wx:for="{{xiaobanner}}" wx:key="this"></view>
         </view>
     </view>
-    <!-- 2024年 夏季改UI新增景区舒适度和实时路况 -->
-    <view style="display: flex;">
-        <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://m.cloud.sz-trip.com/aiPlay" class="jqssd">
-        <!-- <view bindtap="gotoUrl" data-event="comfort_click" data-title="景区舒适度" data-url="https://wlsjzx.zdhxwl.cn/kt_h5/index.html#/morecopy" class="jqssd"> -->
-        <image src="{{indexSeason.ai}}" mode=""/>
-        </view>
-        <view bindtap="gotoUrls" data-event="xlqc" class="sslk">
-        <image src="{{indexSeason.avoid}}" mode=""/>
-        </view>
-    </view>
+
 
     <view class="sale-road-boxes" style="margin-top:0">
         <image mode="heightFix" style="height:86rpx" src="{{indexSeason.wlcx}}"></image>
diff --git a/pages/user/logout/index.js b/pages/user/logout/index.js
index f2145fe..7b275a2 100644
--- a/pages/user/logout/index.js
+++ b/pages/user/logout/index.js
@@ -12,10 +12,10 @@ Page({
   },
 
   gotoLogoutNotice(){
-    app.globalData.weburl = "https://m.cloud.sz-trip.com/LogoutNoticeApp"
     wx.navigateTo({
-      url: '/pages/pbService/web/index'
+        url: "/pages/pbService/web/index?weburl="+encodeURIComponent('https://m.cloud.sz-trip.com/LogoutNotice'),
     })
+    
   },
 
   changeCheck() {
@@ -35,21 +35,35 @@ Page({
       })
       return;
     }
-    common.user_post('uservice/user/user_logout', { protocol: that.data.protocol ? 1 : 0 }).then(res => {
-      if (res) {
-        wx.showToast({
-          title: res.msg,
-          icon: 'none'
-        })
-        if (res.code === 1) {
-          setTimeout(() => {
-            wx.switchTab({
-              url: '/pages/user/user',
-            })
-          }, 400)
+
+    wx.showModal({
+        title: '提示',
+        content: '是否确认注销账号？',
+        success (res) {
+            if (res.confirm) {
+                common.user_post('uservice/user/user_logout', { protocol: that.data.protocol ? 1 : 0 }).then(res => {
+                    if (res) {
+                      wx.showToast({
+                        title: res.msg,
+                        icon: 'none'
+                      })
+                      if (res.code === 1) {
+                        setTimeout(() => {
+                          wx.switchTab({
+                            url: '/pages/user/user',
+                          })
+                        }, 400)
+                      }
+                    }
+                  })
+                
+            }
+            
         }
-      }
     })
+
+    
+
   },
 
   /**
diff --git a/pages/user/logout/index.wxml b/pages/user/logout/index.wxml
index 2b66239..e4858b3 100644
--- a/pages/user/logout/index.wxml
+++ b/pages/user/logout/index.wxml
@@ -9,6 +9,15 @@
   <view class="content">
     <view>2.账号无未完成订单</view>
     <view>账号无未核销、未支付、待退款等状态的订单。</view>
+  </view>
+  <view class="content">
+    <view>3.上述账号留存的信息、权益将被清空且无法找回</view>
+    <view>· 银行卡的快捷支付(含卡通)服务</view>
+    <view>· 使用各产品/服务时留存的其他信息</view>
+    <view>· 身份信息，如个人资料、实名认证信息等账号资产及权益，如各产品/服务的会员及权益、优惠券等</view>
+    <view>· 业务订单及交易记录，请确保所有交易已完结且无纠纷账号注销后的因历史交易可能产生的资金退回等权益视作自动放弃</view>
+    
+
   </view>
   <view class="notice-msg">
     <checkbox-group bindchange="changeCheck">