From f8500192b3643bb9a7cf116806c41949b58eb730 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com>
Date: Fri, 5 Nov 2021 17:24:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E4=BB=98=E5=AE=9D=E6=8F=90=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
App.vue | 1 +
apis/index.js | 4 +-
manifest.json | 4 +-
pages.json | 2 +-
pages/login/login.vue | 2 +-
pages/user/index.vue | 1 -
pages/user/order/numberWeightInfo.vue | 2 +-
pages/wallet/addBank.vue | 5 +
pages/wallet/extractRed.vue | 297 +++++++++++++--------
pages/wallet/redProperty.vue | 6 +-
unpackage/dist/dev/app-plus/app-service.js | 275 ++++++++++++++-----
11 files changed, 411 insertions(+), 188 deletions(-)
diff --git a/App.vue b/App.vue
index 163f3b1..bd145d8 100644
--- a/App.vue
+++ b/App.vue
@@ -32,6 +32,7 @@
uni.showModal({
title: "更新提示",
content: res.note || '版本更新信息',
+ confirmText: "更新",
success: (res) => {
if (res.confirm) {
if (plus.os.name=="Android") {
diff --git a/apis/index.js b/apis/index.js
index aaa096b..5282b78 100644
--- a/apis/index.js
+++ b/apis/index.js
@@ -10,8 +10,8 @@ import router from '../router'
// 基础配置
const config = {
- apiUrl : 'https://oapi.lianshang.vip/api/', // 正式环境
- // apiUrl : 'http://api.ahxh.shangkelian.cn/api/', // 测试环境
+ // apiUrl : 'https://oapi.lianshang.vip/api/', // 正式环境
+ apiUrl : 'http://api.ahxh.shangkelian.cn/api/', // 测试环境
apiUrls : 'https://storage.lianshang.vip/', // 图片路径(测试/正式)
timeout : 60000
}
diff --git a/manifest.json b/manifest.json
index c058c99..06965a8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "链商星球",
"appid" : "__UNI__1F65101",
"description" : "安徽星煌,链商星球商家工具",
- "versionName" : "1.1.0",
- "versionCode" : 110,
+ "versionName" : "1.1.1",
+ "versionCode" : 111,
"transformPx" : false,
/* 5+App特有相关 */
"app-plus" : {
diff --git a/pages.json b/pages.json
index a315402..2c1061b 100644
--- a/pages.json
+++ b/pages.json
@@ -153,7 +153,7 @@
"titleNView": {
"backgroundImage": "linear-gradient(to right, #7c52fc, #976dff)"
}
- }
+ }
}
},
{
diff --git a/pages/login/login.vue b/pages/login/login.vue
index d6e1653..064bb5a 100644
--- a/pages/login/login.vue
+++ b/pages/login/login.vue
@@ -48,7 +48,7 @@
export default {
data() {
return {
- phone : "18245180131",
+ phone : "",
code : "",
parentId: "",
smsTime : 60,
diff --git a/pages/user/index.vue b/pages/user/index.vue
index a3a76a6..4fd4f6d 100644
--- a/pages/user/index.vue
+++ b/pages/user/index.vue
@@ -347,7 +347,6 @@
// 获取企业认证状态
companyStatus(){
companyStatus().then(res=>{
- console.log(res)
this.companyCreateInfo = res
})
},
diff --git a/pages/user/order/numberWeightInfo.vue b/pages/user/order/numberWeightInfo.vue
index 12a5a44..6d93acd 100644
--- a/pages/user/order/numberWeightInfo.vue
+++ b/pages/user/order/numberWeightInfo.vue
@@ -759,7 +759,7 @@
.outTime{
padding: $padding 0 0;
.outTime-down{
- color: $text-price;
+ color: $mian-color;
font-size: 32rpx;
}
}
diff --git a/pages/wallet/addBank.vue b/pages/wallet/addBank.vue
index 4c32236..be3b996 100644
--- a/pages/wallet/addBank.vue
+++ b/pages/wallet/addBank.vue
@@ -169,6 +169,11 @@
duration: 3000
})
setTimeout(res => {
+
+ console.log(this.$Route)
+
+ // if(this.$Route)
+
uni.setStorageSync('refresh',true)
uni.navigateBack({})
}, 3000)
diff --git a/pages/wallet/extractRed.vue b/pages/wallet/extractRed.vue
index 10364fe..4877e8b 100644
--- a/pages/wallet/extractRed.vue
+++ b/pages/wallet/extractRed.vue
@@ -5,54 +5,71 @@
可提现额度
{{ balance || '0.00' }}
- 提现记录
+ 提现记录
-
-
- 提现至银行卡
-
- 添加银行卡
- {{bankInfo.name?bankInfo.name:'选择银行卡'}}
+
+
+
-
+
提现金额
-
+
全部提现
- ≈ ¥{{total.toFixed(2)}}
- 提现至银行卡
+
+
+
+ 添加银行卡
+ {{bankInfo.name ? bankInfo.name:'选择银行卡'}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 申请提现
预计5- 10个工作日到账 手续费: {{tax === '0'?'免手续费':tax+'%'}}