From 553543b5b3d94d1bc8a02f689652b7257b67c6ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A7=A6=E5=BD=A6=E7=A5=96?= <605893810@qq.com>
Date: Thu, 20 Nov 2025 23:28:28 +0800
Subject: [PATCH] =?UTF-8?q?feat=EF=BC=9A=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
 =?UTF-8?q?=E6=94=B9=E9=80=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |   22 +-
 pages/LuckyWheel/LuckyWheel.vue               |   94 --
 pages/login_package/login/login.vue           | 1051 ++++++++---------
 .../dengbo-lotteryWheel/changelog.md          |    0
 .../dengbo-lotteryWheel.vue                   |    0
 .../dengbo-lotteryWheel/package.json          |    0
 .../components}/dengbo-lotteryWheel/readme.md |    0
 pages/other_package/turntable/turntable.vue   |    4 +
 .../accountOut.vue}                           |  332 +++---
 .../accountSafe.vue}                          |  298 ++---
 .../components}/qiun-data-charts/changelog.md |    0
 .../qiun-data-charts/qiun-data-charts.vue     |    0
 .../components/qiun-error/qiun-error.vue      |    0
 .../components/qiun-loading/loading1.vue      |    0
 .../components/qiun-loading/loading2.vue      |    0
 .../components/qiun-loading/loading3.vue      |    0
 .../components/qiun-loading/loading4.vue      |    0
 .../components/qiun-loading/loading5.vue      |    0
 .../components/qiun-loading/qiun-loading.vue  |    0
 .../js_sdk/u-charts/config-echarts.js         |    0
 .../js_sdk/u-charts/config-ucharts.js         |    0
 .../js_sdk/u-charts/readme.md                 |    0
 .../js_sdk/u-charts/u-charts-v2.0.0.js        |    0
 .../js_sdk/u-charts/u-charts.js               |    0
 .../components}/qiun-data-charts/license.md   |    0
 .../components}/qiun-data-charts/package.json |    0
 .../components}/qiun-data-charts/readme.md    |    0
 .../static/app-plus/echarts.min.js            |    0
 .../qiun-data-charts/static/h5/echarts.min.js |    0
 pages/rwa_package/dongjian/finance.vue        |   35 +-
 .../{setting => express}/express.vue          |    0
 .../forgotPass.vue}                           |    0
 pages/rwa_package/{setting => kefu}/kefu.vue  |    0
 .../outAgreement.vue}                         |  272 ++---
 .../out-code.vue => outCode/outCode.vue}      |    0
 .../set-name.vue => setName/setName.vue}      |    0
 pages/rwa_package/setting/setting.vue         |    6 +-
 pages/rwa_package/{setting => zhao}/zhao.vue  |    0
 .../{setting => zhaopian}/zhaopian.vue        |  213 ++--
 39 files changed, 1096 insertions(+), 1231 deletions(-)
 delete mode 100644 pages/LuckyWheel/LuckyWheel.vue
 rename {uni_modules => pages/other_package/components}/dengbo-lotteryWheel/changelog.md (100%)
 rename {uni_modules => pages/other_package/components}/dengbo-lotteryWheel/components/dengbo-lotteryWheel/dengbo-lotteryWheel.vue (100%)
 rename {uni_modules => pages/other_package/components}/dengbo-lotteryWheel/package.json (100%)
 rename {uni_modules => pages/other_package/components}/dengbo-lotteryWheel/readme.md (100%)
 rename pages/rwa_package/{setting/account-out.vue => accountOut/accountOut.vue} (93%)
 rename pages/rwa_package/{setting/account-safe.vue => accountSafe/accountSafe.vue} (93%)
 rename {uni_modules => pages/rwa_package/components}/qiun-data-charts/changelog.md (100%)
 rename {uni_modules => pages/rwa_package/components}/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue (100%)
 rename {uni_modules => pages/rwa_package/components}/qiun-data-charts/components/qiun-error/qiun-error.vue (100%)
 rename {uni_modules => pages/rwa_package/components}/qiun-data-charts/components/qiun-loading/loading1.vue (100%)
 rename {uni_modules => pages/rwa_package/components}/qiun-data-charts/components/qiun-loading/loading2.vue (100%)
 rename {uni_modules => pages/rwa_package/components}/qiun-data-charts/components/qiun-loading/loading3.vue (100%)
 rename {uni_modules => pages/rwa_package/components}/qiun-data-charts/components/qiun-loading/loading4.vue (100%)
 rename {uni_modules => pages/rwa_package/components}/qiun-data-charts/components/qiun-loading/loading5.vue (100%)
 rename {uni_modules => pages/rwa_package/components}/qiun-data-charts/components/qiun-loading/qiun-loading.vue (100%)
 rename {uni_modules => pages/rwa_package/components}/qiun-data-charts/js_sdk/u-charts/config-echarts.js (100%)
 rename {uni_modules => pages/rwa_package/components}/qiun-data-charts/js_sdk/u-charts/config-ucharts.js (100%)
 rename {uni_modules => pages/rwa_package/components}/qiun-data-charts/js_sdk/u-charts/readme.md (100%)
 rename {uni_modules => pages/rwa_package/components}/qiun-data-charts/js_sdk/u-charts/u-charts-v2.0.0.js (100%)
 rename {uni_modules => pages/rwa_package/components}/qiun-data-charts/js_sdk/u-charts/u-charts.js (100%)
 rename {uni_modules => pages/rwa_package/components}/qiun-data-charts/license.md (100%)
 rename {uni_modules => pages/rwa_package/components}/qiun-data-charts/package.json (100%)
 rename {uni_modules => pages/rwa_package/components}/qiun-data-charts/readme.md (100%)
 rename {uni_modules => pages/rwa_package/components}/qiun-data-charts/static/app-plus/echarts.min.js (100%)
 rename {uni_modules => pages/rwa_package/components}/qiun-data-charts/static/h5/echarts.min.js (100%)
 rename pages/rwa_package/{setting => express}/express.vue (100%)
 rename pages/rwa_package/{setting/forgot-pass.vue => forgotPass/forgotPass.vue} (100%)
 rename pages/rwa_package/{setting => kefu}/kefu.vue (100%)
 rename pages/rwa_package/{setting/out-agreement.vue => outAgreement/outAgreement.vue} (95%)
 rename pages/rwa_package/{setting/out-code.vue => outCode/outCode.vue} (100%)
 rename pages/rwa_package/{setting/set-name.vue => setName/setName.vue} (100%)
 rename pages/rwa_package/{setting => zhao}/zhao.vue (100%)
 rename pages/rwa_package/{setting => zhaopian}/zhaopian.vue (91%)

diff --git a/pages.json b/pages.json
index 66ee768..f7464c9 100644
--- a/pages.json
+++ b/pages.json
@@ -281,7 +281,7 @@
             "navigationBarBackgroundColor": "#FFFFFF",
             "navigationBarTextStyle": "black",
             "enablePullDownRefresh": false,
