Merge branch 'main' of http://103.44.237.87:3000/commiu/question_uniapp

# Conflicts: # pages/im/chat.vue
1
2025-06-09 00:51:18 +08:00 · 2025-06-09 00:34:46 +08:00
89 changed files with 524 additions and 159 deletions
--- a/locales/en.json
+++ b/locales/en.json
@ -100,7 +100,7 @@
 	"mine":{
 		"text1": "Login/Register",
 		"text2": "Upgrade to become agent！",
-		"text3": "benefit accelerated to 3x",
+		"text3": "Get more revenue",
 		"text4": "Permanent agent",
 		"text5": "My wallet",
 		"text6": "Computing power",
@ -349,5 +349,9 @@
 		"text21": "Identity portrait consistency",
 		"text22": "Behavior pattern simulation",
 		"text23": "Equipment environment quarantine"
+	},
+	"nav":{
+		"home": "Home"
+		
 	}
 }
--- a/locales/zh.json
+++ b/locales/zh.json
@ -2,55 +2,356 @@
 	"codeIncorrect": "验证码错误",
 	"copySuccess": "复制成功",
 	"buttonCancel": "取消",
-	"buttonConfirm": "确定",
+	"buttonConfirm": "确认",
 	"buttonSubmit": "提交",
+	"buttonSave": "保存",
 	"buttonUpgrade": "升级",
-	"buttonDetails": "刷新",
+	"buttonDetails": "更新",
+	"nodata": "暂无数据",
+	"loading": "数据加载...",
+	"copy": "复制",
 	"setIndex":{
-		"title": "系统设置",
+		"title": "设置",
 		"text1": "PIN码设置",
-		"text2": "重置密码",
-		"text3": "语言选择",
-		"text4": "你想退出登录吗？",
+		"text2": "修改登录密码",
+		"text3": "语言",
+		"text4": "您想退出登录吗？",
 		"text5": "温馨提示",
 		"text6": "退出登录"
 	},
