diff --git a/config/index.js b/config/index.js
index 1011490..5ab8995 100644
--- a/config/index.js
+++ b/config/index.js
@@ -32,18 +32,18 @@ const config = {
// 阿里云配置
aliOSSConfig :{
development: {
- aliOSS_accessKey: 'LTAI5tQSs47izVy8DLVdwUU9',
- aliOSS_secretKey: 'qHI7C3PaXYZySr84HTToviC71AYlFq',
- aliOSS_bucketName: 'hanhaiimage',
- endpoint: 'oss-cn-shenzhen.aliyuncs.com',
- staticDomain: 'https://image.hhlm1688.com/'
+ aliOSS_accessKey: 'LTAI5tQzgwJQK7hd7zFKJbLm',
+ aliOSS_secretKey: 'siB6FGNXDgSrLao5xvdNb4OCbQOt8d',
+ aliOSS_bucketName: 'multipleculture',
+ endpoint: 'oss-cn-beijing.aliyuncs.com',
+ staticDomain: 'https://image.multipleculture.com/'
},
testing: {
- aliOSS_accessKey: 'LTAI5tQSs47izVy8DLVdwUU9',
- aliOSS_secretKey: 'qHI7C3PaXYZySr84HTToviC71AYlFq',
- aliOSS_bucketName: 'hanhaiimage',
- endpoint: 'oss-cn-shenzhen.aliyuncs.com',
- staticDomain: 'https://image.hhlm1688.com/'
+ aliOSS_accessKey: 'LTAI5tQzgwJQK7hd7zFKJbLm',
+ aliOSS_secretKey: 'siB6FGNXDgSrLao5xvdNb4OCbQOt8d',
+ aliOSS_bucketName: 'multipleculture',
+ endpoint: 'oss-cn-beijing.aliyuncs.com',
+ staticDomain: 'https://image.multipleculture.com/'
},
production: {
aliOSS_accessKey: 'LTAI5tRqoxbC9BKrWJduKDVT',
diff --git a/manifest.json b/manifest.json
index 09c4a72..a3236b5 100644
--- a/manifest.json
+++ b/manifest.json
@@ -55,11 +55,7 @@
"urlCheck" : false
},
"requiredPrivateInfos" : [ "getLocation", "chooseLocation" ],
- "permission" : {
- "scope.userLocation" : {
- "desc" : "您的位置信息将用于更方便的定位"
- }
- },
+ "permission" : {},
"usingComponents" : true
},
"mp-alipay" : {
diff --git a/subPages/member/recharge.vue b/subPages/member/recharge.vue
index a5cbe79..3928fdb 100644
--- a/subPages/member/recharge.vue
+++ b/subPages/member/recharge.vue
@@ -23,7 +23,7 @@
previousMargin="70"
nextMargin="70"
acceleration
- height="85"
+ height="75"
circular
:autoplay="false"
radius="5"
diff --git a/subPages/user/cash.vue b/subPages/user/cash.vue
index e43b70f..35433ec 100644
--- a/subPages/user/cash.vue
+++ b/subPages/user/cash.vue
@@ -125,7 +125,7 @@ export default {
// 显示提现须知
uni.showModal({
title: '提现须知',
- content: '1. 提现金额最低10元\n2. 工作日24小时内到账\n3. 手续费按平台规定收取',
+ content: this.configParamContent('cash_policy'),
showCancel: false
})
}
diff --git a/subPages/user/introduce.vue b/subPages/user/introduce.vue
index 94811f5..77f5811 100644
--- a/subPages/user/introduce.vue
+++ b/subPages/user/introduce.vue
@@ -3,7 +3,7 @@
-
+
diff --git a/subPages/user/profile.vue b/subPages/user/profile.vue
index 469e040..8341598 100644
--- a/subPages/user/profile.vue
+++ b/subPages/user/profile.vue
@@ -53,10 +53,7 @@
class="avatar-image"
mode="aspectFill"
>
-
-
- 点击上传头像
-
+
@@ -83,7 +80,6 @@ export default {
name: '',
phone: ''
},
- showMask: true,
saveButtonStyle: {
backgroundColor: '#06DADC',
borderRadius: '41rpx',
@@ -103,26 +99,7 @@ export default {
}
},
methods: {
- // // 微信昵称审核回调
- // onNicknameReview(e) {
- // console.log('微信昵称审核回调', e);
- // if (e.detail.pass) {
- // // 审核通过,使用微信昵称
- // this.userInfo.name = e.detail.value;
- // console.log('微信昵称审核通过:', e.detail.value);
- // uni.showToast({
- // title: '昵称获取成功',
- // icon: 'success'
- // });
- // } else {
- // // 审核不通过
- // console.log('微信昵称审核不通过');
- // uni.showToast({
- // title: '昵称包含敏感词,请重新输入',
- // icon: 'none'
- // });
- // }
- // },
+
// 选择头像并上传到OSS
@@ -232,9 +209,7 @@ export default {
onLoad() {
this.getProfile()
// 3秒后隐藏遮罩层
- setTimeout(() => {
- this.showMask = false
- }, 3000)
+
}
}
@@ -284,6 +259,12 @@ export default {
height: 200rpx;
border-radius: 16rpx;
overflow: hidden;
+ display: block;
+ text-align: left;
+ margin: 0;
+ padding: 0;
+ background: none;
+ border: none;
.avatar-image {
width: 100%;
diff --git a/subPages/user/promote.vue b/subPages/user/promote.vue
index ec9ecc5..c0f00b0 100644
--- a/subPages/user/promote.vue
+++ b/subPages/user/promote.vue
@@ -130,8 +130,8 @@ export default {
})
},
goCash() {
- uni.requestMerchantTransfer({
-
+ uni.navigateTo({
+ url: '/subPages/user/cash'
})
},