-            "navigationStyle": "default" // 默认样式，会显示返回图标
+            "navigationStyle": "default"
           }
         },
         {
@@ -292,14 +292,14 @@
           }
         },
         {
-          "path": "setting/zhaopian",
+          "path": "zhaopian/zhaopian",
           "style": {
             "navigationStyle": "custom",
             "navigationBarTextStyle": "black"
           }
         },
         {
-          "path": "setting/zhao",
+          "path": "zhao/zhao",
           "style": {
             "navigationStyle": "custom",
             "navigationBarTextStyle": "black"
@@ -355,7 +355,7 @@
           }
         },
         {
-          "path": "setting/express",
+          "path": "express/express",
           "style": {
             "navigationStyle": "custom",
             "navigationBarTextStyle": "black"
@@ -383,49 +383,49 @@
           }
         },
         {
-          "path": "setting/out-agreement",
+          "path": "outAgreement/outAgreement",
           "style": {
             "navigationStyle": "custom",
             "navigationBarTextStyle": "black"
           }
         },
         {
-          "path": "setting/out-code",
+          "path": "outCode/outCode",
           "style": {
             "navigationStyle": "custom",
             "navigationBarTextStyle": "black"
           }
         },
         {
-          "path": "setting/set-name",
+          "path": "setName/setName",
           "style": {
             "navigationStyle": "custom",
             "navigationBarTextStyle": "black"
           }
         },
         {
-          "path": "setting/account-out",
+          "path": "accountOut/accountOut",
           "style": {
             "navigationStyle": "custom",
             "navigationBarTextStyle": "black"
           }
         },
         {
-          "path": "setting/forgot-pass",
+          "path": "forgotPass/forgotPass",
           "style": {
             "navigationStyle": "custom",
             "navigationBarTextStyle": "black"
           }
         },
         {
-          "path": "setting/account-safe",
+          "path": "accountSafe/accountSafe",
           "style": {
             "navigationStyle": "custom",
             "navigationBarTextStyle": "black"
           }
         },
         {
-          "path": "setting/kefu",
+          "path": "kefu/kefu",
           "style": {
             "navigationStyle": "custom",
             "navigationBarTextStyle": "black"
diff --git a/pages/LuckyWheel/LuckyWheel.vue b/pages/LuckyWheel/LuckyWheel.vue
deleted file mode 100644
index 7294319..0000000
--- a/pages/LuckyWheel/LuckyWheel.vue
+++ /dev/null
@@ -1,94 +0,0 @@
-<template>
-    <view class="content">
-        <view class="lottery">
-            <dengbo-lotteryWheel :prizes="prizes" :size="626" :duration="5000" @run="Click" @done="Done"
-                ref="luckyWheel" :lightImgs="lightImages" customStyle="borderRadius: 50%;">
-                <template v-slot:bg>
-                    <image src="https://static.tbmall.xin/static/turntable.png"
-                        style="width: 100%; height: 100%" />
-                </template>
-                <template v-slot:pointer>
-                    <up-image src="https://static.tbmall.xin/static/zz.png" width="40" height="40"
-                        mode="widthFix" @click="startWheel"></up-image>
-                </template>
-            </dengbo-lotteryWheel>
-        </view>
-    </view>
-</template>
-
-<script>
-export default {
-    data() {
-        return {
-            lightImages: ['https://static.tbmall.xin/static/zz.png', 'https://static.tbmall.xin/static/turntable.png'],
-            prizes: [{
-                name: '积分',
-                image: '/static/turntable/record.png',
-                pro: '50积分',
-            },
-            {
-                name: '积分',
-                image: '/static/turntable/record.png',
-                pro: '100积分',
-            },
-            {
-                name: '优惠券',
-                image: '/static/turntable/record.png',
-                pro: '15元优惠券',
-            },
-            {
-                name: '家用电器',
-                image: '/static/turntable/record.png',
-                pro: '微波炉',
-            },
-            {
-                name: '谢谢参与',
-                image: '/static/turntable/record.png',
-                pro: '15元优惠券',
-            },
-            {
-                name: '办公用品',
-                image: '/static/turntable/record.png',
-                pro: '机械键盘',
-            },
-            {
-                name: '生活用品',
-                image: '/static/turntable/record.png',
-                pro: '化妆刷',
-            },
-            ],
-        }
-    },
-    onLoad() {
-
-    },
-    methods: {
-        startWheel() {
-            this.$refs.luckyWheel.run(2);
-        },
-        Click() {
-            console.log('用户点击了转盘');
-            this.$refs.luckyWheel.run(2);
-        },
-        Done(prize) {
-            console.log('抽奖结束，中奖奖品：', prize);
-        },
-    }
-}
-</script>
-
-<style>
-.content {
-    display: flex;
-    flex-direction: column;
-    align-items: center;
-}
-
-.lottery {
-    position: relative;
-    display: inline-block;
-    width: 626rpx;
-    height: 626rpx;
-    margin-top: 100rpx;
-}
-</style>
\ No newline at end of file
diff --git a/pages/login_package/login/login.vue b/pages/login_package/login/login.vue
index 04d9ea4..061f693 100644
--- a/pages/login_package/login/login.vue
+++ b/pages/login_package/login/login.vue
@@ -1,602 +1,541 @@
 <template>
-	<view class="login_warp">
-		<u-icon size="30rpx" name="arrow-left" color="#333" @click="onBack"></u-icon>
-		<view class="login_logo_warp">
-			<view style="text-align: center">
-				<up-image src="/static/logo.png" width="90" height="118" bgColor="#f1f6ff00" radius="10"></up-image>
-			</view>
-			<!-- <view style="margin-top: 20rpx;">
+  <view class="login_warp">
+    <u-icon size="30rpx" name="arrow-left" color="#333" @click="onBack"></u-icon>
+    <view class="login_logo_warp">
+      <view style="text-align: center">
+        <up-image src="/static/logo.png" width="90" height="118" bgColor="#f1f6ff00" radius="10"></up-image>
+      </view>
+      <!-- <view style="margin-top: 20rpx;">
 				  <up-image src="/static/logo_z.png" width="100" height="40" bgColor="#f1f6ff00"></up-image>
 			  </view> -->
-		</view>
-		<view class="login_info">
-			<view class="login_info_item">
-				<up-input placeholder="请输入手机号/账户名称" border="surround" v-model="form.name" :customStyle="inputCss"
-					@change="checkNameParam"></up-input>
-			</view>
-			<!-- 密码登录 -->
-			<view class="login_info_item" v-if="loginWay === 'password'">
-				<up-input placeholder="请输入密码" border="surround" v-model="form.password" :customStyle="inputCss"
-					:type="isShow ? 'text' : 'password'" @change="checkParam">
-					<template #suffix style="margin-right: 10rpx">
-						<up-image v-if="isShow" src="/static/login/show.png" width="20" height="20" bgColor="#f1f6ff00"
-							@click="isShow = false"></up-image>
-						<up-image v-else src="/static/login/hidden.png" width="20" height="20" bgColor="#f1f6ff00"
-							@click="isShow = true"></up-image>
-					</template>
-				</up-input>
-			</view>
-			<!-- 验证码登录 -->
-			<view class="login_info_item" v-else>
-				<up-input placeholder="请输入验证码" border="surround" v-model="form.code" :customStyle="inputCss">
-					<template #suffix style="margin-right: 10rpx">
-						<view v-if="countdown" class="code-warp">
-							<up-count-down :time="60 * 1000" format="ss" @finish="countdown = false"></up-count-down>
-							<text style="margin-left: 10rpx">s</text>
-						</view>
-						<view v-else @click="getMobileCode" class="code_msg">
-							获取验证码
-						</view>
-					</template>
-				</up-input>
-			</view>
+    </view>
+    <view class="login_info">
+      <view class="login_info_item">
+        <up-input placeholder="请输入手机号/账户名称" border="surround" v-model="form.name" :customStyle="inputCss"
+          @change="checkNameParam"></up-input>
+      </view>
+      <!-- 密码登录 -->
+      <view class="login_info_item" v-if="loginWay === 'password'">
+        <up-input placeholder="请输入密码" border="surround" v-model="form.password" :customStyle="inputCss"
+          :type="isShow ? 'text' : 'password'" @change="checkParam">
+          <template #suffix style="margin-right: 10rpx">
+            <up-image v-if="isShow" src="/static/login/show.png" width="20" height="20" bgColor="#f1f6ff00"
+              @click="isShow = false"></up-image>
+            <up-image v-else src="/static/login/hidden.png" width="20" height="20" bgColor="#f1f6ff00"
+              @click="isShow = true"></up-image>
+          </template>
+        </up-input>
+      </view>
+      <!-- 验证码登录 -->
+      <view class="login_info_item" v-else>
+        <up-input placeholder="请输入验证码" border="surround" v-model="form.code" :customStyle="inputCss">
+          <template #suffix style="margin-right: 10rpx">
+            <view v-if="countdown" class="code-warp">
+              <up-count-down :time="60 * 1000" format="ss" @finish="countdown = false"></up-count-down>
+              <text style="margin-left: 10rpx">s</text>
+            </view>
+            <view v-else @click="getMobileCode" class="code_msg">
+              获取验证码
+            </view>
+          </template>
+        </up-input>
+      </view>
 
-			<view class="login_comm_but login_comm_but_yes" @click="loginFun">
-				<text style="margin-left: 10rpx">登录</text>
-			</view>
-			<view class="cut_way_warp">
-				<view v-if="loginWay === 'password'" @click="loginWay = 'code'">验证码登录</view>
-				<view v-if="loginWay === 'code'" @click="loginWay = 'password'">密码登录登录</view>
-				<view @click="jumpForgot">忘记密码</view>
-				<view @click="jumpRegister">注册</view>
-			</view>
-		</view>
-		<view>
-			<view class="other_login">其他登录方式</view>
-			<view class="login_other_icon">
-				<view class="login_other_item" @click="wechatOneLogin">
-					<up-image src="/static/login/WXICON.png" width="44" height="44" bgColor="#f1f6ff00"></up-image>
-					微信登录
-				</view>
-				<!-- <view  class="login_other_item" @click="aa"> -->
-				<view v-if="!isIOS" class="login_other_item" @click="alipayOneLogin">
-					<up-image src="/static/login/ZFB.png" width="44" height="44" bgColor="#f1f6ff00"></up-image>
-					支付宝登录
-				</view>
-			</view>
-		</view>
-		<view class="policy_warp">
-			<up-checkbox name="isCheck" usedAlone v-model:checked="isPolicy" shape="circle" activeColor="#7934F6"
-				size="19" iconSize="18">
-				<template #label>
-					<text>已阅读并同意</text>
-					<text class="policy_a_warp" @click="jumpUserAgreement">《服务协议》</text>
-					<text>、</text>
-					<text class="policy_a_warp" @click="jumpPrivacyAgreement">《隐私政策》</text>
-					<text>、</text>
-					<text class="policy_a_warp" @click="jumpProductAgreement">《售后保障协议》</text>
-				</template>
-			</up-checkbox>
-		</view>
-		<up-toast ref="uToastRef"></up-toast>
-		
-		<!-- 自定义协议弹窗 -->
-		<view v-if="showPolicyModal" class="modal-overlay" @click="showPolicyModal = false">
-			<view class="modal-content" @click.stop>
-				<view class="modal-title">温馨提示</view>
-				<view class="modal-message">请您阅读并同意《服务协议》与《隐私政策》</view>
-				<view class="modal-buttons">
-					<view class="modal-btn modal-btn-cancel" @click="showPolicyModal = false">取消</view>
-					<view class="modal-btn modal-btn-confirm" @click="handlePolicyConfirm">同意并登录</view>
-				</view>
-			</view>
-		</view>
-	</view>
+      <view class="login_comm_but login_comm_but_yes" @click="loginFun">
+        <text style="margin-left: 10rpx">登录</text>
+      </view>
+      <view class="cut_way_warp">
+        <view v-if="loginWay === 'password'" @click="loginWay = 'code'">验证码登录</view>
+        <view v-if="loginWay === 'code'" @click="loginWay = 'password'">密码登录登录</view>
+        <view @click="jumpForgot">忘记密码</view>
+        <view @click="jumpRegister">注册</view>
+      </view>
+    </view>
+    <view>
+      <!-- #ifdef APP-PLUS -->
+      <view class="other_login">其他登录方式</view>
+      <view class="login_other_icon">
+        <view class="login_other_item" @click="wechatOneLogin">
+          <up-image src="/static/login/WXICON.png" width="44" height="44" bgColor="#f1f6ff00"></up-image>
+          微信登录
+        </view>
+        <!-- <view  class="login_other_item" @click="aa"> -->
+        <view v-if="!isIOS" class="login_other_item" @click="alipayOneLogin">
+          <up-image src="/static/login/ZFB.png" width="44" height="44" bgColor="#f1f6ff00"></up-image>
+          支付宝登录
+        </view>
+      </view>
+      <!-- #endif -->
+    </view>
+    <view class="policy_warp">
+      <up-checkbox name="isCheck" usedAlone v-model:checked="isPolicy" shape="circle" activeColor="#7934F6" size="19"
+        iconSize="18">
+        <template #label>
+          <text>已阅读并同意</text>
+          <text class="policy_a_warp" @click="jumpUserAgreement">《服务协议》</text>
+          <text>、</text>
+          <text class="policy_a_warp" @click="jumpPrivacyAgreement">《隐私政策》</text>
+          <text>、</text>
+          <text class="policy_a_warp" @click="jumpProductAgreement">《售后保障协议》</text>
+        </template>
+      </up-checkbox>
+    </view>
+    <up-toast ref="uToastRef"></up-toast>
+  </view>
 </template>
 
 <script>
-	import InputCodeComm from "@/components/code-comm/code-comm.vue";
-	import {
-		SMS_TYPE
-	} from "@/utils/enumUtils.js";
-	import {
-		getUserList
-	} from "@/api/common.js";
-	import {
-		loginbysms,
-		loginbypw,
-		wechatLogin,
-		alipayLogin
-	} from "@/api/auth.js";
-	import {
-		setStorageFun,
-		TOKEN_NAME,
-		USER_KEY,
-		USER_DATA,
-		USER_LOGIN_TIME,
-	} from "@/utils/auth.js";
-	import CryptoJS from "crypto-js";
+import InputCodeComm from "@/components/code-comm/code-comm.vue";
+import {
+  SMS_TYPE
+} from "@/utils/enumUtils.js";
+import {
+  getUserList
+} from "@/api/common.js";
+import {
+  loginbysms,
+  loginbypw,
+  wechatLogin,
+  alipayLogin
+} from "@/api/auth.js";
+import {
+  setStorageFun,
+  TOKEN_NAME,
+  USER_KEY,
+  USER_DATA,
+  USER_LOGIN_TIME,
+} from "@/utils/auth.js";
+import CryptoJS from "crypto-js";
 
-	// #ifdef APP-PLUS
-	const hyyAlipay = uni.requireNativePlugin("Hyy-Alipay");
-	// #endif
+// #ifdef APP-PLUS
+const hyyAlipay = uni.requireNativePlugin("Hyy-Alipay");
+// #endif
 
 export default {
-	onLaunch: function () {
-		console.log("App Launch");
-		const res = uni.getSystemInfoSync();
-		uni.setStorageSync("platform", res.platform);
-		// #ifdef APP-PLUS
-		// 获取应用版本信息
-		plus.runtime.getProperty(plus.runtime.appid, function (inf) {
-			console.log("版本信息", inf.versionCode);
-			uni.setStorageSync("version-1", inf.version); // 大版本号
-			uni.setStorageSync("versionCode", inf.versionCode); // 小版本号
-		});
-		let uuid = plus.device.uuid;
-		// #endif
-	},
-	components: {
-		InputCodeComm,
-	},
+  onLaunch: function () {
+    console.log("App Launch");
+    const res = uni.getSystemInfoSync();
+    uni.setStorageSync("platform", res.platform);
+    // #ifdef APP-PLUS
+    // 获取应用版本信息
+    plus.runtime.getProperty(plus.runtime.appid, function (inf) {
+      console.log("版本信息", inf.versionCode);
+      uni.setStorageSync("version-1", inf.version); // 大版本号
+      uni.setStorageSync("versionCode", inf.versionCode); // 小版本号
+    });
+    let uuid = plus.device.uuid;
+    // #endif
+  },
+  components: {
+    InputCodeComm,
+  },
 
-	data() {
-		return {
-			form: {
-				name: null,
-				password: null,
-				code: null,
-			},
-			inputCss: {
-				height: "80rpx",
-				background: "#F3F3F3FF",
-				"border-radius": "30rpx",
-				border: "0rpx",
-				"padding-left": "16px",
-			},
-			loginWay: "password",
-			isShow: false,
-			isPolicy: false,
-			countdown: false,
-			loading: false,
-			showPolicyModal: false,
-		};
-	},
-	methods: {
-		onBack() {
-			console.log('onBack',)
-			uni.switchTab({
-				url: '/pages/home/home'
-			})
-		},
-		aa() {
-			const nativiPlugin = uni.requireNativePlugin('WITTestUniPlugin');
-			console.log("隐藏原生tabbar", nativiPlugin)
-			nativiPlugin.testAsyncFunc({},
-				(ret) => {
-					uni.showToast({
-						title: '调用异步方法 ' + ret,
-						icon: "none"
-					})
-					console.log(ret);
-				});
-		},
-		jumpHome() {
-			// const sysPlatform = getCurrentSysPlatform();
-			// if(sysPlatform === "android"){
-			// 	uni.switchTab({
-			// 	    url: '/pages/message/message',
-			// 	})
-			// }else{
-			uni.switchTab({
-				url: "/pages/home/home",
-			});
-			// }
-		},
-		async loginFun(val = {}) {
-			const then = this;
-			const form = this.form;
-			const params = {};
-			if (!this.isPolicy) {
-				this.showPolicyModal = true;
-				return;
-			}
-			let response = val;
-			if (this.loginWay === "password") {
-				params.mobile = form.name;
-				params.password = CryptoJS.MD5(form.password).toString();
-				response = await loginbypw(params);
-			}
-			if (this.loginWay === "code") {
-				params.mobile = form.name;
-				params.smsCode = form.code;
-				response = await loginbysms(params);
-			}
+  data() {
+    return {
+      form: {
+        name: null,
+        password: null,
+        code: null,
+      },
+      inputCss: {
+        height: "80rpx",
+        background: "#F3F3F3FF",
+        "border-radius": "30rpx",
+        border: "0rpx",
+        "padding-left": "16px",
+      },
+      loginWay: "password",
+      isShow: false, // 是否显示
+      isPolicy: false, // 是否同意
+      countdown: false, // 清空倒计时
+      loading: false,
+    };
+  },
+  methods: {
+    onBack() {
+      console.log('onBack',)
+      uni.switchTab({
+        url: '/pages/home/home'
+      })
+    },
+    aa() {
+      const nativiPlugin = uni.requireNativePlugin('WITTestUniPlugin');
+      console.log("隐藏原生tabbar", nativiPlugin)
+      nativiPlugin.testAsyncFunc({},
+        (ret) => {
+          uni.showToast({
+            title: '调用异步方法 ' + ret,
+            icon: "none"
+          })
+          console.log(ret);
+        });
+    },
+    jumpHome() {
+      // const sysPlatform = getCurrentSysPlatform();
+      // if(sysPlatform === "android"){
+      // 	uni.switchTab({
+      // 	    url: '/pages/message/message',
+      // 	})
+      // }else{
+      uni.switchTab({
+        url: "/pages/home/home",
+      });
+      // }
+    },
+    async loginFun(val = {}) {
+      const then = this;
+      const form = this.form;
+      const params = {};
+      if (!this.isPolicy) {
+        uni.showModal({
+          title: '温馨提示',
+          content: '请您阅读并同意《服务协议》与《隐私政策》',
+          confirmText: "同意并登录",
+          success: (res) => {
+            if (res.confirm) {
+              this.isPolicy = true;
+              this.loginFun(val);
+            }
+          }
+        });
+        return;
+      }
+      let response = val;
+      if (this.loginWay === "password") {
+        params.mobile = form.name;
+        params.password = CryptoJS.MD5(form.password).toString();
+        response = await loginbypw(params);
+      }
+      if (this.loginWay === "code") {
+        params.mobile = form.name;
+        params.smsCode = form.code;
+        response = await loginbysms(params);
+      }
 
-				const data = response.data;
-				setStorageFun(TOKEN_NAME, data.token);
-				// 用于无感登录
-				setStorageFun(USER_KEY, "");
-				const userInfo = {
-					avatar: data.avatarUrl,
-					name: data.name,
-					userId: data.userId,
-					grade: data.grade,
-					inviteCode: data.inviteCode,
-				};
-				setStorageFun(USER_DATA, userInfo);
-				// 当前登录得时间戳
-				let currentTimeStamp = new Date().getTime();
-				setStorageFun(USER_LOGIN_TIME, currentTimeStamp);
+      const data = response.data;
+      setStorageFun(TOKEN_NAME, data.token);
+      // 用于无感登录
+      setStorageFun(USER_KEY, "");
+      const userInfo = {
+        avatar: data.avatarUrl,
+        name: data.name,
+        userId: data.userId,
+        grade: data.grade,
+        inviteCode: data.inviteCode,
+      };
+      setStorageFun(USER_DATA, userInfo);
+      // 当前登录得时间戳
+      let currentTimeStamp = new Date().getTime();
+      setStorageFun(USER_LOGIN_TIME, currentTimeStamp);
 
-				const res = uni.getSystemInfoSync();
-				uni.setStorageSync('platform', res.platform);
-				// #ifdef APP-PLUS　　　　　　　　　
-				// 获取应用版本信息
-				plus.runtime.getProperty(plus.runtime.appid, function(inf) {
-					console.log("版本信息", inf.versionCode)
-					uni.setStorageSync('version-1', inf.version); // 大版本号
-					uni.setStorageSync('versionCode', inf.versionCode); // 小版本号
-				});
-				let uuid = plus.device.uuid;
-				// #endif
+      const res = uni.getSystemInfoSync();
+      uni.setStorageSync('platform', res.platform);
+      // #ifdef APP-PLUS　　　　　　　　　
+      // 获取应用版本信息
+      plus.runtime.getProperty(plus.runtime.appid, function (inf) {
+        console.log("版本信息", inf.versionCode)
+        uni.setStorageSync('version-1', inf.version); // 大版本号
+        uni.setStorageSync('versionCode', inf.versionCode); // 小版本号
+      });
+      let uuid = plus.device.uuid;
+      // #endif
 
-				this.$refs.uToastRef.show({
-					type: "success",
-					message: response.msg,
-				});
+      this.$refs.uToastRef.show({
+        type: "success",
+        message: response.msg,
+      });
 
-				setTimeout(() => {
-					then.jumpHome();
-				}, 2000);
-			},
-			checkNameParam(val) {
-				// console.log("val",val);
-			},
-			checkParam(val) {
-				// console.log("val",val);
-			},
-			/**
-			 * 获取手机验证码
-			 */
-			async getMobileCode() {
-				const form = this.form;
-				if (!form.name) {
-					this.$refs.uToastRef.show({
-						type: "error",
-						message: "请输入账号",
-					});
-					return;
-				}
-				this.countdown = true;
+      setTimeout(() => {
+        then.jumpHome();
+      }, 2000);
+    },
+    checkNameParam(val) {
+      // console.log("val",val);
+    },
+    checkParam(val) {
+      // console.log("val",val);
+    },
+    /**
+     * 获取手机验证码
+     */
+    async getMobileCode() {
+      const form = this.form;
+      if (!form.name) {
+        this.$refs.uToastRef.show({
+          type: "error",
+          message: "请输入账号",
+        });
+        return;
+      }
+      this.countdown = true;
 
-				const params = {
-					mobile: form.name,
-					type: SMS_TYPE.LOGIN,
-				};
-				const response = await getUserList(params);
-				console.log("responseresponseresponse", response);
-				if (response && response.bizcode === 100) {
-					this.$refs.uToastRef.show({
-						type: "success",
-						message: response.msg,
-					});
-				} else {
-					this.countdown = false;
-				}
-			},
-			jumpForgot() {
-				uni.navigateTo({
-					url: "/pages/rwa_package/setting/forgot-pass?type=3",
-				});
-			},
-			jumpRegister() {
-				uni.navigateTo({
-					url: "/pages/login_package/register/register",
-				});
-			},
-			// 用户协议
-			jumpUserAgreement() {
-				uni.navigateTo({
-					url: "/pages/mine_package/mine_user_agreement/mine_user_agreement?backPath=login",
-				});
-			},
-			// 隐私协议
-			jumpPrivacyAgreement() {
-				uni.navigateTo({
-					url: "/pages/mine_package/mine_privacy_agreement/mine_privacy_agreement?backPath=login",
-				});
-			},
-			// 售后保障协议
-			jumpProductAgreement() {
-				uni.navigateTo({
-					url: "/pages/mine_package/mine_product_agreement/mine_product_agreement?backPath=login",
-				});
-			},
+      const params = {
+        mobile: form.name,
+        type: SMS_TYPE.LOGIN,
+      };
+      const response = await getUserList(params);
+      console.log("responseresponseresponse", response);
+      if (response && response.bizcode === 100) {
+        this.$refs.uToastRef.show({
+          type: "success",
+          message: response.msg,
+        });
+      } else {
+        this.countdown = false;
+      }
+    },
+    jumpForgot() {
+      uni.navigateTo({
+        url: "/pages/rwa_package/setting/forgot-pass?type=3",
+      });
+    },
+    jumpRegister() {
+      uni.navigateTo({
+        url: "/pages/login_package/register/register",
+      });
+    },
+    // 用户协议
+    jumpUserAgreement() {
+      uni.navigateTo({
+        url: "/pages/mine_package/mine_user_agreement/mine_user_agreement?backPath=login",
+      });
+    },
+    // 隐私协议
+    jumpPrivacyAgreement() {
+      uni.navigateTo({
+        url: "/pages/mine_package/mine_privacy_agreement/mine_privacy_agreement?backPath=login",
+      });
+    },
+    // 售后保障协议
+    jumpProductAgreement() {
+      uni.navigateTo({
+        url: "/pages/mine_package/mine_product_agreement/mine_product_agreement?backPath=login",
+      });
+    },
 
-			// 微信登录
-			async wechatOneLogin() {
-				const then = this;
-				this.loading = true;
+    // 微信登录
+    async wechatOneLogin() {
+      const then = this;
+      this.loading = true;
 
-				// 检查是否同意协议
-				if (!this.isPolicy) {
-					uni.showModal({
-						title: '温馨提示',
-						content: '请您阅读并同意《服务协议》与《隐私政策》',
-						confirmText: "同意并登录",
-						success: (res) => {
-							if (res.confirm) {
-								this.isPolicy = true;
-								this.wechatOneLogin();
-							} else {
-								this.loading = false;
-							}
-						}
-					});
-					return;
-				}
+      // 检查是否同意协议
+      if (!this.isPolicy) {
+        uni.showModal({
+          title: '温馨提示',
+          content: '请您阅读并同意《服务协议》与《隐私政策》',
+          confirmText: "同意并登录",
+          success: (res) => {
+            if (res.confirm) {
+              this.isPolicy = true;
+              this.wechatOneLogin();
+            } else {
+              this.loading = false;
+            }
+          }
+        });
+        return;
+      }
 
-				try {
-					// 1. 调用微信登录API
-					uni.login({
-						provider: "weixin",
-						onlyAuthorize: true,
-						success: async (loginRes) => {
-							console.log("微信登录成功:", loginRes);
+      try {
+        // 1. 调用微信登录API
+        uni.login({
+          provider: "weixin",
+          onlyAuthorize: true,
+          success: async (loginRes) => {
+            console.log("微信登录成功:", loginRes);
 
-							// 2. 发送code到后端换取token
-							const params = {
-								isValid: false,
-								token: loginRes.code,
-								// 可以根据需要添加其他参数
-							};
-							console.log("微信登录接口返回-1:", params);
+            // 2. 发送code到后端换取token
+            const params = {
+              isValid: false,
+              token: loginRes.code,
+              // 可以根据需要添加其他参数
+            };
+            console.log("微信登录接口返回-1:", params);
 
-							const response = await wechatLogin(params);
-							console.log(
-								"微信登录接口返回-2:",
-								response,
-								response.data,
-								response.data.token
-							);
+            const response = await wechatLogin(params);
+            console.log(
+              "微信登录接口返回-2:",
+              response,
+              response.data,
+              response.data.token
+            );
 
-							if (response && response.bizcode === 100) {
-								if (response.data.userId) {
-									// 登录
-									this.loginWay = "wechat";
-									this.loginFun(response);
-								} else {
-									// 去微信注册
-									uni.navigateTo({
-										url: `/pages/login_package/bind-phone/bind-phone?token=${response.data.token}&type=1`,
-									});
-								}
-							} else {
-								this.$refs.uToastRef.show({
-									type: "error",
-									message: response.msg || "微信登录失败",
-								});
-							}
-						},
-						fail: (err) => {
-							this.loading = false;
-							console.error("微信登录失败:", err);
-							this.$refs.uToastRef.show({
-								type: "error",
-								message: "微信登录失败，请重试",
-							});
-						},
-					});
-				} catch (error) {
-					this.loading = false;
-					console.error("微信登录异常:", error);
-					this.$refs.uToastRef.show({
-						type: "error",
-						message: "微信登录异常，请重试",
-					});
-				}
-			},
-			// 支付宝一键登录
-			async alipayOneLogin() {
-				const then = this;
-				this.loading = true;
+            if (response && response.bizcode === 100) {
+              if (response.data.userId) {
+                // 登录
+                this.loginWay = "wechat";
+                this.loginFun(response);
+              } else {
+                // 去微信注册
+                uni.navigateTo({
+                  url: `/pages/login_package/bind-phone/bind-phone?token=${response.data.token}&type=1`,
+                });
+              }
+            } else {
+              this.$refs.uToastRef.show({
+                type: "error",
+                message: response.msg || "微信登录失败",
+              });
+            }
+          },
+          fail: (err) => {
+            this.loading = false;
+            console.error("微信登录失败:", err);
+            this.$refs.uToastRef.show({
+              type: "error",
+              message: "微信登录失败，请重试",
+            });
+          },
+        });
+      } catch (error) {
+        this.loading = false;
+        console.error("微信登录异常:", error);
+        this.$refs.uToastRef.show({
+          type: "error",
+          message: "微信登录异常，请重试",
+        });
+      }
+    },
+    // 支付宝一键登录
+    async alipayOneLogin() {
+      const then = this;
+      this.loading = true;
 
-				console.log("支付宝登录", hyyAlipay);
+      console.log("支付宝登录", hyyAlipay);
 
-				// 检查是否同意协议
-				if (!this.isPolicy) {
-					uni.showModal({
-						title: '温馨提示',
-						content: '请您阅读并同意《服务协议》与《隐私政策》',
-						confirmText: "同意并登录",
-						success: (res) => {
-							if (res.confirm) {
-								this.isPolicy = true;
-								this.alipayOneLogin();
-							} else {
-								this.loading = false;
-							}
-						}
-					});
-					return;
-				}
+      // 检查是否同意协议
+      if (!this.isPolicy) {
+        uni.showModal({
+          title: '温馨提示',
+          content: '请您阅读并同意《服务协议》与《隐私政策》',
+          confirmText: "同意并登录",
+          success: (res) => {
+            if (res.confirm) {
+              this.isPolicy = true;
+              this.alipayOneLogin();
+            } else {
+              this.loading = false;
+            }
+          }
+        });
+        return;
+      }
 
-			hyyAlipay.openAuthScheme({
-				appId: "2021005183625053", // 支付宝分配给开发者的应用 ID
-				scheme: "trustbridgeapp", // manifest.json -> "App常用其他设置" -> "UrlSchemes"里设置
-			},
-				(res) => {
-					console.log("支付宝回调", res);
-					alipayLogin({
-						isValid: false,
-						token: res.auth_code,
-					}).then((response) => {
-						console.log("支付宝登录接口返回:", response, !response.data.userId);
-						if (response && response.bizcode === 100) {
-							if (response.data.userId) {
-								// 登录
-								this.loginWay = "alipay";
-								this.loginFun(response);
-							} else {
-								// 去微信注册
-								uni.navigateTo({
-									url: `/pages/login_package/bind-phone/bind-phone?token=${response.data.token}&type=2`,
-								});
-							}
-						} else {
-							this.$refs.uToastRef.show({
-								type: "error",
-								message: response.msg || "微信登录失败",
-							});
-						}
-					});
-			}
-		);
-		},
-		handlePolicyConfirm() {
-			this.showPolicyModal = false;
-			this.isPolicy = true;
-			this.loginFun();
-		},
-	},
-	computed: {
-		isIOS() {
-			// #ifdef APP-PLUS
-			return uni.getSystemInfoSync().platform === "ios";
-			// #endif
-			return false;
-		},
-	},
+      hyyAlipay.openAuthScheme({
+        appId: "2021005183625053", // 支付宝分配给开发者的应用 ID
+        scheme: "trustbridgeapp", // manifest.json -> "App常用其他设置" -> "UrlSchemes"里设置
+      },
+        (res) => {
+          console.log("支付宝回调", res);
+          alipayLogin({
+            isValid: false,
+            token: res.auth_code,
+          }).then((response) => {
+            console.log("支付宝登录接口返回:", response, !response.data.userId);
+            if (response && response.bizcode === 100) {
+              if (response.data.userId) {
+                // 登录
+                this.loginWay = "alipay";
+                this.loginFun(response);
+              } else {
+                // 去微信注册
+                uni.navigateTo({
+                  url: `/pages/login_package/bind-phone/bind-phone?token=${response.data.token}&type=2`,
+                });
+              }
+            } else {
+              this.$refs.uToastRef.show({
+                type: "error",
+                message: response.msg || "微信登录失败",
+              });
+            }
+          });
+        }
+      );
+    },
+  },
+  computed: {
+    isIOS() {
+      // #ifdef APP-PLUS
+      return uni.getSystemInfoSync().platform === "ios";
+      // #endif
+      return false;
+    },
+  },
 };
 </script>
 
 <style lang="scss" scoped>
-	.login_warp {
-		height: calc(100vh - 400rpx);
-		padding: 150rpx 50rpx 0;
-	}
-
-	.login_logo_warp {
-		display: grid;
-		justify-content: center;
-	}
-
-	.login_info {
-		margin-top: 60rpx;
-
-		.login_info_item {
-			margin-bottom: 40rpx;
-		}
-
-		.code_msg {
-			font-size: 36rpx;
-			color: $app-bt-bj;
-		}
-	}
-
-	.login_comm_but {
-		background: #cccccc;
-		border-radius: 20rpx;
-		width: 100%;
-		text-align: center;
-		font-weight: 500;
-		font-size: 32rpx;
-		color: #999999;
-		padding: 28rpx 0;
-		display: flex;
-		justify-content: center;
-	}
-
-	.login_comm_but_yes {
-		background: $app-bt-bj;
-		color: #ffffff;
-	}
-
-	.cut_way_warp {
-		display: flex;
-		justify-content: space-between;
-		font-weight: 500;
-		font-size: 28rpx;
-		color: #999999;
-		margin-top: 20rpx;
-	}
-
-	.other_login {
-		font-size: 28rpx;
-		text-align: center;
-		margin-top: 80rpx;
-		margin-bottom: 32rpx;
-		color: #999999;
-	}
-
-	.login_other_icon {
-		display: flex;
-		padding: 0 100rpx;
-		justify-content: center;
-
-	.login_other_item {
-		display: flex;
-		flex: 50%;
-		font-size: 28rpx;
-		flex-direction: column;
-		align-items: center;
-		margin-bottom: 80rpx;
-	}
+.login_warp {
+  height: calc(100vh - 400rpx);
+  padding: 150rpx 50rpx 0;
 }
 
-.modal-overlay {
-	position: fixed;
-	top: 0;
-	left: 0;
-	right: 0;
-	bottom: 0;
-	background: rgba(0, 0, 0, 0.5);
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	z-index: 1000;
+.login_logo_warp {
+  display: grid;
+  justify-content: center;
 }
 
-.modal-content {
-	width: 500rpx;
-	background: #fff;
-	border-radius: 20rpx;
-	padding:24rpx;
-	text-align: center;
+.login_info {
+  margin-top: 60rpx;
+
+  .login_info_item {
+    margin-bottom: 40rpx;
+  }
+
+  .code_msg {
+    font-size: 36rpx;
+    color: $app-bt-bj;
+  }
 }
 
-.modal-title {
-	font-size: 36rpx;
-	font-weight: bold;
-	color: #333;
-	margin-bottom: 30rpx;
+.login_comm_but {
+  background: #cccccc;
+  border-radius: 20rpx;
+  width: 100%;
+  text-align: center;
+  font-weight: 500;
+  font-size: 32rpx;
+  color: #999999;
+  padding: 28rpx 0;
+  display: flex;
+  justify-content: center;
 }
 
-.modal-message {
-	font-size: 28rpx;
-	color: #666;
-	line-height: 1.6;
-	margin-bottom: 40rpx;
+.login_comm_but_yes {
+  background: $app-bt-bj;
+  color: #ffffff;
 }
 
-.modal-buttons {
-	display: flex;
+.cut_way_warp {
+  display: flex;
+  justify-content: space-between;
+  font-weight: 500;
+  font-size: 28rpx;
+  color: #999999;
+  margin-top: 20rpx;
 }
 
-.modal-btn {
-	flex: 1;
-	height: 80rpx;
-	line-height: 80rpx;
-	font-size: 30rpx;
+.other_login {
+  font-size: 28rpx;
+  text-align: center;
+  margin-top: 80rpx;
+  margin-bottom: 32rpx;
+  color: #999999;
 }
 
-.modal-btn-cancel {
-	color: #999;
-	border-right: 1rpx solid #eee;
-}
+.login_other_icon {
+  display: flex;
+  padding: 0 100rpx;
+  justify-content: center;
 
-.modal-btn-confirm {
-	color: #7934F6;
+  .login_other_item {
+    display: flex;
+    flex: 50%;
+    font-size: 28rpx;
+    flex-direction: column;
+    align-items: center;
+    margin-bottom: 80rpx;
+  }
 }
 </style>
\ No newline at end of file
diff --git a/uni_modules/dengbo-lotteryWheel/changelog.md b/pages/other_package/components/dengbo-lotteryWheel/changelog.md
similarity index 100%
rename from uni_modules/dengbo-lotteryWheel/changelog.md
rename to pages/other_package/components/dengbo-lotteryWheel/changelog.md
diff --git a/uni_modules/dengbo-lotteryWheel/components/dengbo-lotteryWheel/dengbo-lotteryWheel.vue b/pages/other_package/components/dengbo-lotteryWheel/components/dengbo-lotteryWheel/dengbo-lotteryWheel.vue
similarity index 100%
rename from uni_modules/dengbo-lotteryWheel/components/dengbo-lotteryWheel/dengbo-lotteryWheel.vue
rename to pages/other_package/components/dengbo-lotteryWheel/components/dengbo-lotteryWheel/dengbo-lotteryWheel.vue
diff --git a/uni_modules/dengbo-lotteryWheel/package.json b/pages/other_package/components/dengbo-lotteryWheel/package.json
similarity index 100%
rename from uni_modules/dengbo-lotteryWheel/package.json
rename to pages/other_package/components/dengbo-lotteryWheel/package.json
diff --git a/uni_modules/dengbo-lotteryWheel/readme.md b/pages/other_package/components/dengbo-lotteryWheel/readme.md
similarity index 100%
rename from uni_modules/dengbo-lotteryWheel/readme.md
rename to pages/other_package/components/dengbo-lotteryWheel/readme.md
diff --git a/pages/other_package/turntable/turntable.vue b/pages/other_package/turntable/turntable.vue
index 6b506e3..50cec36 100644
--- a/pages/other_package/turntable/turntable.vue
+++ b/pages/other_package/turntable/turntable.vue
@@ -66,9 +66,13 @@
 
 <script>
 import { getActivityList, raffleExecute } from '@/api/raffle.js';
+import dengboLotteryWheel from "@/pages/other_package/components/dengbo-lotteryWheel/components/dengbo-lotteryWheel/dengbo-lotteryWheel.vue";
 
 
 export default {
+	components: {
+		dengboLotteryWheel,
+	},
 	data() {
 		return {
 			lightImages: ['https://static.tbmall.xin/static/bg_bs.png', 'https://static.tbmall.xin/static/bg_hs.png'],
diff --git a/pages/rwa_package/setting/account-out.vue b/pages/rwa_package/accountOut/accountOut.vue
similarity index 93%
rename from pages/rwa_package/setting/account-out.vue
rename to pages/rwa_package/accountOut/accountOut.vue
index caa72bf..23c4376 100644
--- a/pages/rwa_package/setting/account-out.vue
+++ b/pages/rwa_package/accountOut/accountOut.vue
@@ -1,166 +1,166 @@
-<template>
-	<view class="content">
-		<TopSafe></TopSafe>
-		<Header title="注销账号" />
-		<view class="setting-view">
-			<view class="name-box">
-				<view class="top-view">
-					<u-icon name="error-circle-fill" color="#e88900" size="54"></u-icon>
-					<text class="text-36 text-zu text-bold mt-12">注销信任桥账号</text>
-				</view>
-				<view class="mid-view">
-					<text class="text-fu text-28">账号注销后不可恢复，请您谨慎操作。注销成功后，您将无法登录或使用原账号，账号内的信息和权益将均无法找回:</text>
-					<text class="text-fu text-28 mt-48">1.账号将无法登录 </text>
-					<text class="text-fu text-28">2.历史订单将无法查询 </text>
-					<text class="text-fu text-28">3.放弃会员等级权益和会员积分 </text>
-					<text class="text-fu text-28">4.放弃钱包余额、优惠券等资产 </text>
-				</view>
-				<text class="text-fu text-28 mt-32">*详细注销信息可阅读
-					<text class="text-zi" @click="onJump">《信任桥账号注销协议》</text>
-				</text>
-			</view>
-			
-		</view>
-		<view class="bottom-btn">
-			<MyBtn text="已清楚风险，确定注销" @ok="onZhu"></MyBtn>
-		</view>
-		<u-modal :show="tipsShow" title="提示" showCancelButton @cancel="onCancel" @confirm="onConfirm" :content='content'></u-modal>
-		<up-toast ref="uToastRef"></up-toast>
-	</view>
-</template>
-
-<script>
-import { getUserInfo,updateName,deleteAccount } from '@/api/auth.js';
-import Header from '@/components/common/header.vue';
-import { clear } from '@/utils/auth.js';
-import TopSafe from '@/components/common/top-safe.nvue'
-import MyBtn from '@/components/common/my-btn.vue'
-import func from '@/utils/func.js';
-
-export default {
-	components: { Header, TopSafe,MyBtn },
-	data() {
-		return {
-			userInfo: null,
-			inputText:'',
-			tipsShow:false,
-			content:'是否确定注销账号？'
-		};
-	},
-	onShow() {
-	},
-	onLoad() {
-		this.init();
-		// this.userinfo();
-	},
-	methods: {
-		init() {
-			this.userinfo()
-		},
-		onJump(){
-			uni.navigateTo({
-				url:'/pages/rwa_package/setting/out-agreement'
-			})
-		},
-		onZhu(){
-			this.tipsShow = true;
-		},
-		onConfirm(){
-			// uni.navigateTo({
-			// 	url:'/pages/rwa_package/setting/out-code'
-			// })
-			this.onCancel();
-			deleteAccount().then(res=>{
-				if (res.bizcode == 100) {
-					clear()
-					this.$refs.uToastRef.show({
-						type: 'success',
-						message: "注销成功",
-					});
-					setTimeout(()=>{
-						uni.redirectTo({
-							url:'/pages/login_package/login/login'
-						})
-					},2000)
-				}
-			})
-		},
-		onCancel(){
-			this.tipsShow = false;
-		},
-		userinfo() {
-			getUserInfo().then(res => {
-				if (res.bizcode == 100) {
-					this.userInfo = res.data;
-					this.inputText = this.userInfo.nickname;
-				}
-			})
-		}
-	}
-}
-</script>
-
-<style lang="scss" scoped>
-.bottom-btn{
-	width: 100%;
-	margin-bottom:92rpx;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	padding: 0 32rpx;
-	box-sizing: border-box;
-	position: relative;
-	
-}
-.setting-view {
-	width: 100%;
-	height: calc(100% - 88rpx - 92rpx - 88rpx - var(--status-bar-height));
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	overflow-y: auto;
-	padding: 0 32rpx;
-	box-sizing: border-box;
-	position: relative;
-	.name-box{
-		width:100%;
-		border-radius: 16rpx;
-		display: flex;
-		flex-direction: column;
-		background-color: #fff;
-		padding: 64rpx 32rpx;
-		box-sizing: border-box;
-		margin-top:24rpx;
-		.mid-view{
-			width:100%;
-			padding: 40rpx 32rpx;
-			box-sizing: border-box;
-			display: flex;
-			flex-direction: column;
-			border:2rpx solid #eaeaea;
-			border-radius: 16rpx;
-			margin-top:48rpx;
-		}
-		.top-view{
-			width:100%;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-		}
-		.input-view{
-			border-radius: 20rpx;
-			margin-top:52rpx;
-			width:100%;
-			padding: 0 32rpx;
-			min-height:104rpx;
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-			background-color: #f5f5f5;
-			box-sizing: border-box;
-			
-		}
-	}
-	
-}
-</style>
+<template>
+	<view class="content">
+		<TopSafe></TopSafe>
+		<Header title="注销账号" />
+		<view class="setting-view">
+			<view class="name-box">
+				<view class="top-view">
+					<u-icon name="error-circle-fill" color="#e88900" size="54"></u-icon>
+					<text class="text-36 text-zu text-bold mt-12">注销信任桥账号</text>
+				</view>
+				<view class="mid-view">
+					<text class="text-fu text-28">账号注销后不可恢复，请您谨慎操作。注销成功后，您将无法登录或使用原账号，账号内的信息和权益将均无法找回:</text>
+					<text class="text-fu text-28 mt-48">1.账号将无法登录 </text>
+					<text class="text-fu text-28">2.历史订单将无法查询 </text>
+					<text class="text-fu text-28">3.放弃会员等级权益和会员积分 </text>
+					<text class="text-fu text-28">4.放弃钱包余额、优惠券等资产 </text>
+				</view>
+				<text class="text-fu text-28 mt-32">*详细注销信息可阅读
+					<text class="text-zi" @click="onJump">《信任桥账号注销协议》</text>
+				</text>
+			</view>
+			
+		</view>
+		<view class="bottom-btn">
+			<MyBtn text="已清楚风险，确定注销" @ok="onZhu"></MyBtn>
+		</view>
+		<u-modal :show="tipsShow" title="提示" showCancelButton @cancel="onCancel" @confirm="onConfirm" :content='content'></u-modal>
+		<up-toast ref="uToastRef"></up-toast>
+	</view>
+</template>
+
+<script>
+import { getUserInfo,updateName,deleteAccount } from '@/api/auth.js';
+import Header from '@/components/common/header.vue';
+import { clear } from '@/utils/auth.js';
+import TopSafe from '@/components/common/top-safe.nvue'
+import MyBtn from '@/components/common/my-btn.vue'
+import func from '@/utils/func.js';
+
+export default {
+	components: { Header, TopSafe,MyBtn },
+	data() {
+		return {
+			userInfo: null,
+			inputText:'',
+			tipsShow:false,
+			content:'是否确定注销账号？'
+		};
+	},
+	onShow() {
+	},
+	onLoad() {
+		this.init();
+		// this.userinfo();
+	},
+	methods: {
+		init() {
+			this.userinfo()
+		},
+		onJump(){
+			uni.navigateTo({
+				url:'/pages/rwa_package/outAgreement/outAgreement'
+			})
+		},
+		onZhu(){
+			this.tipsShow = true;
+		},
+		onConfirm(){
+			// uni.navigateTo({
+			// 	url:'/pages/rwa_package/outCode/outCode'
+			// })
+			this.onCancel();
+			deleteAccount().then(res=>{
+				if (res.bizcode == 100) {
+					clear()
+					this.$refs.uToastRef.show({
+						type: 'success',
+						message: "注销成功",
+					});
+					setTimeout(()=>{
+						uni.redirectTo({
+							url:'/pages/login_package/login/login'
+						})
+					},2000)
+				}
+			})
+		},
+		onCancel(){
+			this.tipsShow = false;
+		},
+		userinfo() {
+			getUserInfo().then(res => {
+				if (res.bizcode == 100) {
+					this.userInfo = res.data;
+					this.inputText = this.userInfo.nickname;
+				}
+			})
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.bottom-btn{
+	width: 100%;
+	margin-bottom:92rpx;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: 0 32rpx;
+	box-sizing: border-box;
+	position: relative;
+	
+}
+.setting-view {
+	width: 100%;
+	height: calc(100% - 88rpx - 92rpx - 88rpx - var(--status-bar-height));
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	overflow-y: auto;
+	padding: 0 32rpx;
+	box-sizing: border-box;
+	position: relative;
+	.name-box{
+		width:100%;
+		border-radius: 16rpx;
+		display: flex;
+		flex-direction: column;
+		background-color: #fff;
+		padding: 64rpx 32rpx;
+		box-sizing: border-box;
+		margin-top:24rpx;
+		.mid-view{
+			width:100%;
+			padding: 40rpx 32rpx;
+			box-sizing: border-box;
+			display: flex;
+			flex-direction: column;
+			border:2rpx solid #eaeaea;
+			border-radius: 16rpx;
+			margin-top:48rpx;
+		}
+		.top-view{
+			width:100%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+		}
+		.input-view{
+			border-radius: 20rpx;
+			margin-top:52rpx;
+			width:100%;
+			padding: 0 32rpx;
+			min-height:104rpx;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			background-color: #f5f5f5;
+			box-sizing: border-box;
+			
+		}
+	}
+	
+}
+</style>
diff --git a/pages/rwa_package/setting/account-safe.vue b/pages/rwa_package/accountSafe/accountSafe.vue
similarity index 93%
rename from pages/rwa_package/setting/account-safe.vue
rename to pages/rwa_package/accountSafe/accountSafe.vue
index e911c35..ce69c6b 100644
--- a/pages/rwa_package/setting/account-safe.vue
+++ b/pages/rwa_package/accountSafe/accountSafe.vue
@@ -1,149 +1,149 @@
-<template>
-	<view class="content">
-		<TopSafe></TopSafe>
-		<Header title="设置" />
-		<view class="setting-view">
-			<view class="item-list mt-24">
-				<view class="flex-r-lr item-box" @click="onHead(index)"
-				 v-for="(item,index) in headList" :key="index"
-				 :style="{borderWidth:index == headList.length - 1 ? '0' : '2rpx'}"
-				 >
-					<view class="flex-r" >
-						<text class="text-zu1 text-32">{{item.text}}</text>
-						<view class="yi-view" v-if="item.type == 'text1' && item.she">
-							<text class="text-zi text-24">{{item.she}}</text>
-						</view>
-					</view>
-					<view class="flex-r-e" style="align-items: center;">
-						<text class="text-zu text-32" v-if="item.type == 'text'">{{item.value}}</text>
-						
-						<text class="text-fu text-32" v-if="item.type == 'text1'">{{item.value}}</text>
-						<u-icon size="16" name="arrow-right" color="#666" style="margin-left:12rpx"></u-icon>
-					</view>
-				</view>
-			</view>
-		</view>
-		<up-toast ref="uToastRef"></up-toast>
-	</view>
-</template>
-
-<script>
-import { getUserInfo } from '@/api/auth.js';
-import Header from '@/components/common/header.vue';
-import TopSafe from '@/components/common/top-safe.nvue'
-import MyBtn from '@/components/common/my-btn.vue'
-import func from '@/utils/func.js';
-
-export default {
-	components: { Header, TopSafe,MyBtn },
-	data() {
-		return {
-			type: false,
-			userInfo: null,
-			headList:[
-				{text:'注册手机号',type:'text',value:''},
-				{text:'交易密码设置',type:'text1',she:'',value:'设置密码'},
-				{text:'登录密码设置',type:'text1',she:'',value:'设置密码'},
-				{text:'注销账号',type:'text',value:''},
-			],
-			bottomList:[
-				{text:'账号与安全'},
-				{text:'我的合同'},
-				{text:'用户协议'},
-				{text:'隐私协议'},
-				{text:'售后保障协议'},
-				{text:'关于我们'},
-			]
-		};
-	},
-	onShow() {
-	},
-	onLoad() {
-		this.init();
-		// this.userinfo();
-	},
-	methods: {
-		init() {
-			this.userinfo()
-		},
-		onHead(index){
-			if(index == 1){
-				uni.navigateTo({
-					url:`/pages/rwa_package/setting/forgot-pass?type=1`
-				})
-			}else if(index == 2){
-				uni.navigateTo({
-					url:`/pages/rwa_package/setting/forgot-pass?type=2`
-				})
-			}else if(index == 3){
-				uni.navigateTo({
-					url:`/pages/rwa_package/setting/account-out`
-				})
-			}
-		},
-		userinfo() {
-			getUserInfo().then(res => {
-				if (res.bizcode == 100) {
-					this.userInfo = res.data;
-					this.headList[0].value = this.userInfo.mobile;
-					this.headList[0].value = this.headList[0].value.replace(this.headList[0].value.substring(3,7),'****')
-					if(res.data.tradePassword){
-						this.headList[1].she = '已设置';
-						this.headList[1].value = '修改密码';
-					}else{
-						this.headList[1].value = '设置密码';
-					}
-					if(res.data.password){
-						this.headList[2].she = '已设置';
-						this.headList[2].value = '修改密码';
-					}else{
-						this.headList[2].value = '设置密码';
-					}
-				}
-			})
-		}
-	}
-}
-</script>
-
-<style lang="scss" scoped>
-	.yi-view{
-		width:104rpx;
-		height:44rpx;
-		display: flex;
-		background: rgba(122,53,246,0.1);
-		align-items: center;
-		justify-content: center;
-		border-radius: 8rpx;
-		margin-left:12rpx;
-	}
-.setting-view {
-	width: 100%;
-	height: calc(100% - 88rpx - var(--status-bar-height));
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	overflow-y: auto;
-	padding: 0 32rpx;
-	box-sizing: border-box;
-	.item-list{
-		width:100%;
-		border-radius: 16rpx;
-		display: flex;
-		flex-direction: column;
-		background-color: #fff;
-		.item-box{
-			min-height:108rpx;
-			padding: 0 32rpx;
-			box-sizing: border-box;
-			align-items: center;
-			border-bottom:solid #EAEAEA;
-			.ava-img{
-				width:60rpx;
-				height:60rpx;
-				border-radius: 30rpx;
-			}
-		}
-	}
-}
-</style>
+<template>
+	<view class="content">
+		<TopSafe></TopSafe>
+		<Header title="设置" />
+		<view class="setting-view">
+			<view class="item-list mt-24">
+				<view class="flex-r-lr item-box" @click="onHead(index)"
+				 v-for="(item,index) in headList" :key="index"
+				 :style="{borderWidth:index == headList.length - 1 ? '0' : '2rpx'}"
+				 >
+					<view class="flex-r" >
+						<text class="text-zu1 text-32">{{item.text}}</text>
+						<view class="yi-view" v-if="item.type == 'text1' && item.she">
+							<text class="text-zi text-24">{{item.she}}</text>
+						</view>
+					</view>
+					<view class="flex-r-e" style="align-items: center;">
+						<text class="text-zu text-32" v-if="item.type == 'text'">{{item.value}}</text>
+						
+						<text class="text-fu text-32" v-if="item.type == 'text1'">{{item.value}}</text>
+						<u-icon size="16" name="arrow-right" color="#666" style="margin-left:12rpx"></u-icon>
+					</view>
+				</view>
+			</view>
+		</view>
+		<up-toast ref="uToastRef"></up-toast>
+	</view>
+</template>
+
+<script>
+import { getUserInfo } from '@/api/auth.js';
+import Header from '@/components/common/header.vue';
+import TopSafe from '@/components/common/top-safe.nvue'
+import MyBtn from '@/components/common/my-btn.vue'
+import func from '@/utils/func.js';
+
+export default {
+	components: { Header, TopSafe,MyBtn },
+	data() {
+		return {
+			type: false,
+			userInfo: null,
+			headList:[
+				{text:'注册手机号',type:'text',value:''},
+				{text:'交易密码设置',type:'text1',she:'',value:'设置密码'},
+				{text:'登录密码设置',type:'text1',she:'',value:'设置密码'},
+				{text:'注销账号',type:'text',value:''},
+			],
+			bottomList:[
+				{text:'账号与安全'},
+				{text:'我的合同'},
+				{text:'用户协议'},
+				{text:'隐私协议'},
+				{text:'售后保障协议'},
+				{text:'关于我们'},
+			]
+		};
+	},
+	onShow() {
+	},
+	onLoad() {
+		this.init();
+		// this.userinfo();
+	},
+	methods: {
+		init() {
+			this.userinfo()
+		},
+		onHead(index){
+			if(index == 1){
+				uni.navigateTo({
+					url:`/pages/rwa_package/forgotPass/forgotPass?type=1`
+				})
+			}else if(index == 2){
+				uni.navigateTo({
+					url:`/pages/rwa_package/forgotPass/forgotPass?type=2`
+				})
+			}else if(index == 3){
+				uni.navigateTo({
+					url:`/pages/rwa_package/setting/account-out`
+				})
+			}
+		},
+		userinfo() {
+			getUserInfo().then(res => {
+				if (res.bizcode == 100) {
+					this.userInfo = res.data;
+					this.headList[0].value = this.userInfo.mobile;
+					this.headList[0].value = this.headList[0].value.replace(this.headList[0].value.substring(3,7),'****')
+					if(res.data.tradePassword){
+						this.headList[1].she = '已设置';
+						this.headList[1].value = '修改密码';
+					}else{
+						this.headList[1].value = '设置密码';
+					}
+					if(res.data.password){
+						this.headList[2].she = '已设置';
+						this.headList[2].value = '修改密码';
+					}else{
+						this.headList[2].value = '设置密码';
+					}
+				}
+			})
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+	.yi-view{
+		width:104rpx;
+		height:44rpx;
+		display: flex;
+		background: rgba(122,53,246,0.1);
+		align-items: center;
+		justify-content: center;
+		border-radius: 8rpx;
+		margin-left:12rpx;
+	}
+.setting-view {
+	width: 100%;
+	height: calc(100% - 88rpx - var(--status-bar-height));
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	overflow-y: auto;
+	padding: 0 32rpx;
+	box-sizing: border-box;
+	.item-list{
+		width:100%;
+		border-radius: 16rpx;
+		display: flex;
+		flex-direction: column;
+		background-color: #fff;
+		.item-box{
+			min-height:108rpx;
+			padding: 0 32rpx;
+			box-sizing: border-box;
+			align-items: center;
+			border-bottom:solid #EAEAEA;
+			.ava-img{
+				width:60rpx;
+				height:60rpx;
+				border-radius: 30rpx;
+			}
+		}
+	}
+}
+</style>
diff --git a/uni_modules/qiun-data-charts/changelog.md b/pages/rwa_package/components/qiun-data-charts/changelog.md
similarity index 100%
rename from uni_modules/qiun-data-charts/changelog.md
rename to pages/rwa_package/components/qiun-data-charts/changelog.md
diff --git a/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue b/pages/rwa_package/components/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue
similarity index 100%
rename from uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue
rename to pages/rwa_package/components/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue
diff --git a/uni_modules/qiun-data-charts/components/qiun-error/qiun-error.vue b/pages/rwa_package/components/qiun-data-charts/components/qiun-error/qiun-error.vue
similarity index 100%
rename from uni_modules/qiun-data-charts/components/qiun-error/qiun-error.vue
rename to pages/rwa_package/components/qiun-data-charts/components/qiun-error/qiun-error.vue
diff --git a/uni_modules/qiun-data-charts/components/qiun-loading/loading1.vue b/pages/rwa_package/components/qiun-data-charts/components/qiun-loading/loading1.vue
similarity index 100%
rename from uni_modules/qiun-data-charts/components/qiun-loading/loading1.vue
rename to pages/rwa_package/components/qiun-data-charts/components/qiun-loading/loading1.vue
diff --git a/uni_modules/qiun-data-charts/components/qiun-loading/loading2.vue b/pages/rwa_package/components/qiun-data-charts/components/qiun-loading/loading2.vue
similarity index 100%
rename from uni_modules/qiun-data-charts/components/qiun-loading/loading2.vue
rename to pages/rwa_package/components/qiun-data-charts/components/qiun-loading/loading2.vue
diff --git a/uni_modules/qiun-data-charts/components/qiun-loading/loading3.vue b/pages/rwa_package/components/qiun-data-charts/components/qiun-loading/loading3.vue
similarity index 100%
rename from uni_modules/qiun-data-charts/components/qiun-loading/loading3.vue
rename to pages/rwa_package/components/qiun-data-charts/components/qiun-loading/loading3.vue
diff --git a/uni_modules/qiun-data-charts/components/qiun-loading/loading4.vue b/pages/rwa_package/components/qiun-data-charts/components/qiun-loading/loading4.vue
similarity index 100%
rename from uni_modules/qiun-data-charts/components/qiun-loading/loading4.vue
rename to pages/rwa_package/components/qiun-data-charts/components/qiun-loading/loading4.vue
diff --git a/uni_modules/qiun-data-charts/components/qiun-loading/loading5.vue b/pages/rwa_package/components/qiun-data-charts/components/qiun-loading/loading5.vue
similarity index 100%
rename from uni_modules/qiun-data-charts/components/qiun-loading/loading5.vue
rename to pages/rwa_package/components/qiun-data-charts/components/qiun-loading/loading5.vue
diff --git a/uni_modules/qiun-data-charts/components/qiun-loading/qiun-loading.vue b/pages/rwa_package/components/qiun-data-charts/components/qiun-loading/qiun-loading.vue
similarity index 100%
rename from uni_modules/qiun-data-charts/components/qiun-loading/qiun-loading.vue
rename to pages/rwa_package/components/qiun-data-charts/components/qiun-loading/qiun-loading.vue
diff --git a/uni_modules/qiun-data-charts/js_sdk/u-charts/config-echarts.js b/pages/rwa_package/components/qiun-data-charts/js_sdk/u-charts/config-echarts.js
similarity index 100%
rename from uni_modules/qiun-data-charts/js_sdk/u-charts/config-echarts.js
rename to pages/rwa_package/components/qiun-data-charts/js_sdk/u-charts/config-echarts.js
diff --git a/uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js b/pages/rwa_package/components/qiun-data-charts/js_sdk/u-charts/config-ucharts.js
similarity index 100%
rename from uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js
rename to pages/rwa_package/components/qiun-data-charts/js_sdk/u-charts/config-ucharts.js
diff --git a/uni_modules/qiun-data-charts/js_sdk/u-charts/readme.md b/pages/rwa_package/components/qiun-data-charts/js_sdk/u-charts/readme.md
similarity index 100%
rename from uni_modules/qiun-data-charts/js_sdk/u-charts/readme.md
rename to pages/rwa_package/components/qiun-data-charts/js_sdk/u-charts/readme.md
diff --git a/uni_modules/qiun-data-charts/js_sdk/u-charts/u-charts-v2.0.0.js b/pages/rwa_package/components/qiun-data-charts/js_sdk/u-charts/u-charts-v2.0.0.js
similarity index 100%
rename from uni_modules/qiun-data-charts/js_sdk/u-charts/u-charts-v2.0.0.js
rename to pages/rwa_package/components/qiun-data-charts/js_sdk/u-charts/u-charts-v2.0.0.js
diff --git a/uni_modules/qiun-data-charts/js_sdk/u-charts/u-charts.js b/pages/rwa_package/components/qiun-data-charts/js_sdk/u-charts/u-charts.js
similarity index 100%
rename from uni_modules/qiun-data-charts/js_sdk/u-charts/u-charts.js
rename to pages/rwa_package/components/qiun-data-charts/js_sdk/u-charts/u-charts.js
diff --git a/uni_modules/qiun-data-charts/license.md b/pages/rwa_package/components/qiun-data-charts/license.md
similarity index 100%
rename from uni_modules/qiun-data-charts/license.md
rename to pages/rwa_package/components/qiun-data-charts/license.md
diff --git a/uni_modules/qiun-data-charts/package.json b/pages/rwa_package/components/qiun-data-charts/package.json
similarity index 100%
rename from uni_modules/qiun-data-charts/package.json
rename to pages/rwa_package/components/qiun-data-charts/package.json
diff --git a/uni_modules/qiun-data-charts/readme.md b/pages/rwa_package/components/qiun-data-charts/readme.md
similarity index 100%
rename from uni_modules/qiun-data-charts/readme.md
rename to pages/rwa_package/components/qiun-data-charts/readme.md
diff --git a/uni_modules/qiun-data-charts/static/app-plus/echarts.min.js b/pages/rwa_package/components/qiun-data-charts/static/app-plus/echarts.min.js
similarity index 100%
rename from uni_modules/qiun-data-charts/static/app-plus/echarts.min.js
rename to pages/rwa_package/components/qiun-data-charts/static/app-plus/echarts.min.js
diff --git a/uni_modules/qiun-data-charts/static/h5/echarts.min.js b/pages/rwa_package/components/qiun-data-charts/static/h5/echarts.min.js
similarity index 100%
rename from uni_modules/qiun-data-charts/static/h5/echarts.min.js
rename to pages/rwa_package/components/qiun-data-charts/static/h5/echarts.min.js
diff --git a/pages/rwa_package/dongjian/finance.vue b/pages/rwa_package/dongjian/finance.vue
index 5cf823f..3528e5b 100644
--- a/pages/rwa_package/dongjian/finance.vue
+++ b/pages/rwa_package/dongjian/finance.vue
@@ -16,7 +16,7 @@
 			</template>
 		</Header>
 		<view class="top-line"></view>
-		<view class="contract-view" v-if="topSelect == 0">
+		<scroll-view scroll-y="true" class="contract-view" v-if="topSelect == 0">
 			<view class="top-head">
 				<text class="text-32 text-gray text-bold">股权分布</text>
 				<text class="text-28 text-fu">51%的股权回馈消费者（免费赠予）。<text v-if="currentUserData?.isNewUser">股权以积分形式发放</text></text>
@@ -29,6 +29,7 @@
 					:canvas2d="isCanvas2d" 
 					:resshow="delayload"
 					:opts="oneOps" 
+					:inScrollView="true"
 					:chartData="oneData"/>
 			
 			</view>
@@ -44,6 +45,7 @@
 				:canvas2d="isCanvas2d" 
 				:resshow="delayload"
 				:opts="twoOps" 
+				:inScrollView="true"
 				:chartData="twoData"/>
 			</view>
 			<view class="bottom-view" v-if="currentUserData?.isNewUser">
@@ -74,8 +76,8 @@
 					</view>
 				</view>
 			</view>
-		</view>
-		<view class="contract-view" v-if="topSelect == 1 && curData">
+		</scroll-view>
+		<scroll-view scroll-y="true" class="contract-view" v-if="topSelect == 1 && curData">
 			<view class="two-top-tab-view">
 				<view v-for="(item,index) in twoTopList" @click="onTwoTop(index)" :key="index" class="two-top-list">
 					<text class="text-28 " :style="{
@@ -108,6 +110,7 @@
 				:canvas2d="isCanvas2d" 
 				:resshow="delayload"
 				:opts="threeOps" 
+				:inScrollView="true"
 				:chartData="threeData"/>
 			</view>
 			<view class="bottom-view">
@@ -162,7 +165,8 @@
 				  />
 				</view> -->
 				<qiun-data-charts 
-				type="area" :ontouch="true" :canvas2d="true" canvasId="scrolllineid" 
+				type="area" :ontouch="true" :canvas2d="isCanvas2d" canvasId="scrolllineid" 
+				 :inScrollView="true"
 				 :opts="fourOps" :chartData="fourData"/>
 			</view>
 			<view class="tab-view-two">
@@ -175,10 +179,11 @@
 				<text class="text-32 text-gray text-bold">已分配总额：{{fiveTotal}}</text>
 			</view>
 			<view class="tu-view-one" style="margin:32rpx 0">
-				<qiun-data-charts type="area" :ontouch="true" :canvas2d="true" canvasId="scrolllineid1"
+				<qiun-data-charts type="area" :ontouch="true" :canvas2d="isCanvas2d" canvasId="scrolllineid1"
+				 :inScrollView="true"
 				 :opts="fourOps" :chartData="fiveData"/>
 			</view>
-		</view>
+		</scroll-view>
 		<up-toast ref="uToastRef"></up-toast>
 	</view>
 </template>
@@ -186,14 +191,15 @@
 <script>
 import Header from '@/components/common/header.vue';
 import TopSafe from '@/components/common/top-safe.nvue'
-import func from '@/utils/func.js';
-import qiunDataCharts from '@/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue'
 import { getProfitSharingData } from '@/api/finance.js'
+import qiunDataCharts from "@/pages/rwa_package/components/qiun-data-charts/components/qiun-data-charts/qiun-data-charts.vue"
+
 import { getUserInfo } from '@/api/auth.js';
 export default {
 	components: { Header,TopSafe,qiunDataCharts },
 	data() {
 		return {
+			isCanvas2d: false,
 			topSelect:0,
 			twoTopList:['优选区','平价区'],
 			curTopTwo:0,
@@ -468,7 +474,19 @@ export default {
 }
 </script>
 
+<style lang="scss">
+	page {
+		height: 100%;
+		overflow: hidden;
+	}
+</style>
+
 <style lang="scss" scoped>
+	.content {
+		height: 100%;
+		display: flex;
+		flex-direction: column;
+	}
 	.top-view{
 		display: flex;
 		justify-content: space-between;
@@ -521,7 +539,6 @@ export default {
 	display: flex;
 	flex-direction: column;
 	align-items: center;
-	overflow-y: auto;
 	box-sizing: border-box;
 	background-color: #fff;
 	position: relative;
diff --git a/pages/rwa_package/setting/express.vue b/pages/rwa_package/express/express.vue
similarity index 100%
rename from pages/rwa_package/setting/express.vue
rename to pages/rwa_package/express/express.vue
diff --git a/pages/rwa_package/setting/forgot-pass.vue b/pages/rwa_package/forgotPass/forgotPass.vue
similarity index 100%
rename from pages/rwa_package/setting/forgot-pass.vue
rename to pages/rwa_package/forgotPass/forgotPass.vue
diff --git a/pages/rwa_package/setting/kefu.vue b/pages/rwa_package/kefu/kefu.vue
similarity index 100%
rename from pages/rwa_package/setting/kefu.vue
rename to pages/rwa_package/kefu/kefu.vue
diff --git a/pages/rwa_package/setting/out-agreement.vue b/pages/rwa_package/outAgreement/outAgreement.vue
similarity index 95%
rename from pages/rwa_package/setting/out-agreement.vue
rename to pages/rwa_package/outAgreement/outAgreement.vue
index 7905827..fc83711 100644
--- a/pages/rwa_package/setting/out-agreement.vue
+++ b/pages/rwa_package/outAgreement/outAgreement.vue
@@ -1,136 +1,136 @@
-<template>
-	<view class="content">
-		<TopSafe></TopSafe>
-		<Header title="信任桥APP账号注销协议" />
-		<view class="setting-view">
-			<text class="text-28 text-zu1 mt-24">尊敬的用户：</text>
-			<text class="text-28 text-zu1 mt-24">感谢您使用信任桥APP。为了保护您的合法权益，请您在申请注销前，仔细阅读并充分理解本协议。</text>
-			<text class="text-28 text-zu1 mt-24">一旦您提交注销申请并完成相关流程，即表示您已知悉并同意本协议的全部内容。</text>
-			<text class="text-36 text-zu mt-24 text-bold">一、账号注销的结果</text>
-			<text class="text-28 text-zu1 mt-24">账号一旦注销成功，将无法恢复。届时：</text>
-			<text class="text-28 text-zu1 mt-24">1、您的账号将无法再登录或使用原有服务。</text>
-			<text class="text-28 text-zu1 mt-24">2、您的历史订单记录将无法查询。</text>
-			<text class="text-28 text-zu1 mt-24">3、您将放弃所有会员等级权益与会员积分。</text>
-			<text class="text-28 text-zu1 mt-24">4、您的账户钱包余额、优惠券及其他虚拟资产将全部清零且无法找回。</text>
-			
-			<text class="text-36 text-zu mt-24 text-bold">二、您在申请注销前需确认</text>
-			<text class="text-28 text-zu1 mt-24">1、您的账号当前无未完成的订单、未结清的款项或其他争议。</text>
-			<text class="text-28 text-zu1 mt-24">2、您已妥善处理与账号相关的资金、权益及信息。</text>
-			<text class="text-28 text-zu1 mt-24">3、您已明确知晓注销操作不可逆转。</text>
-			
-			<text class="text-36 text-zu mt-24 text-bold">三、免责条款</text>
-			<text class="text-28 text-zu1 mt-24">因您主动注销账号而导致的任何信息丢失、权益消耗、资产作废，本平台不承担任何形式的补偿或责任。</text>
-			
-			<text class="text-36 text-zu mt-24 text-bold">四、特别提示</text>
-			<text class="text-28 text-zu1 mt-24">1、请您在注销前，确认账号内的余额、积分、优惠券等已合理使用。</text>
-			<text class="text-28 text-zu1 mt-24">2、如您仅因短期不使用，可选择退出登录，而非注销账号。</text>
-			<text class="text-28 text-zu1 mt-24">3、若因违规、欺诈等原因导致平台强制注销账号，将不适用本协议中的补偿或说明。</text>
-			
-			<text class="text-36 text-zu mt-24 text-bold">五、协议生效</text>
-			<text class="text-28 text-zu1 mt-24" style="margin-bottom:48rpx">本协议自您点击确认并完成注销申请之时立即生效。</text>
-		</view>
-		
-		<up-toast ref="uToastRef"></up-toast>
-	</view>
-</template>
-
-<script>
-import { getUserInfo,updateName } from '@/api/auth.js';
-import Header from '@/components/common/header.vue';
-import TopSafe from '@/components/common/top-safe.nvue'
-import MyBtn from '@/components/common/my-btn.vue'
-import func from '@/utils/func.js';
-
-export default {
-	components: { Header, TopSafe,MyBtn },
-	data() {
-		return {
-			userInfo: null,
-			inputText:'',
-			tipsShow:false,
-			content:'是否确定注销账号？'
-		};
-	},
-	onShow() {
-	},
-	onLoad() {
-		this.init();
-		// this.userinfo();
-	},
-	methods: {
-		init() {
-			// this.userinfo()
-		},
-		onJump(){
-			uni.navigateTo({
-				url:'/pages/rwa_package/setting/out-agreement'
-			})
-		}
-		
-	}
-}
-</script>
-
-<style lang="scss" scoped>
-.bottom-btn{
-	width: 100%;
-	margin-bottom:92rpx;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	padding: 0 32rpx;
-	box-sizing: border-box;
-	position: relative;
-	
-}
-.setting-view {
-	width: 100%;
-	height: calc(100% - 88rpx - var(--status-bar-height));
-	display: flex;
-	flex-direction: column;
-	overflow-y: auto;
-	padding: 0 32rpx;
-	box-sizing: border-box;
-	position: relative;
-	.name-box{
-		width:100%;
-		border-radius: 16rpx;
-		display: flex;
-		flex-direction: column;
-		background-color: #fff;
-		padding: 64rpx 32rpx;
-		box-sizing: border-box;
-		margin-top:24rpx;
-		.mid-view{
-			width:100%;
-			padding: 40rpx 32rpx;
-			box-sizing: border-box;
-			display: flex;
-			flex-direction: column;
-			border:2rpx solid #eaeaea;
-			border-radius: 16rpx;
-			margin-top:48rpx;
-		}
-		.top-view{
-			width:100%;
-			display: flex;
-			flex-direction: column;
-			align-items: center;
-		}
-		.input-view{
-			border-radius: 20rpx;
-			margin-top:52rpx;
-			width:100%;
-			padding: 0 32rpx;
-			min-height:104rpx;
-			display: flex;
-			flex-direction: row;
-			align-items: center;
-			background-color: #f5f5f5;
-			box-sizing: border-box;
-			
-		}
-	}
-	
-}
-</style>
+<template>
+	<view class="content">
+		<TopSafe></TopSafe>
+		<Header title="信任桥APP账号注销协议" />
+		<view class="setting-view">
+			<text class="text-28 text-zu1 mt-24">尊敬的用户：</text>
+			<text class="text-28 text-zu1 mt-24">感谢您使用信任桥APP。为了保护您的合法权益，请您在申请注销前，仔细阅读并充分理解本协议。</text>
+			<text class="text-28 text-zu1 mt-24">一旦您提交注销申请并完成相关流程，即表示您已知悉并同意本协议的全部内容。</text>
+			<text class="text-36 text-zu mt-24 text-bold">一、账号注销的结果</text>
+			<text class="text-28 text-zu1 mt-24">账号一旦注销成功，将无法恢复。届时：</text>
+			<text class="text-28 text-zu1 mt-24">1、您的账号将无法再登录或使用原有服务。</text>
+			<text class="text-28 text-zu1 mt-24">2、您的历史订单记录将无法查询。</text>
+			<text class="text-28 text-zu1 mt-24">3、您将放弃所有会员等级权益与会员积分。</text>
+			<text class="text-28 text-zu1 mt-24">4、您的账户钱包余额、优惠券及其他虚拟资产将全部清零且无法找回。</text>
+			
+			<text class="text-36 text-zu mt-24 text-bold">二、您在申请注销前需确认</text>
+			<text class="text-28 text-zu1 mt-24">1、您的账号当前无未完成的订单、未结清的款项或其他争议。</text>
+			<text class="text-28 text-zu1 mt-24">2、您已妥善处理与账号相关的资金、权益及信息。</text>
+			<text class="text-28 text-zu1 mt-24">3、您已明确知晓注销操作不可逆转。</text>
+			
+			<text class="text-36 text-zu mt-24 text-bold">三、免责条款</text>
+			<text class="text-28 text-zu1 mt-24">因您主动注销账号而导致的任何信息丢失、权益消耗、资产作废，本平台不承担任何形式的补偿或责任。</text>
+			
+			<text class="text-36 text-zu mt-24 text-bold">四、特别提示</text>
+			<text class="text-28 text-zu1 mt-24">1、请您在注销前，确认账号内的余额、积分、优惠券等已合理使用。</text>
+			<text class="text-28 text-zu1 mt-24">2、如您仅因短期不使用，可选择退出登录，而非注销账号。</text>
+			<text class="text-28 text-zu1 mt-24">3、若因违规、欺诈等原因导致平台强制注销账号，将不适用本协议中的补偿或说明。</text>
+			
+			<text class="text-36 text-zu mt-24 text-bold">五、协议生效</text>
+			<text class="text-28 text-zu1 mt-24" style="margin-bottom:48rpx">本协议自您点击确认并完成注销申请之时立即生效。</text>
+		</view>
+		
+		<up-toast ref="uToastRef"></up-toast>
+	</view>
+</template>
+
+<script>
+import { getUserInfo,updateName } from '@/api/auth.js';
+import Header from '@/components/common/header.vue';
+import TopSafe from '@/components/common/top-safe.nvue'
+import MyBtn from '@/components/common/my-btn.vue'
+import func from '@/utils/func.js';
+
+export default {
+	components: { Header, TopSafe,MyBtn },
+	data() {
+		return {
+			userInfo: null,
+			inputText:'',
+			tipsShow:false,
+			content:'是否确定注销账号？'
+		};
+	},
+	onShow() {
+	},
+	onLoad() {
+		this.init();
+		// this.userinfo();
+	},
+	methods: {
+		init() {
+			// this.userinfo()
+		},
+		onJump(){
+			uni.navigateTo({
+				url:'/pages/rwa_package/outAgreement/outAgreement'
+			})
+		}
+		
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.bottom-btn{
+	width: 100%;
+	margin-bottom:92rpx;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: 0 32rpx;
+	box-sizing: border-box;
+	position: relative;
+	
+}
+.setting-view {
+	width: 100%;
+	height: calc(100% - 88rpx - var(--status-bar-height));
+	display: flex;
+	flex-direction: column;
+	overflow-y: auto;
+	padding: 0 32rpx;
+	box-sizing: border-box;
+	position: relative;
+	.name-box{
+		width:100%;
+		border-radius: 16rpx;
+		display: flex;
+		flex-direction: column;
+		background-color: #fff;
+		padding: 64rpx 32rpx;
+		box-sizing: border-box;
+		margin-top:24rpx;
+		.mid-view{
+			width:100%;
+			padding: 40rpx 32rpx;
+			box-sizing: border-box;
+			display: flex;
+			flex-direction: column;
+			border:2rpx solid #eaeaea;
+			border-radius: 16rpx;
+			margin-top:48rpx;
+		}
+		.top-view{
+			width:100%;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+		}
+		.input-view{
+			border-radius: 20rpx;
+			margin-top:52rpx;
+			width:100%;
+			padding: 0 32rpx;
+			min-height:104rpx;
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			background-color: #f5f5f5;
+			box-sizing: border-box;
+			
+		}
+	}
+	
+}
+</style>
diff --git a/pages/rwa_package/setting/out-code.vue b/pages/rwa_package/outCode/outCode.vue
similarity index 100%
rename from pages/rwa_package/setting/out-code.vue
rename to pages/rwa_package/outCode/outCode.vue
diff --git a/pages/rwa_package/setting/set-name.vue b/pages/rwa_package/setName/setName.vue
similarity index 100%
rename from pages/rwa_package/setting/set-name.vue
rename to pages/rwa_package/setName/setName.vue
diff --git a/pages/rwa_package/setting/setting.vue b/pages/rwa_package/setting/setting.vue
index 221f89f..8b98e78 100644
--- a/pages/rwa_package/setting/setting.vue
+++ b/pages/rwa_package/setting/setting.vue
@@ -93,7 +93,7 @@ export default {
 				});
 			}else if(index == 1){
 				uni.navigateTo({
-					url:'/pages/rwa_package/setting/set-name'
+					url:'/pages/rwa_package/setName/setName'
 				})
 			}
 		},
@@ -171,13 +171,13 @@ export default {
 			let url = '';
 			switch(index){
 				case 0:
-				url = '/pages/rwa_package/setting/account-safe'
+				url = '/pages/rwa_package/accountSafe/accountSafe'
 				break;
 				case 1:
 				url = '/pages/rwa_package/dongjian/index'
 				break;
 				case 2:
-				url = '/pages/rwa_package/setting/zhaopian'
+				url = '/pages/rwa_package/zhaopian/zhaopian'
 				break;
 				case 3:
 				url = '/pages/mine_package/mine_user_agreement/mine_user_agreement'
diff --git a/pages/rwa_package/setting/zhao.vue b/pages/rwa_package/zhao/zhao.vue
similarity index 100%
rename from pages/rwa_package/setting/zhao.vue
rename to pages/rwa_package/zhao/zhao.vue
diff --git a/pages/rwa_package/setting/zhaopian.vue b/pages/rwa_package/zhaopian/zhaopian.vue
similarity index 91%
rename from pages/rwa_package/setting/zhaopian.vue
rename to pages/rwa_package/zhaopian/zhaopian.vue
index 5dc8c5f..5be5dac 100644
--- a/pages/rwa_package/setting/zhaopian.vue
+++ b/pages/rwa_package/zhaopian/zhaopian.vue
@@ -1,107 +1,106 @@
-<template>
-	<view class="content">
-		<TopSafe></TopSafe>
-		<Header title="资质证明" />
-		<view class="setting-view">
-			<view class="name-box">
-				<view class="zhao-list" @click="onJump(index)" :style="{borderWidth:index == zhaoList.length - 1 ? '0' : '2rpx'}"
-				v-for="(item,index) in zhaoList" :key="index">
-					<text class="text-zu1 text-32">{{item}}</text>
-					<view class="zhao-right">
-						<text class="text-fu1 text-28" style="margin-right:20rpx;">查看</text>
-						<u-icon name="arrow-right" color="#999" size='14'></u-icon>
-					</view>
-				</view>
-			</view>
-			
-		</view>
-		<!-- <view class="bottom-btn">
-			<MyBtn text="保存" @ok="onSetName"></MyBtn>
-		</view> -->
-		<up-toast ref="uToastRef"></up-toast>
-	</view>
-</template>
-
-<script>
-import { getUserInfo,updateName } from '@/api/auth.js';
-import Header from '@/components/common/header.vue';
-import TopSafe from '@/components/common/top-safe.nvue'
-import MyBtn from '@/components/common/my-btn.vue'
-import func from '@/utils/func.js';
-
-export default {
-	components: { Header, TopSafe,MyBtn },
-	data() {
-		return {
-			userInfo: null,
-			inputText:'',
-			zhaoList:['营业执照','电信增值许可证书']
-		};
-	},
-	onShow() {
-	},
-	onLoad() {
-		this.init();
-		// this.userinfo();
-	},
-	methods: {
-		init() {
-		},
-		onJump(index){
-			uni.navigateTo({
-				url:`/pages/rwa_package/setting/zhao?type=${index}`
-			})
-		}
-	}
-}
-</script>
-
-<style lang="scss" scoped>
-.bottom-btn{
-	width: 100%;
-	margin-bottom:92rpx;
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	padding: 0 32rpx;
-	box-sizing: border-box;
-	position: relative;
-	
-}
-.setting-view {
-	width: 100%;
-	height: calc(100% - 88rpx - 92rpx - 88rpx - var(--status-bar-height));
-	display: flex;
-	flex-direction: column;
-	align-items: center;
-	overflow-y: auto;
-	padding: 0 32rpx;
-	box-sizing: border-box;
-	position: relative;
-	.name-box{
-		width:100%;
-		border-radius: 16rpx;
-		display: flex;
-		flex-direction: column;
-		background-color: #fff;
-		margin-top:30rpx;
-		.zhao-list{
-			width:100%;
-			height:100rpx;
-			display: flex;
-			flex-direction: row;
-			padding: 0 24rpx;
-			justify-content: space-between;
-			align-items: center;
-			border-bottom: 2rpx solid #EAEAEA;
-			box-sizing: border-box;
-			.zhao-right{
-				display: flex;
-				flex-direction: row;
-				justify-content: flex-end;
-			}
-		}
-	}
-	
-}
-</style>
+<template>
+	<view class="content">
+		<TopSafe></TopSafe>
+		<Header title="资质证明" />
+		<view class="setting-view">
+			<view class="name-box">
+				<view class="zhao-list" @click="onJump(index)" :style="{borderWidth:index == zhaoList.length - 1 ? '0' : '2rpx'}"
+				v-for="(item,index) in zhaoList" :key="index">
+					<text class="text-zu1 text-32">{{item}}</text>
+					<view class="zhao-right">
+						<text class="text-fu1 text-28" style="margin-right:20rpx;">查看</text>
+						<u-icon name="arrow-right" color="#999" size='14'></u-icon>
+					</view>
+				</view>
+			</view>
+			
+		</view>
+		<!-- <view class="bottom-btn">
+			<MyBtn text="保存" @ok="onSetName"></MyBtn>
+		</view> -->
+		<up-toast ref="uToastRef"></up-toast>
+	</view>
+</template>
+
+<script>
+import { getUserInfo,updateName } from '@/api/auth.js';
+import Header from '@/components/common/header.vue';
+import TopSafe from '@/components/common/top-safe.nvue'
+import MyBtn from '@/components/common/my-btn.vue'
+
+export default {
+	components: { Header, TopSafe,MyBtn },
+	data() {
+		return {
+			userInfo: null,
+			inputText:'',
+			zhaoList:['营业执照','电信增值许可证书']
+		};
+	},
+	onShow() {
+	},
+	onLoad() {
+		this.init();
+		// this.userinfo();
+	},
+	methods: {
+		init() {
+		},
+		onJump(index){
+			uni.navigateTo({
+				url:`/pages/rwa_package//zhao/zhaopian?type=${index}`
+			})
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.bottom-btn{
+	width: 100%;
+	margin-bottom:92rpx;
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	padding: 0 32rpx;
+	box-sizing: border-box;
+	position: relative;
+	
+}
+.setting-view {
+	width: 100%;
+	height: calc(100% - 88rpx - 92rpx - 88rpx - var(--status-bar-height));
+	display: flex;
+	flex-direction: column;
+	align-items: center;
+	overflow-y: auto;
+	padding: 0 32rpx;
+	box-sizing: border-box;
+	position: relative;
+	.name-box{
+		width:100%;
+		border-radius: 16rpx;
+		display: flex;
+		flex-direction: column;
+		background-color: #fff;
+		margin-top:30rpx;
+		.zhao-list{
+			width:100%;
+			height:100rpx;
+			display: flex;
+			flex-direction: row;
+			padding: 0 24rpx;
+			justify-content: space-between;
+			align-items: center;
+			border-bottom: 2rpx solid #EAEAEA;
+			box-sizing: border-box;
+			.zhao-right{
+				display: flex;
+				flex-direction: row;
+				justify-content: flex-end;
+			}
+		}
+	}
+	
+}
+</style>