+	"setPasswork":{
+		"title": "修改登录密码",
+		"text1": "邮箱",
+		"text2": "请输入您的邮箱地址",
+		"text3": "验证码",
+		"text4": "密码",
+		"text5": "请输入您的密码",
+		"text6": "确认密码",
+		"text7": "请输入您的确认密码",
+		"text8": "获取验证码",
+		"text9": "请输入您的邮箱地址",
+		"text10": "请输入密码",
+		"text11": "请输入确认密码",
+		"text12": "请输入验证码",
+		"text13": "邮箱地址错误",
+		"text14": "发送成功",
+		"text15": "在{par}之后发送",
+		"text16": "请输入6-10位纯数字密码",
+		"text17": "两个密码不一致"
+	},
+	"setPin":{
+		"title": "PIN码设置",
+		"text1": "PIN码",
+		"text2": "输入您的PIN码",
+		"text3": "新PIN码",
+		"text4": "输入至少6位的新PIN码",
+		"text5": "确认PIN码",
+		"text6": "重复至少6位的PIN码",
+		"text7": "请输入交易密码",
+		"text8": "请输入6位数的交易密码",
+		"text9": "请输入新的交易密码",
+		"text10": "请输入6位数字的新交易密码",
+		"text11": "重新输入新的交易密码",
+		"text12": "两次输入的交易密码不一致"
+	},
+	"upgrade":{
+		"title": "升级",
+		"text1": "升级VIP或渠道商",
+		"text2": "自动化工具/AI辅助",
+		"text3": "质量监控体系建设",
+		"text4": "合规性操作指南",
+		"text5": "获得更多加速效益",
+		"text6": "可用余额",
+		"text7": "立即升级",
+		"text8": "用户余额不足"
+	},
+	"Questionnaire":{
+		"title": "问卷",
+		"text1": "数据市场",
+		"text2": "进行中",
+		"text3": "已完成",
+		"text4": "回答",
+		"text5": "周期",
+		"text6": "奖励",
+		"text7": "去答题",
+		"text8": "答题时间",
+		"text9": "详情",
+		"text10": "已完成"
+	},
+	"Select": {
+		"title": "选择",
+		"text1": "搜索问卷"
+	},
+	"toanswer": {
+		"title": "去答题",
+		"text1": "暂无限制",
+		"text2": "限购份数",
+		"text3": "云托管",
+		"text4": "消费金额",
+		"text5": "总收益",
+		"text6": "可用余额",
+		"text7": "结算周期",
+		"text8": "收益率"
+	},
+	"answer":{
+		"title": "答题",
+		"text1": "答题时间"
+	},
 	"mine":{
 		"text1": "登录/注册",
-		"text2": "升级成为代理！",
-		"text3": "收益加速至5倍",
-		"text4": "永久代理",
+		"text2": "升级成为代理商！",
+		"text3": "收益加速到3倍",
+		"text4": "永久的代理",
 		"text5": "我的钱包",
-		"text6": "算力"
+		"text6": "我的算力",
+		"text7": "地址薄",
+		"text8": "在线客服",
+		"text9": "帮助中心",
+		"text10": "关于我们"
+	},
+	"forgot": {
+		"title": "忘记密码",
+		"text1": "不要担心，请输入与您的帐户相关联的邮箱地址。",
+		"text2": "请输入您的邮箱地址",
+		"text3": "发送验证码",
+		"text4": "在{par}之后发送",
+		"text5": "验证码",
+		"text6": "我们已经将验证码发送到您的电子邮箱。",
+		"text7": "未收到验证码？",
+		"text8": "重新发送",
+		"text9": "修改密码",
+		"text10": "不要担心忘记密码，你可以把它改成一个你能记住的密码。",
+		"text11": "密码",
+		"text12": "请输入您的密码",
+		"text13": "确认密码",
+		"text14": "请输入您的确认密码",
+		"text15": "你记得你的密码吗？",
+		"text16": "登录",
+		"text17": "请输入密码",
+		"text18": "请输入确认密码",
+		"text19": "请输入邮箱",
+		"text20": "邮箱地址错误",
+		"text21": "请输入6-10位数字密码",
+		"text22": "两次输入密码不一致"
+		
+	},
+	"personal":{
+		"title": "个人信息",
+		"text1": "头像",
+		"text2": "用户名称",
+		"text3": "用户ID",
+		"text4": "账户",
+		"text5": "身份",
+		"text6": "拍照",
+		"text7": "我的相册选择"
+	},
+	"login":{
+		"title": "登录",
+		"text1": "调查问卷",
+		"text2": "登录您的帐户",
+		"text3": "输入您的邮箱和密码登录",
+		"text4": "请输入您的邮箱地址",
+		"text5": "请输入您的密码",
+		"text6": "忘记密码？",
+		"text7": "没有账户？",
+		"text8": "注册",
+		"text9": "请输入您的邮箱地址",
+		"text10": "请输入密码"
+	},
+	"notice": {
+		"title": "公告",
+		"text1": "全部已读"
+	},
+	"noticedetail":{
+		"title":"详情"
+	},
+	"signup":{
+		"title": "注册",
+		"text1": "创建一个帐户！",
+		"text2": "请输入您的邮箱地址",
+		"text3": "验证码",
+		"text4": "输入邮箱验证码",
+		"text5": "下一步",
+		"text6": "PIN码",
+		"text7": "请输入您的PIN码",
+		"text8": "请输入您的确认PIN码",
+		"text9": "请输入您的邀请码",
+		"text10": "确认PIN码",
+		"text11": "邀请码",
+		"text12": "请输入正确的邮箱地址",
+		"text13": "已经有账户了吗？",
+		"text14": "请输入6-10位数字密码",
+		"text15": "两个密码不一致"
 	},
 	"putforward":{
-		"text1":"请选择地址",
-		"text2":"请输入取款金额",
-		"text3":"最低提取金额为 {par} USDT",
-		"text4":"提取金额跟网络费不能大于用户余额",
+		"title": "提现",
+		"text1":"请选择一个地址",
+		"text2":"请输入提现金额",
+		"text3":"最低提现金额为 {par} USDT",
+		"text4":"提现金额加上网络费用不能超过余额",
 		"text5":"请输入PIN码",
-		"text6":"请输入六位数PIN码"
+		"text6":"请输入6位PIN码",
+		"text7": "地址",
+		"text8": "输入地址",
+		"text9": "提现金额",
+		"text10": "至少 {par} U",
+		"text11": "可用余额",
+		"text12": "输入PIN码",
+		"text13": "手续费",
+		"text14": "预计到达"
 	},
 	"transfer": {
 		"title": "转账",
-		"text1":"请输入转账账户",
+		"text1":"请输入转账账号",
 		"text2":"请输入转账金额",
-		"text3":"",
-		"text4":"转账金额不能大于账户余额",
+		"text3":"PIN码",
+		"text4":"转账金额不能超过账户余额",
 		"text5":"请输入PIN码",
-		"text6":"请输入六位数PIN码"
+		"text6":"请输入6位PIN码",
+		"text7": "其他邮箱",
+		"text8": "输入邮箱地址",
+		"text9": "转账金额",
+		"text10": "至少1U",
+		"text11": "可用余额",
+		"text12": "预计到达"
+	},
+	"SelectNetwork":{
+		"title": "选择网络",
+		"text1": "请确保您选择的充值网络与您取币时选择的网络一致，否则可能会造成资产损失！",
+		"text2": "最低充值",
+		"text3": "最低提现",
+		"text4": "预计10分钟后到达"
 	},
 	"recharge":{
-		"title":"充值"
+		"title":"充值",
+		"text1": "网络",
+		"text2": "充值金额",
+		"text3": "单笔最新充值金额",
+		"text4": "接收地址",
+		"text5": "温馨提示",
+		"text6": "最小充值1 USDT；",
+		"text7": "充值确认：10次网络确认；",
+		"text8": "请不要将USDT以外的资产充值到上述地址，否则可能导致资产丢失。",
+		"text9": "请确保您的移动设备的安全，防止信息被篡改或泄露。",
+		"text10": "请输入充值金额",
+		"text11": "最小充值金额为 "
+	},
+	"wallet":{
+		"title": "我的钱包",
+		"text1": "我的USDT",
+		"text2": "累计收益",
+		"text3": "已提金额",
+		"text4": "钱包资金记录",
+		"text5": "查看详情"
+	},
+	"fundrecords":{
+		"title": "钱包资金记录",
+		"text1": "所有",
+		"text2": "收益"
+	},
+	"results":{
+		"title": "结果",
+		"text1": "网络",
+		"text2": "预计到达",
+		"text3": "地址标题",
+		"text4": "手续费",
+		"text5": "时间",
+		"text6": "参考号码",
+		"text7": "审核中",
+		"text8": "正在审核中，请耐心等待",
+		"text9": "完成",
+		"text10": "提取成功",
+		"text11": "返回",
+		"text12": "原因:",
+		"text13": "失败"
+	},
+	"promotion": {
+		"text1": "邀请",
+		"text2": "我的社区",
+		"text3": "团队总人数",
+		"text4": "分享总人数",
+		"text5": "KPI业绩-大区",
+		"text6": "KPI业绩-小区",
+		"text7": "分享列表",
+		"text8": "查看所有",
+		"text9": "注册时间",
+		"text10": "KPI业绩",
+		"text11": "团队总人数"
+	},
+	"invite": {
+		"text1": "保持",
+		"text2": "分享",
+		"text3": "长按并保存",
+		"text4": "正在下载海报"
+	},
+	"promotionList": {
+		"title": "分享列表",
+		"text1": "分享总人数"
 	},
 	"address":{
 		"title": "地址薄",
+		"text1": "创建地址",
 		"add":{
-			"title": "编辑地址"
-			
+			"title": "编辑地址",
+			"text1": "选择网络",
+			"text2": "钱包地址",
+			"text3": "输入地址",
+			"text4": "设置名称",
+			"text5": "选择网络",
+			"text6": "请输入地址",
+			"text7": "请输入名称"
 		}
 	},
 	"power":{
-		"title":"算力"
+		"title": "算力",
+		"text1": "我的算力可用余额",
+		"text2": "累计参与代理",
+		"text3": "待结算",
+		"text4": "已过期",
+		"text5": "算力记录",
+		"text6": "温馨提示",
+		"text7": "平衡",
+		"text8": "待结算的USDT将在继续参加时自动取出。",
+		"text9": "我知道了"
+	},
+	"about": {
+		"title": "关于我们",
+		"text1": "版本更新",
+		"text2": "服务协议",
+		"text3": "公司简介"
+	},
+	"help":{
+		"title": "帮助中心",
+		"text1": "官方组织",
+		"text2": "钱包下载"
+	},
+	"index":{
+		"text1": "搜索问卷",
+		"text2": "总资产",
+		"text3": "今天的收入",
+		"text4": "提现",
+		"text5": " 用户获得 {par} USDT",
+		"text6": "惊喜奖励",
+		"text7": "邀请朋友获得高额佣金",
+		"text8": "查看详情",
+		"text9": "已答题",
+		"text10": "奖励",
+		"text11": "查看所有",
+		"text12": "新技术的应用（自动化工具/人工智能辅助）",
+		"text13": "智能答题引擎",
+		"text14": "动态题库管理系统",
+		"text15": "多模式防检测系统",
+		"text16": "质量监控体系建设",
+		"text17": "双盲审计机制",
+		"text18": "动态评分模型",
+		"text19": "数据的可追溯性",
+		"text20": "合规性操作指南",
+		"text21": "身份画像一致性",
+		"text22": "行为模式模拟",
+		"text23": "设备环境隔离"
+	},
+	"nav":{
+		"home": "首页"
+		
 	}
 }
--- a/pages.json
+++ b/pages.json
@ -578,7 +578,7 @@
 				"pagePath": "pages/im/index",
 				"iconPath": "static/images/im.png",
 				"selectedIconPath": "static/images/im1.png",
