diff --git a/App.vue b/App.vue
index d0da787..9f42bb9 100644
--- a/App.vue
+++ b/App.vue
@@ -123,9 +123,15 @@
.text-28{
font-size:28rpx;
}
+.text-32{
+ font-size:32rpx;
+}
.text-36{
font-size:36rpx;
}
+.text-38{
+ font-size:38rpx;
+}
.text-bold{
font-weight:bold;
}
diff --git a/api/auth.js b/api/auth.js
index 8fa9009..d4374aa 100644
--- a/api/auth.js
+++ b/api/auth.js
@@ -37,6 +37,23 @@ export function forgotPassword(params) {
url: "/user/forgotPassword",
method: "post",
data: params,
+ cha:1
+ });
+}
+export function uploadAvatar(params) {
+ // params.appId = APPID;
+ return request({
+ url: "/user/uploadAvatar",
+ method: "post",
+ data: params,
+ });
+}
+export function updateName(params) {
+ // params.appId = APPID;
+ return request({
+ url: "/user/updateName",
+ method: "post",
+ data: params,
});
}
@@ -63,6 +80,15 @@ export function getUserInfo(params) {
data: params,
});
}
+export function deleteAccount(params) {
+ // params.appId = APPID;
+ return request({
+ url: "/user/deleteAccount",
+ method: "post",
+ data: params,
+ cha:1
+ });
+}
/**
* 实名认证
@@ -88,6 +114,15 @@ export function resetTradePw(params) {
data: params,
});
}
+export function forgotPayPassword(params) {
+ // params.appId = APPID;
+ return request({
+ url: "/user/forgotPayPassword",
+ method: "post",
+ data: params,
+ cha:1
+ });
+}
/**
* 获取短信验证码
diff --git a/components/common/my-btn.vue b/components/common/my-btn.vue
new file mode 100644
index 0000000..e77f0bd
--- /dev/null
+++ b/components/common/my-btn.vue
@@ -0,0 +1,67 @@
+
+
+ {{text}}
+
+
+
+
+
+
diff --git a/components/header.vue b/components/header.vue
index 8bf67cf..2dfbc77 100644
--- a/components/header.vue
+++ b/components/header.vue
@@ -51,9 +51,10 @@
}
const leftPathType = this.leftPathType;
if(leftPathType === "navigateTo"){
- uni.navigateTo({
- url:leftPath,
- })
+ // uni.navigateTo({
+ // url:leftPath,
+ // })
+ uni.navigateBack();
}else if(leftPathType === "switchTab"){
uni.switchTab({
url: leftPath,
diff --git a/manifest.json b/manifest.json
index 971d435..eedfbbc 100644
--- a/manifest.json
+++ b/manifest.json
@@ -139,20 +139,5 @@
"uniStatistics" : {
"enable" : false
},
- "vueVersion" : "3",
- "h5": {
- "devServer": {
- "disableHostCheck": true, // 禁止访问本地host文件
- "port": 8085, // 修改项目端口
- "proxy": {
- "/api": { // 配置服务器路径
- "target": "http://api.outer.tbmall.xin:6880", // 目标服务器
- "changeOrigin": true, // 重写路径
- "pathRewrite": {
- "^/api": "" // 将/api替换为空
- }
- }
- }
- }
- }
+ "vueVersion" : "3"
}
diff --git a/pages.json b/pages.json
index 027619f..084586c 100644
--- a/pages.json
+++ b/pages.json
@@ -258,6 +258,55 @@
"navigationStyle": "default" // 默认样式,会显示返回图标
}
},
+ {
+ "path": "setting/setting",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarTextStyle": "black"
+ }
+ },
+ {
+ "path": "setting/out-agreement",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarTextStyle": "black"
+ }
+ },
+ {
+ "path": "setting/out-code",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarTextStyle": "black"
+ }
+ },
+ {
+ "path": "setting/set-name",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarTextStyle": "black"
+ }
+ },
+ {
+ "path": "setting/account-out",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarTextStyle": "black"
+ }
+ },
+ {
+ "path": "setting/forgot-pass",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarTextStyle": "black"
+ }
+ },
+ {
+ "path": "setting/account-safe",
+ "style": {
+ "navigationStyle": "custom",
+ "navigationBarTextStyle": "black"
+ }
+ },
{
"path": "dongjian/index",
"style": {
@@ -339,11 +388,6 @@
"style": {
"navigationStyle": "custom"
}
- }, {
- "path": "login/forgotPass",
- "style": {
- "navigationStyle": "custom"
- }
}, {
"path": "register/register",
"style": {
diff --git a/pages/login_package/login/forgotPass.vue b/pages/login_package/login/forgotPass.vue
deleted file mode 100644
index b8d052c..0000000
--- a/pages/login_package/login/forgotPass.vue
+++ /dev/null
@@ -1,174 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
- s
-
-
- 获取验证码
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 确认修改
-
-
-
-
-
-
-
-
-
-
diff --git a/pages/login_package/login/login.vue b/pages/login_package/login/login.vue
index 629e306..a7ac7d9 100644
--- a/pages/login_package/login/login.vue
+++ b/pages/login_package/login/login.vue
@@ -46,7 +46,7 @@
验证码登录
密码登录登录
-
+ 忘记密码
注册
@@ -196,7 +196,7 @@ export default {
},
jumpForgot(){
uni.navigateTo({
- url: "/pages/login_package/login/forgotPass",
+ url: "/pages/rwa_package/setting/forgot-pass?type=3",
})
},
jumpRegister() {
diff --git a/pages/mine/mine.vue b/pages/mine/mine.vue
index f20f964..578cace 100644
--- a/pages/mine/mine.vue
+++ b/pages/mine/mine.vue
@@ -443,10 +443,9 @@ export default {
};
}
},
-
jumpSetting() {
uni.navigateTo({
- url: '/pages/mine_package/mine_settings/mine_settings'
+ url: '/pages/rwa_package/setting/setting'
})
}
},
diff --git a/pages/rwa_package/setting/account-out.vue b/pages/rwa_package/setting/account-out.vue
new file mode 100644
index 0000000..b30c951
--- /dev/null
+++ b/pages/rwa_package/setting/account-out.vue
@@ -0,0 +1,166 @@
+
+
+
+
+
+
+
+
+ 注销信任桥账号
+
+
+ 账号注销后不可恢复,请您谨慎操作。注销成功后,您将无法登录或使用原账号,账号内的信息和权益将均无法找回:
+ 1.账号将无法登录
+ 2.历史订单将无法查询
+ 3.放弃会员等级权益和会员积分
+ 4.放弃钱包余额、优惠券等资产
+
+ *详细注销信息可阅读
+ 《信任桥账号注销协议》
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/rwa_package/setting/account-safe.vue b/pages/rwa_package/setting/account-safe.vue
new file mode 100644
index 0000000..708a2a4
--- /dev/null
+++ b/pages/rwa_package/setting/account-safe.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
+ {{item.text}}
+
+ {{item.value}}
+ {{item.value}}
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/rwa_package/setting/forgot-pass.vue b/pages/rwa_package/setting/forgot-pass.vue
new file mode 100644
index 0000000..894fcd4
--- /dev/null
+++ b/pages/rwa_package/setting/forgot-pass.vue
@@ -0,0 +1,251 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ s
+
+
+ 获取验证码
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/rwa_package/setting/out-agreement.vue b/pages/rwa_package/setting/out-agreement.vue
new file mode 100644
index 0000000..04a3090
--- /dev/null
+++ b/pages/rwa_package/setting/out-agreement.vue
@@ -0,0 +1,136 @@
+
+
+
+
+
+ 尊敬的用户:
+ 感谢您使用信任桥APP。为了保护您的合法权益,请您在申请注销前,仔细阅读并充分理解本协议。
+ 一旦您提交注销申请并完成相关流程,即表示您已知悉并同意本协议的全部内容。
+ 一、账号注销的结果
+ 账号一旦注销成功,将无法恢复。届时:
+ 1、您的账号将无法再登录或使用原有服务。
+ 2、您的历史订单记录将无法查询。
+ 3、您将放弃所有会员等级权益与会员积分。
+ 4、您的账户钱包余额、优惠券及其他虚拟资产将全部清零且无法找回。
+
+ 二、您在申请注销前需确认
+ 1、您的账号当前无未完成的订单、未结清的款项或其他争议。
+ 2、您已妥善处理与账号相关的资金、权益及信息。
+ 3、您已明确知晓注销操作不可逆转。
+
+ 三、免责条款
+ 因您主动注销账号而导致的任何信息丢失、权益消耗、资产作废,本平台不承担任何形式的补偿或责任。
+
+ 四、特别提示
+ 1、请您在注销前,确认账号内的余额、积分、优惠券等已合理使用。
+ 2、如您仅因短期不使用,可选择退出登录,而非注销账号。
+ 3、若因违规、欺诈等原因导致平台强制注销账号,将不适用本协议中的补偿或说明。
+
+ 五、协议生效
+ 本协议自您点击确认并完成注销申请之时立即生效。
+
+
+
+
+
+
+
+
+
diff --git a/pages/rwa_package/setting/out-code.vue b/pages/rwa_package/setting/out-code.vue
new file mode 100644
index 0000000..d33bd53
--- /dev/null
+++ b/pages/rwa_package/setting/out-code.vue
@@ -0,0 +1,154 @@
+
+
+
+
+
+
+ 请输入验证码
+ 验证码已发送至 {{userInfo && userInfo.mobile1}}
+
+
+
+
+ s
+
+
+ 获取验证码
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/rwa_package/setting/set-name.vue b/pages/rwa_package/setting/set-name.vue
new file mode 100644
index 0000000..fad0cce
--- /dev/null
+++ b/pages/rwa_package/setting/set-name.vue
@@ -0,0 +1,135 @@
+
+
+
+
+
+
+ 修改用户名称
+ 昵称为2~32位字符,支持中文、英文、数
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/pages/rwa_package/setting/setting.vue b/pages/rwa_package/setting/setting.vue
new file mode 100644
index 0000000..b9ccf11
--- /dev/null
+++ b/pages/rwa_package/setting/setting.vue
@@ -0,0 +1,242 @@
+
+
+
+
+
+
+
+ {{item.text}}
+
+
+ {{item.value}}
+
+
+
+
+
+
+
+ {{item.text}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+