-				"text": "IM",
+				"text": "Community",
 				"iconSize": 48
 			},
 			{
--- a/pages/Setting/setPasswork.vue
+++ b/pages/Setting/setPasswork.vue
@ -16,10 +16,10 @@
 						</template>
 					</uni-easyinput>
 				</uni-forms-item>
-				<uni-forms-item :label="$t("setPasswork.text4")" name="password">
+				<uni-forms-item :label="$t('setPasswork.text4')" name="password">
 					<uni-easyinput type="password" :passwordIcon="true" v-model="model.password" :placeholder="$t('setPasswork.text5')" />
 				</uni-forms-item>
-				<uni-forms-item :label="$t("setPasswork.text6")" name="cpassword" labelWidth="400rpx">
+				<uni-forms-item :label="$t('setPasswork.text6')" name="cpassword" labelWidth="400rpx">
 					<uni-easyinput type="password" :passwordIcon="true" v-model="model.cpassword" :placeholder="$t('setPasswork.text7')" />
 				</uni-forms-item>
 			</uni-forms>
--- a/pages/Setting/setPin.vue
+++ b/pages/Setting/setPin.vue
@ -16,7 +16,7 @@
 		</view>
 		<view style="bottom: 0px; position: absolute; width:100vw; height: 60px;">
 			<view class="cell_list">
-				<button type="primary" round style="width: 100%;" @click="submit">{{$t("buttonSubmit")}}</button>
+				<button type="primary" round style="width: 100%;" @click="submit">{{$t('buttonSubmit')}}</button>
 			</view>
 		</view>
 	</view>
--- a/pages/about/help.vue
+++ b/pages/about/help.vue
@ -1,17 +1,17 @@
 <template>
 	<view class="page">
 		<nav-bar :title="$t('help.title')" bgColor="#fff"></nav-bar>
-		<view style="padding: 20px 15px; font-size: 16px; color: #3d3d3d;">
+		<!--<view style="padding: 20px 15px; font-size: 16px; color: #3d3d3d;">
 			{{$t('help.text1')}}
 		</view>
-		<!-- <view class="cell_list" @click="open('qq_group')">
+		 <view class="cell_list" @click="open('qq_group')">
 			<view class="cell_left txt">
 				<image src="/static/images/h1.png" mode="cover"
 					style="width: 30px; height: 30px; border-radius: 10px; margin-right: 5px;"></image>
 				QQ group
 			</view>
 			<view class="cell_right arrow"></view>
-		</view> -->
+		</view>
 		<view class="cell_list" @click="open('telegram_group')">
 			<view class="cell_left txt">
 				<image src="/static/images/h2.png" mode="cover"
@ -20,7 +20,7 @@
 			</view>
 			<view class="cell_right arrow"></view>
 		</view>
-		<!-- <view class="cell_list" @click="open('sigua_group')">
+		<view class="cell_list" @click="open('sigua_group')">
 			<view class="cell_left txt">
 				<image src="/static/images/h3.png" mode="cover"
 					style="width: 30px; height: 30px; border-radius: 10px; margin-right: 5px;"></image>
--- a/pages/about/index.vue
+++ b/pages/about/index.vue
@ -5,7 +5,7 @@
 			<view style="text-align: center;">
 				<image src="/static/images/logo1.png" mode="cover" style="width: 150px; height: 150px; border: 1px solid #fff; border-radius: 10px; margin: auto;"></image>
 			</view>
-			<view style="font-size: 18px; font-weight: 600; color: #333; text-align: center; line-height: 40px;">MMT</view>
+			<view style="font-size: 18px; font-weight: 600; color: #333; text-align: center; line-height: 40px;">MT</view>
 			<view style="font-weight: 500; font-size: 14px; color: #999; text-align: center;">Version: {{init.version}}</view>
 		</view>
 		<view class="cell_list" @click="onPageJump('/pages/about/Version')">
@ -13,7 +13,7 @@
 			<view class="cell_right arrow"></view>
 		</view>
 		<view class="cell_list" @click="onPageJump('/pages/about/details?id=service_agreement')">
-			<view class="cell_left txt">{{$t("about.text2")}}</view>
+			<view class="cell_left txt">{{$t('about.text2')}}</view>
 			<view class="cell_right arrow"></view>
 		</view>
 		<view class="cell_list" @click="onPageJump('/pages/about/details?id=aboutus')">
--- a/pages/im/chat.vue
+++ b/pages/im/chat.vue
@ -165,7 +165,7 @@ export default {
    data() {
        return {
            init: {
-                cdnurl: "http://www.dxmt.io"
+                cdnurl: 'http://q.sjqqzc.top'
            },
            channel:{},
            // 滚动容器
@ -395,6 +395,7 @@ export default {
            }
        },

+        
 		// 发送消息
 		async sendMessage() {
 			if (!this.content.trim()) return;
@ -448,6 +449,7 @@ export default {
                    }
                },

+
        // 处理新消息
        handleNewMessage(message) {
            console.log('收到新消息:', message);
@ -833,7 +835,7 @@ export default {

                    .body {
                        margin-left: 20rpx;
-                        max-width: 80%;
+                        max-width: 60%;
                        display: flex;
                        flex-direction: column;

--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@ -5,7 +5,7 @@
 			<view class="v1">
 				<!-- <uni-icons size="20" type="gift"></uni-icons> -->
 				<uni-badge @click="onPageJump('/pages/mine/notice')" class="uni-badge-left-margin" :is-dot="true" text="0" :offset="[5, 10]"  absolute="rightTop" size="small">
-					<uni-icons size="20" type="notification" style="margin-left: 40rpx;"></uni-icons>
+					<uni-icons size="30" type="notification" style="margin-left: 40rpx;"></uni-icons>
 				</uni-badge>
 			</view>
 			<view style="clear: both;"></view>
@ -31,15 +31,17 @@
 		<view style="width: 94%; margin: auto;">
 			<uni-row>
 			  <uni-col :span="12">
-				  <button @click="onTokenJump('/pages/wallet/putforward')" style="background-color: #fff; border: 1px solid #1D61E7; border-radius: 40rpx; width: 93%; margin-top: 30rpx;">
-					  <image src="/static/images/index4.png" style="width: 30rpx; height: 30rpx; float: left; margin-left: 18%; margin-top: 30rpx;"></image>
-					  <span style="float: left; color: #1D61E7; margin-left: 10rpx;">{{$t('index.text4')}}</span>
+				  <button @click="onTokenJump('/pages/wallet/putforward')" 
+				  style="background-color: #fff; line-height: 90rpx; border: 1px solid #1D61E7; border-radius: 40rpx; width: 93%; margin-top: 30rpx;">
+					  <uni-icons type="contact" color="transparent" size="20"></uni-icons>
+					  <text style="margin-left: 10rpx; color: #1D61E7;">{{$t('index.text4')}}</text>
 				  </button>
 			  </uni-col>
 			  <uni-col :span="12">
-				  <button @click="onTokenJump('/pages/wallet/recharge')" style="background-color: #1D61E7; border: 1px solid #1D61E7; border-radius: 40rpx; width: 93%; float: right; margin-top: 30rpx;">
-				  		<image src="/static/images/index3.png" style="width: 30rpx; height: 30rpx; float: left; margin-left: 18%; margin-top: 30rpx;"></image>
-				  		<span style="float: left; color: #fff; margin-left: 10rpx;">{{$t('recharge.title')}}</span>
+				  <button @click="onTokenJump('/pages/wallet/recharge')" 
+				  style="background-color: #1D61E7; line-height: 90rpx; border: 1px solid #1D61E7; border-radius: 40rpx; width: 93%; float: right; margin-top: 30rpx;">
+				  		<uni-icons type="home-filled" color="transparent" size="20"></uni-icons>
+				  		<text style="margin-left: 10rpx; color: #fff;">{{$t('recharge.title')}}</text>
 				  </button>
 			  </uni-col>
 			</uni-row>
@ -289,6 +291,8 @@
 	::v-deep .uni-slider-handle-wrapper{height: 12px;}
 	::v-deep uni-slider{padding: 0px;margin: 0px}
 	::v-deep .uni-section__content-title{font-weight: bold;}
+	::v-deep .uniui-contact {background: url('/static/images/index4.png') no-repeat center; background-size: contain; /* 或者使用 cover, 100% 100% 等 */}
+	::v-deep .uniui-home-filled{background: url('/static/images/index3.png') no-repeat center; background-size: contain; /* 或者使用 cover, 100% 100% 等 */}
 	body{background-color: #fff;}
 	.b{height: 70rpx; width: 200rpx; line-height: 70rpx; font-size: 28rpx;}
 	.v2{border: 1px solid #ddd; background-color: #fff; padding: 10px; border-radius: 30rpx; margin-top: 30rpx;}
@ -298,7 +302,7 @@
 	.page{background-color: #fff; min-height: 100vh;}
 	.v1{ float: right; padding-right: 20upx;}
 	.num{ width: 94%; margin: 20rpx auto 20rpx auto; font-size: 18px; background: url('/static/images/index1.png'); 
-		  height: 160rpx; background-repeat: no-repeat;background-position:right bottom}
+		  height: 160rpx; background-repeat: no-repeat;background-position:right bottom; background-size: 22%;}
 	.noticeBar {
 	  margin: 20rpx auto 0;
 	  width: 94%;
--- a/pages/mine/index.vue
+++ b/pages/mine/index.vue
@ -3,13 +3,13 @@
 		<uni-nav-bar title="" backgroundColor="rgba(0, 0, 0, 1);" :shadow="false" :border="false" height="50rpx"></uni-nav-bar>
 		<view class="v1">
 			<uni-badge :text="noticeCount" absolute="rightTop" size="small"  class="item" type="error">
-			  <uni-icons size="20" type="chat" @click="onTokenJump('/pages/mine/notice')"></uni-icons>
+			  <uni-icons size="30" type="chat" @click="onTokenJump('/pages/mine/notice')"></uni-icons>
 			</uni-badge>
-			<uni-icons size="20" type="gear" @click="onTokenJump('/pages/Setting/index')"></uni-icons>
+			<uni-icons size="30" type="gear" @click="onTokenJump('/pages/Setting/index')"></uni-icons>
 		</view>
 		<view class="v2">
-			<view style="width: 220upx; float: left;" @click="onTokenJump('/pages/mine/info')">
-				<image style="width: 100px; height: 100px" :src="user.avatar" mode="cover"></image>
+			<view style="width: 180rpx; float: left;" @click="onTokenJump('/pages/mine/info')">
+				<image style="width: 160rpx; height: 160rpx" :src="user.avatar" mode="cover"></image>
 			</view>
 			<view class="login" @click="onPageJump('/pages/mine/login')" v-if="!islogin">
 				{{$t('mine.text1')}}
@ -34,8 +34,8 @@
 					<view class="sj1" style="margin-top: 10px;">{{$t('mine.text4')}}</view>
 				</view>
 				<view class="sj3">
-					<button type="primary" class="b" @click="onTokenJump('/pages/mine/upgrade')" style="margin-left: 15%;" v-if="user.role_id == 1">{{$t('buttonUpgrade')}}</button>
-					<button type="primary" class="b" style="margin-left: 15%;" v-else>{{$t('buttonDetails')}}</button>
+					<button type="primary" class="b" @click="onTokenJump('/pages/mine/upgrade')" style="margin-left: 13%;" v-if="user.role_id == 1">{{$t('buttonUpgrade')}}</button>
+					<button type="primary" class="b" style="margin: auto;" v-else>{{$t('buttonDetails')}}</button>
 				</view>
 			</view>
 		</view>
@ -56,7 +56,7 @@
 			</uni-row>
 			<uni-row :gutter="20">
 			  <uni-col :span="24" style="margin-top: 10px;">
-				  <view class="wallet" style="padding: 15px 10px 12px 10px;" @click="onTokenJump('/pages/address/index')">
+				  <view class="wallet" style="padding: 20px 10px 20px 10px;" @click="onTokenJump('/pages/address/index')">
 					  <image class="i" src="/static/images/5.png" mode="cover"></image>
 					  <span class="s">{{$t('mine.text7')}}</span>
 					  <uni-icons size="20" type="right" style="float: right;"></uni-icons>
@ -64,7 +64,7 @@
 				  </view>
 			  </uni-col>
 			  <uni-col :span="24" style="margin-top: 10px;">
-			  	  <view class="wallet" style="padding: 15px 10px 12px 10px;">
+			  	  <view class="wallet" style="padding: 20px 10px 20px 10px;">
 			  	  	 <image class="i" src="/static/images/m4.png" fit="cover"></image>
 			  	  	 <span class="s" @click="onTokenJump1('/pages/im/index')">{{$t('mine.text8')}}</span>
 			  	  	 <uni-icons size="20" type="right" style="float: right;"></uni-icons>
@ -72,7 +72,7 @@
 			  	  </view>
 			  </uni-col>
 			  <uni-col :span="24" style="margin-top: 10px;">
-				  <view class="wallet" style="padding: 15px 10px 12px 10px;" @click="onPageJump('/pages/about/help')">
+				  <view class="wallet" style="padding: 20px 10px 20px 10px;" @click="onPageJump('/pages/about/help')">
 				  	 <image class="i" src="/static/images/m6.png" fit="cover"></image>
 				  	 <span class="s">{{$t('mine.text9')}}</span>
 				  	 <uni-icons size="20" type="right" style="float: right;"></uni-icons>
@ -80,7 +80,7 @@
 				  </view>
 			  </uni-col>
 			  <uni-col :span="24" style="margin-top: 10px;">
-				  <view class="wallet" style="padding: 15px 10px 12px 10px;" @click="onPageJump('/pages/about/index')">
+				  <view class="wallet" style="padding: 20px 10px 20px 10px;" @click="onPageJump('/pages/about/index')">
 				  	 <image class="i" src="/static/images/m3.png" fit="cover"></image>
 				  	 <span class="s">{{$t('mine.text10')}}</span>
 				  	 <uni-icons size="20" type="right" style="float: right;"></uni-icons>
@ -242,10 +242,10 @@
 		clear: both; width: 90vw; margin: auto;
 	}
 	.minebg .v2 .login{
-		width: 300upx; float: left; font-size: 16pt; font-weight: 700; height:200upx; line-height: 200upx;
+		width: 300upx; float: left; font-size: 16pt; font-weight: 700; height:160upx; line-height: 160upx;
 	}
 	.minebg .v2 .login1{
-		width: 65%; float: left; font-size: 16pt; font-weight: 700; height:200upx; line-height: 60upx; padding-top: 20px;
+		width: 65%; float: left; font-size: 16pt; font-weight: 700; height:160upx; line-height: 60upx; padding-top: 20px;
 	}
 	.minebg .v2 .login1 .s{
 		overflow: hidden; white-space: nowrap; text-overflow: ellipsis; width: 220px; display: block;
@ -260,10 +260,10 @@
 		background: url('/static/images/hybg.png'); background-size: 100%; height: 120upx; border-radius: 30upx;
 	}
 	.minebg .v3 .dj .sj{
-		width: 50%; float: left; padding-top: 25upx;
+		width: 53%; float: left; padding-top: 25upx;
 	}
 	.minebg .v3 .dj .sj3{
-		width: 30%; float: left; padding-top: 35upx;
+		width: 28%; float: left; padding-top: 35upx;
 	}
 	.minebg .b{
 		width: 160rpx; height: 60rpx; 
@ -278,7 +278,6 @@
 		font-style: normal;
 		text-transform: none;
 		padding: 0px;
-		float: right;
 	}
 	.minebg .v3 .dj .sj1{
 		width: 206px; height: 21px; font-family: Poppins, Poppins; font-weight: 700; font-size: 14px; line-height: 20px; text-align: left; color: #F8E1D6;
@ -296,10 +295,10 @@
 		font-weight: 500; font-size: 14px; color: #999999; line-height: 18px;
 	}
 	.minebg .v4 .wallet .num{
-		width: 100%; line-height: 40px; margin-top: 5px; font-size: 18px; background: url('/static/images/109.png'); height: 40px; background-repeat: no-repeat;background-position:right bottom
+		width: 100%; line-height: 40px; margin-top: 5px; font-size: 18px; background: url('/static/images/109.png'); background-size: 35%; height: 40px; background-repeat: no-repeat;background-position:right bottom
 	}
 	.minebg .v4 .wallet .num1{
-		width: 100%; line-height: 40px; margin-top: 5px; font-size: 18px; background: url('/static/images/4.png'); height: 40px; background-repeat: no-repeat;background-position:right bottom
+		width: 100%; line-height: 40px; margin-top: 5px; font-size: 18px; background: url('/static/images/4.png'); background-size: 35%; height: 40px; background-repeat: no-repeat;background-position:right bottom
 	}
 	.minebg .v4 .wallet .s{
 		font-weight: 500;font-size: 16px;color: #3D3D3D;line-height: 20px; float: left; margin-left: 10px;
--- a/pages/mine/upgrade.vue
+++ b/pages/mine/upgrade.vue
@ -178,6 +178,7 @@
 	}
 	.minebg .v4 .u1{
 		background: url('/static/images/u5.png') #F5F8FC;
+		background-size: 10%;
 		background-repeat: no-repeat;
 		background-position-x: right;
 		background-position-y: bottom;
--- a/pages/power/index.vue
+++ b/pages/power/index.vue
@ -1,6 +1,6 @@
 <template>
 	<view class="page">
-		<nav-bar :title="$t('power.title')" bgColor="#F5f5f5"></nav-bar>
+		<nav-bar :title="$t('power.title')" bgColor="#fff"></nav-bar>
 		<view class="wallet1">
 			<view style="width: 400; font-size: 12px; color: #fff;">{{$t('power.text1')}}</view>
 			<view style="width: 500; font-size: 24px; color: #fff; line-height: 55px;">{{power.score.toFixed(4) }}</view>
@ -19,7 +19,7 @@
 			<view style="clear: both;"></view>
 		</view>
 		<view style="width: 92%; margin: 10px auto;">
-			<view class="cell_list">
+			<view class="cell_list" style="padding: 15px 0px; border-bottom: none;">
 				<view style="color: #333; font-size: 18px; font-weight: 600;">{{$t('power.text5')}}</view>
 				<view class="cell_right" @click="dialogVisible=true">{{$t('power.text6')}}
 					<uni-icons size="20" type="help-filled" style="float: right; margin-left: 5px;"></uni-icons>
@ -181,8 +181,8 @@
 		border-bottom-right-radius: 40upx;
 	}
 	.wallet1{
-		border-radius: 10px; padding: 20px 15px; width: 84%; margin: 10px auto;
-		background: url('/static/images/c1.png') #2B66F6; background-repeat: no-repeat; background-position: 92% 5px;
+		border-radius: 10px; padding: 20px 15px; width: 92%; margin: 10px auto;
+		background: url('/static/images/c1.png') #2B66F6;background-size: 30%; background-repeat: no-repeat; background-position: 92% 5px;
 	}
 	.cell_list .t{
 		color: #3d3d3d; font-size: 16px; font-weight: 400; line-height: 25px;
--- a/pages/promotion/index.vue
+++ b/pages/promotion/index.vue
@ -2,38 +2,40 @@
 	<view class="minebg">
 		<uni-nav-bar title="" backgroundColor="rgba(0, 0, 0, 1);" :shadow="false" :border="false" height="50rpx"></uni-nav-bar>
 		<view class="v2">
-			<view style="width: 200upx; float: left;" @click="onTokenJump('/pages/mine/info')">
-				<image style="width: 80px; height: 80px" :src="url" fit="cover"></image>
+			<view style="width: 160rpx; float: left;" @click="onTokenJump('/pages/mine/info')">
+				<image style="width: 140rpx; height: 140rpx" :src="url" fit="cover"></image>
 			</view>
 			<view class="login" @click="onPageJump('/pages/mine/login')" v-if="!islogin">
 				{{$t('mine.text1')}}
 			</view>
 			<view class="login1" v-else>
-				<view><span @click="onTokenJump('/pages/mine/info')" class="s">{{user.username}}</span></view>
-				<span style="font-size: 14px; font-weight: 400; float: left;">ID：{{user.id}}</span>
-				<button @click="onTokenJump('/pages/promotion/invite')" style="background-color: #1677FF; color: #fff; font-size: 30rpx; height: 70rpx; line-height: 70rpx; width: 200rpx; float: right;">
+				<view style="float: left;"><span @click="onTokenJump('/pages/mine/info')" class="s">{{user.username}}</span></view>
+				<button @click="onTokenJump('/pages/promotion/invite')" v-if="user.role_id > 1"
+						style="background-color: #1677FF; color: #fff; font-size: 30rpx; height: 70rpx; line-height: 70rpx; 
+						width: 200rpx; float: right; margin-top: 20rpx;">
 					<uni-icons size="20" type="gift" style="color: #fff;"></uni-icons>{{$t('promotion.text1')}}</button>
+				<span style="font-size: 14px; font-weight: 400; float: left;">ID：{{user.id}}</span>
 				<image class="i" src="/static/images/copy.png" @click="copy(user.id)" mode="cover"></image>
 			</view>
 			<view style="clear: both;"></view>
 		</view>
 		<view class="v3">
 			<view style="padding: 0rpx 20rpx;">
-				<view style="font-size: 16px; font-weight: 500; color: #3d3d3d;">{{$t('promotion.text2')}}</view>
-				<view style="font-weight: 500; padding: 10px 0px; font-size: 14px; color: #999; margin-top: 10px; text-align: center; background-color: #EDF1F3;">
-					<view class="cell_list" style="background-color: #EDF1F3; padding: 10px;">
+				<view style="font-size: 16px; font-weight: 600; color: #3d3d3d;">{{$t('promotion.text2')}}</view>
+				<view style="font-weight: 500; padding: 10px 0px; font-size: 14px; color: #999; margin-top: 10px; text-align: center; background-color: #F8F8F8;">
+					<view class="cell_list" style="background-color: #F8F8F8; padding: 10rpx 15px;">
 						<view class="cell_left txt">{{$t('promotion.text3')}}</view>
 						<view class="cell_right" style="font-size: 18px; font-weight: 500;">{{team.total_count}}</view>
 					</view>
-					<view class="cell_list" style="background-color: #EDF1F3; padding: 10px;">
+					<view class="cell_list" style="background-color: #F8F8F8; padding: 10rpx 15px;;">
 						<view class="cell_left txt">{{$t('promotion.text4')}}</view>
 						<view class="cell_right" style="font-size: 18px; font-weight: 500;">{{team.direct_total}}</view>
 					</view>
-					<view class="cell_list" style="background-color: #EDF1F3; padding: 10px;">
+					<view class="cell_list" style="background-color: #F8F8F8; padding: 10rpx 15px;;">
 						<view class="cell_left txt">{{$t('promotion.text5')}}</view>
 						<view class="cell_right" style="font-size: 18px; font-weight: 500;">{{parseFloat(team.resultsRegion).toFixed(4)}}</view>
 					</view>
-					<view class="cell_list" style="background-color: #EDF1F3; padding: 10px;">
+					<view class="cell_list" style="background-color: #F8F8F8; padding: 10rpx 15px;;">
 						<view class="cell_left txt">{{$t('promotion.text6')}}</view>
 						<view class="cell_right" style="font-size: 18px; font-weight: 500;">{{parseFloat(team.resultsCell).toFixed(4)}}</view>
 					</view>
@ -42,7 +44,7 @@
 		</view>
 		<view style="width: 94%; margin: 0px auto;">
 			<view class="cell_list" style="padding: 15px 10px;">
-				<view style="color: #3d3d3d; font-size: 16px; font-weight: 500;">{{$t('promotion.text7')}}</view>
+				<view style="color: #3d3d3d; font-size: 16px; font-weight: 600;">{{$t('promotion.text7')}}</view>
 				<view class="cell_right arrow" style="color: #999;" @click="onPageJump('/pages/promotion/list')">{{$t('promotion.text8')}}</view>
 			</view>
 			<uni-row :gutter="10" v-for="(item, index) in list" :key="index" :style="index==0 ? '' : 'margin-top: 30px;'">
@ -50,7 +52,7 @@
 				  <image style="width: 60px; height: 60px; margin: auto;" :src="url" fit="cover"></image>
 			  </uni-col>
 			  <uni-col :span="18">
-				  <view style="font-weight: 500; font-size: 16px; color: #3d3d3d;">{{item.username}}</view>
+				  <view style="font-weight: 600; font-size: 16px; color: #3d3d3d;">{{item.username}}</view>
 				  <view style="font-size: 12px; font-weight: 400; color: #999; line-height: 40rpx;">
 					  ID：{{item.id}}<br>
 					  {{$t('promotion.text9')}}: {{item.created_at}}<br>
@ -107,7 +109,7 @@
 		//第一次加载
 		onShow(e) {
 			uni.showLoading({
-				title:'Data Loading...'
+				title:this.$t('nodata')
 			})
 			if(this.userInfo.token === typeof(undefined) || this.userInfo.token === undefined){
 				this.islogin = false;
@ -121,7 +123,11 @@
 				if(this.userInfo.avatar !== '' && this.userInfo.avatar != null){
 					this.user.avatar = this.userInfo.avatar;
 				}
-				
+				this.$http.get('/api/role/detail?lang='+this.$i18n.locale).then(res => {
+					if(res.code == 0){
+						this.user.role_id =  res.data.id;
+					}
+				});
 				this.$http.get('/api/team/index?lang='+this.$i18n.locale).then(res => {
 					if(res.code == 0){
 						this.team.total_count = res.data.total_count;
@ -195,8 +201,18 @@
 		background-repeat: repeat-x;
 		font-family: Poppins, Poppins;
 	}
+	.cell_list .cell_right.arrow::after{
+			height: 8px !important;
+		}
 	.minebg .v2 .login1{
-		width: 70%; float: left; font-size: 16pt; font-weight: 700; height:200upx; line-height: 60upx; padding-top: 20px;
+		width: 75%; float: left; font-size: 16pt; font-weight: 700; height:160rpx; line-height: 60upx; padding-top: 10px;
+	}
+	.minebg .v2 .login1 .s{
+		white-space: nowrap;      /* 禁止换行 */
+		overflow: hidden;         /* 隐藏溢出内容 */
+		text-overflow: ellipsis;  /* 显示省略号 */
+		width: 240rpx;            /* 需设置固定宽度 */
+		display: block;
 	}
 	.minebg .v2 .login1 .i{
 		width: 24rpx; height: 24rpx; float:left; margin-top: 16rpx; margin-left: 10rpx;
@ -208,7 +224,8 @@
 		clear: both; width: 90vw; margin: auto; padding-top: 20rpx;
 	}
 	.minebg .v2 .login{
-		width: 260upx; float: left; font-size: 16pt; font-weight: 700; height:160upx; line-height: 160upx;
+		float: left; font-size: 16pt; font-weight: 700; height:160rpx; line-height: 160rpx;
+		white-space: nowrap; text-overflow: ellipsis; width: 75%;
 	}
 	.minebg .v3{
 		width: 94vw;  margin: auto; border-radius: 30upx;
--- a/pages/promotion/invite.vue
+++ b/pages/promotion/invite.vue
@ -61,7 +61,7 @@
 				invite_code: '',
 				init: {},
 				nickName: '',
-				promoteBgImgs: ["/static/images/12.png"],
+				promoteBgImgs: ["/static/images/13.png"],
 				promoteCodeImg: "https://qn.kemean.cn/upload/202007/03/1593744239803mgajzyjk.png",
 				swiperIndex: 0,
 				posterImgs: [],
@ -273,7 +273,7 @@
 	.minebg{
 		width: 100vw;
 		min-height: 100vh;
-		background: url('/static/images/12.png') #2651ef;
+		background: url('/static/images/13.png') #2651ef;
 		background-size: 100%;
 		background-repeat: repeat-x;
 		font-family: Poppins, Poppins;
--- a/pages/questionnaire/details.vue
+++ b/pages/questionnaire/details.vue
@ -60,9 +60,9 @@
 		
 		<uni-popup ref="popup" type="dialog" :is-mask-click="true" background-color="#fff" borderRadius="40rpx">
 			<view style="width: 80vw; padding: 20rpx 30rpx; border-radius: 40rpx; line-height: 50rpx;">
-				<view style="font-size: 36rpx; font-weight: bold; text-align: center; margin-bottom: 30rpx;">{{$t("setPin.text1")}}</view>
-				<uni-easyinput type="password" :passwordIcon="true" v-model="pingcode" :placeholder="{{$t("setPin.text2")}}" />
-				<button style="background-color: #1D61E7; color: #fff; margin: 40rpx auto;" @click="Confirm">{{$t("buttonConfirm")}}</button>
+				<view style="font-size: 36rpx; font-weight: bold; text-align: center; margin-bottom: 30rpx;">{{$t('setPin.text1')}}</view>
+				<uni-easyinput type="password" :passwordIcon="true" v-model="pingcode" :placeholder="$t('setPin.text2')" />
+				<button style="background-color: #1D61E7; color: #fff; margin: 40rpx auto;" @click="Confirm">{{$t('buttonConfirm')}}</button>
 			</view>
 		</uni-popup>
 	</view>
--- a/pages/questionnaire/index.vue
+++ b/pages/questionnaire/index.vue
@ -32,7 +32,8 @@
 										{{$t('Questionnaire.text6')}}: <span style="font-size: 20px;">${{parseFloat(item.price).toFixed(2)}} </span>
 									</view>
 									<view style="float: right;">
-										<button type="primary" class="b" @click="onTokenJump('/pages/questionnaire/details?id='+item.id)">{{$t('Questionnaire.text7')}}</button>
+										<button type="primary" v-if="item.buy_state" class="b" @click="onTokenJump('/pages/questionnaire/details?id='+item.id)">{{$t('Questionnaire.text7')}}</button>
+										<button type="primary" v-else class="b" style="float: right; background-color: #eee; color: #333">{{$t('Questionnaire.text10')}}</button>
 									</view>
 								</view>
 							</uni-col>
@ -123,7 +124,13 @@
 			});
 			if(this.userInfo.token === typeof(undefined) || this.userInfo.token === undefined){
 			}else{
-				this.$http.post('/api/server/list', data).then(res => {
+				let data2 = {
+					page: this.par.page,
+					limit: this.par.limit,
+					lang: this.$i18n.locale,
+					step: 'progress'
+				};
+				this.$http.post('/api/server/list', data2).then(res => {
 					if(res.code == 0){
 						this.list1 = res.data.data;
 					}
@ -133,7 +140,7 @@
 					page: this.par.page,
 					limit: this.par.limit,
 					lang: this.$i18n.locale,
-					type: 'done'
+					step: 'done'
 				};
 				this.$http.post('/api/server/list', data1).then(res => {
 					if(res.code == 0){
--- a/pages/questionnaire/select.vue
+++ b/pages/questionnaire/select.vue
@ -1,6 +1,6 @@
 <template>
 	<view class="page">
-		<nav-bar :title="$t("Select.title")" bgColor="#fff"></nav-bar>
+		<nav-bar :title="$t('Select.title')" bgColor="#fff"></nav-bar>
 		<view>
 			<view style="background-color: #fff;">
 				<uni-search-bar class="uni-mt-10" radius="10" v-model="kw" @clear="clear"
--- a/pages/wallet/index.vue
+++ b/pages/wallet/index.vue
@ -1,6 +1,6 @@
 <template>
 	<view class="page">
-		<nav-bar :title="$t('wallet.title')" bgColor="#F5f5f5"></nav-bar>
+		<nav-bar :title="$t('wallet.title')" bgColor="#fff"></nav-bar>
 		<view class="wallet1">
 			<view class="txt">{{$t('wallet.text1')}}</view>
 			<view style="width: 500; font-size: 24px; color: #fff; line-height: 55px;">{{user.money.toFixed(4)}}</view>
@ -34,13 +34,14 @@
 						<view class="t">{{$t('transfer.title')}}</view>
 				  	</view>
 			</view>
+			<view style="clear: both;"></view>
 		</view>
 		<view style="width: 92%; margin: 10px auto;">
-			<view class="cell_list">
+			<view class="cell_list" style="padding: 30rpx 0rpx;border-bottom: none;">
 				<view style="color: #333; font-size: 18px; font-weight: 600;">{{$t('wallet.text4')}}</view>
 				<view class="cell_right arrow" @click="onTokenJump('/pages/wallet/fundrecords')">{{$t('wallet.text5')}}</view>
 			</view>
-			<view class="cell_list" style="border-bottom: 1px solid #ddd;" v-if="list.length > 0" v-for="item in list" :key="item.id">
+			<view class="cell_list" style="padding: 30rpx 0rpx;border-bottom: 1px solid #ddd;" v-if="list.length > 0" v-for="item in list" :key="item.id">
 				<view class="t">{{item.type}}<view class="d1">{{item.created_at.slice(0, 19)}}</view></view>
 				<view class="u1 u">
 					<span>{{parseFloat(item.amount).toFixed(2)}} USDT</span>
@ -134,10 +135,13 @@
 	body{background-color: #fff;}
 	.wallet1{
 		border-radius: 10px; padding: 20px 15px; width: 90%; margin: 10px auto; 
-		background: url('/static/images/w1.png') #2B66F6; background-repeat: no-repeat; background-position: 92% 5px;
+		background: url('/static/images/w1.png') #2B66F6;background-size: 25%; background-repeat: no-repeat; background-position: 92% 5px;
 	}
 	.wallet1 .txt{width: 400; font-size: 12px; color: #fff;}
 	.wallet1 .txt1{width: 400; font-size: 16px; color: #fff; line-height: 35px;}
+	.cell_list .cell_right.arrow::after{
+		height: 8px !important;
+	}
 	.cell_list .t{
 		color: #3d3d3d; font-size: 14px; font-weight: 400; line-height: 25px;
 	}
--- a/pages/wallet/putforward.vue
+++ b/pages/wallet/putforward.vue
@ -3,7 +3,7 @@
 		<nav-bar :title="$t('putforward.title')" bgColor="#fff">
 			<image slot="right" style="width: 40rpx; height: 40rpx; margin-right: 20px;" src="/static/images/r2.png" mode="cover" @click="onTokenJump('/pages/wallet/fundrecords?id=3')"></image>
 		</nav-bar>
-		<view style="width: 92%; margin: 10px auto; padding: 15px 10px;">
+		<view style="width: 94%; margin: 10px auto; padding: 20rpx 10rpx;">
 			<uni-forms :modelValue="putmodel" label-position="top" :rules="rules" ref="form">
 				<uni-forms-item name="address">
 					<view style="padding-bottom: 10px;">
@ -21,7 +21,7 @@
 						<uni-easyinput type="text" v-model="putmodel.address" :placeholder="$t('putforward.text8')">
 							<template #right>
 								<picker :range="formattedItems" mode="selector" @change="onPickerChange">
-									<image src="/static/images/r4.png" style="float: left; width: 40rpx; height: 40rpx; margin-right: 20rpx;"></image>
+									<image src="/static/images/5.png" style="float: left; width: 40rpx; height: 40rpx; margin-right: 20rpx;"></image>
 								</picker>
 							</template>
 						</uni-easyinput>
@ -38,7 +38,7 @@
 						</uni-easyinput>
 					</view>
 					<view style="font-size: 14px; color: #999; font-weight: 500; line-height: 50upx;">{{$t('putforward.text11')}}：
-					<span style="color: #1D61E7;">{{user.money }} USDT</span></view>
+					<span style="color: #1D61E7;">{{parseFloat(user.money).toFixed(2)}} USDT</span></view>
 				</uni-forms-item>
 				<uni-forms-item label="PIN code" name="pincode">
 					<uni-easyinput type="password" :passwordIcon="true" v-model="putmodel.pincode" :placeholder="$t('putforward.text12')" />
@ -48,7 +48,8 @@
 		<view style="bottom: 0px; position: absolute; width:100vw; height: 180px;">
 			<view class="cell_list">
 				<view class="cell_left txt">{{$t('putforward.text13')}}</view>
-				<view class="cell_right ">{{costs}} USDT</view>
+				<view class="cell_right " v-if="showCosts">{{costs}} USDT</view>
+				<view class="cell_right " v-else>0 USDT</view>
 			</view>
 			<view class="cell_list">
 				<view class="cell_left txt">{{$t('putforward.text14')}}</view>
@ -71,6 +72,7 @@
 		data() {
 			return {
 				network:'TRC-20',
+				showCosts: false,
 				costs: 0.00,
 				totalAmount: 0.00,
 				withdrawlminimum: 1,
@ -114,11 +116,24 @@
 		},
 		watch: {
 		    'putmodel.amount'(newVal, oldVal) {
-				this.totalAmount = parseFloat(newVal == '' ? 0 : newVal) + parseFloat(this.costs);
+				if(newVal != ''){
+					this.showCosts = true;
+				}else{
+					this.showCosts = false;
+				}
+				console.log(parseFloat(newVal == '' ? 0 : newVal), parseFloat(this.costs));
+				this.totalAmount = parseFloat(newVal == '' ? 0 : newVal) - parseFloat(this.costs);
+				console.log(this.totalAmount);
+				if(this.totalAmount < 0){
+					this.totalAmount = 0;
+				}
 		    }
 		},
 		//第一次加载
-		async onLoad(e) {
+		onLoad(e) {
+			uni.showLoading({
+				title: this.$t('loading')
+			});
 			this.$http.get('/api/common/init?lang='+this.$i18n.locale).then(res => {
 				this.init = res.data;
 				if(e.network != typeof(undefined) && e.network != undefined){
@ -128,7 +143,7 @@
 				};
 				this.costs = this.init.withdrawl_fee[this.network];
 				this.withdrawlminimum = this.init.withdrawl_minimum[this.network];
-				this.totalAmount = parseFloat(this.putmodel.amount == '' ? 0 : this.putmodel.amount) + parseFloat(this.costs);
+				//this.totalAmount = parseFloat(this.putmodel.amount == '' ? 0 : this.putmodel.amount) + parseFloat(this.costs);
 				let data = {
 					lang: this.$i18n.locale,
 					network: this.network,
@ -139,9 +154,14 @@
 					if(res.code == 0){
 						this.addressList = res.data.data;
 					}
+					uni.hideLoading();
+				}).catch(err => {
+					uni.hideLoading();
 				}); 
 			});
-			this.user = await getUserInfo(this.$i18n.locale);
+			getUserInfo(this.$i18n.locale).then(res => {
+				this.user =  res;
+			});
 			this.user.money = parseFloat(this.user.money).toFixed(4);
 		},
 		//页面显示
@ -150,8 +170,7 @@
 		methods: {
 			...mapMutations(['setUserInfo']),
 			max(){
-				let money = (parseFloat(this.user.money) - parseFloat(this.costs));
-				this.putmodel.amount = money < 0 ? 0 : money;
+				this.putmodel.amount = parseFloat(this.user.money) ;
 			},
 			onPickerChange(e) {
 				let address = this.addressList[e.detail.value];
@ -178,7 +197,14 @@
 					});
 					return;
 				}
-				if (parseFloat(this.putmodel.amount)+parseFloat(this.costs) > parseFloat(this.user.money)){
+				if (parseFloat(this.putmodel.amount) > parseFloat(this.user.money)){
+					uni.showToast({
+						icon: 'error',
+						title:this.$t('putforward.text4')
+					});
+					return;
+				}
+				if (parseFloat(this.putmodel.amount) <= this.costs){
 					uni.showToast({
 						icon: 'error',
 						title:this.$t('putforward.text4')
@ -187,7 +213,7 @@
 				}
 				this.$refs.form.validate().then(res=>{
 					var data = {
-						amount: this.totalAmount,
+						amount: this.putmodel.amount,
 						address_id: this.putmodel.addressId,
 						trade_password: this.putmodel.pincode,
 						lang: this.$i18n.locale
--- a/pages/wallet/recharge.vue
+++ b/pages/wallet/recharge.vue
@ -8,7 +8,7 @@
 		<uni-icons size="20" type="down" style="margin-left: 10px;"></uni-icons></view>
 		<view v-if="show==1" style="width: 80vw; margin: 40rpx auto 20rpx auto;">
 			<uni-forms :modelValue="rechargeModel" label-position="left">
-				<uni-forms-item :label="$t('recharge.text2')" labelWidth="250rpx">
+				<uni-forms-item :label="$t('recharge.text2')" labelWidth="280rpx">
 					<view>
 						<uni-easyinput type="number" v-model="rechargeModel.amount" :placeholder="$t('putforward.text10', {par: init.recharge_minimum})">
 							<template #right>
@ -22,7 +22,7 @@
 		</view>
 		<view v-if="show==2">
 			<view style="text-align: center; margin-top: 10px;">
-				<view v-if="show=2" style="text-align: center; width: 300rpx; margin: auto;">
+				<view v-if="show=2" style="text-align: center; width: 260rpx; margin: auto;">
 				    <tki-qrcode ref="qrcode" :val="qrcode" :size="size" :unit="unit" :onval="onval" :load-make="load_make" :show-loading="show_loading" :lv="lv" :background="background" :foreground="foreground" :pdground="pdground" :icon='icon' :iconsize='iconsize' />
 				</view>
 			</view>
@ -70,7 +70,7 @@
 					network: 'TRC-20',
 					amount: '',
 					address:"",
-					images:"/static/images/r1.png"
+					images:""
 				},
 				
 				init: {},
--- a/static/im/kefu.png
+++ b/static/im/kefu.png
--- a/static/im/mattermost.js
+++ b/static/im/mattermost.js
@ -73,7 +73,7 @@ class MattermostClient {
        const protocol = process.env.NODE_ENV === 'development' ? 'ws' : 'wss';
        // 构建 WebSocket URL，使用用户 API 域名
        const connectionId = Date.now().toString(36) + Math.random().toString(36).substr(2);
-        this.wsUrl = `${protocol}://im.sjqqzc.top/api/v4/websocket?connection_id=${connectionId}&sequence_number=0`;        
+        this.wsUrl = this.userBaseUrl.replace('https',protocol) + `/api/v4/websocket?connection_id=${connectionId}&sequence_number=0`;        
        // 重置状态
        this.sequence = 1;
        this.reconnectAttempts = 0;
--- a/static/images/109.png
+++ b/static/images/109.png
--- a/static/images/12.png
+++ b/static/images/12.png
--- a/static/images/13.png
+++ b/static/images/13.png
--- a/static/images/4.png
+++ b/static/images/4.png
--- a/static/images/5.png
+++ b/static/images/5.png
--- a/static/images/Companyprofile.png
+++ b/static/images/Companyprofile.png
--- a/static/images/Mine.png
+++ b/static/images/Mine.png
--- a/static/images/Mine1.png
+++ b/static/images/Mine1.png
--- a/static/images/Promotion.png
+++ b/static/images/Promotion.png
--- a/static/images/Promotion1.png
+++ b/static/images/Promotion1.png
--- a/static/images/Question.png
+++ b/static/images/Question.png
--- a/static/images/Question1.png
+++ b/static/images/Question1.png
--- a/static/images/a1.png
+++ b/static/images/a1.png
--- a/static/images/c1.png
+++ b/static/images/c1.png
--- a/static/images/copy.png
+++ b/static/images/copy.png
--- a/static/images/copy1.png
+++ b/static/images/copy1.png
--- a/static/images/h1.png
+++ b/static/images/h1.png
--- a/static/images/h2.png
+++ b/static/images/h2.png
--- a/static/images/h3.png
+++ b/static/images/h3.png
--- a/static/images/h4.png
+++ b/static/images/h4.png
--- a/static/images/h5.png
+++ b/static/images/h5.png
--- a/static/images/h6.png
+++ b/static/images/h6.png
--- a/static/images/home.png
+++ b/static/images/home.png
--- a/static/images/home1.png
+++ b/static/images/home1.png
--- a/static/images/hybg.png
+++ b/static/images/hybg.png
--- a/static/images/im.png
+++ b/static/images/im.png
--- a/static/images/im1.png
+++ b/static/images/im1.png
--- a/static/images/image.png
+++ b/static/images/image.png
--- a/static/images/index1.png
+++ b/static/images/index1.png
--- a/static/images/index2.png
+++ b/static/images/index2.png
--- a/static/images/index3.png
+++ b/static/images/index3.png
--- a/static/images/index4.png
+++ b/static/images/index4.png
--- a/static/images/index5.png
+++ b/static/images/index5.png
--- a/static/images/index6.png
+++ b/static/images/index6.png
--- a/static/images/index7.png
+++ b/static/images/index7.png
--- a/static/images/index8.png
+++ b/static/images/index8.png
--- a/static/images/index9.png
+++ b/static/images/index9.png
--- a/static/images/logo.png
+++ b/static/images/logo.png
--- a/static/images/logo1.png
+++ b/static/images/logo1.png
--- a/static/images/logo2.png
+++ b/static/images/logo2.png
--- a/static/images/m3.png
+++ b/static/images/m3.png
--- a/static/images/m4.png
+++ b/static/images/m4.png
--- a/static/images/m6.png
+++ b/static/images/m6.png
--- a/static/images/minebg.png
+++ b/static/images/minebg.png
--- a/static/images/p1.png
+++ b/static/images/p1.png
--- a/static/images/p2.png
+++ b/static/images/p2.png
--- a/static/images/p3.png
+++ b/static/images/p3.png
--- a/static/images/p4.png
+++ b/static/images/p4.png
--- a/static/images/q1.png
+++ b/static/images/q1.png
--- a/static/images/r2.png
+++ b/static/images/r2.png
--- a/static/images/s1.png
+++ b/static/images/s1.png
--- a/static/images/s2.png
+++ b/static/images/s2.png
--- a/static/images/s3.png
+++ b/static/images/s3.png
--- a/static/images/sm.png
+++ b/static/images/sm.png
--- a/static/images/tx.png
+++ b/static/images/tx.png
--- a/static/images/u1.png
+++ b/static/images/u1.png
--- a/static/images/u2.png
+++ b/static/images/u2.png
--- a/static/images/u3.png
+++ b/static/images/u3.png
--- a/static/images/u4.png
+++ b/static/images/u4.png
--- a/static/images/u5.png
+++ b/static/images/u5.png
--- a/static/images/w1.png
+++ b/static/images/w1.png
--- a/static/images/w2.png
+++ b/static/images/w2.png
--- a/static/images/w3.png
+++ b/static/images/w3.png
--- a/static/images/w4.png
+++ b/static/images/w4.png
--- a/static/images/w5.png
+++ b/static/images/w5.png
--- a/static/images/x1.png
+++ b/static/images/x1.png
--- a/static/img/avatar.png
+++ b/static/img/avatar.png
Author	SHA1	Message	Date
xx	e2e75693a2	Merge branch 'main' of http://103.44.237.87:3000/commiu/question_uniapp # Conflicts: # pages/im/chat.vue	2025-06-09 00:51:18 +08:00
xx	0512c89cc6	1	2025-06-09 00:34:46 +08:00