From 9eb1f97e4c953718d32670254c4d0f90379b1d80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=94=90=E6=98=8E=E6=98=8E?= <970899069@qq.com> Date: Tue, 14 Mar 2023 17:19:21 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apis/index.js | 4 +- manifest.json | 2 +- pages.json | 19 ++++- pages/account/bonus.vue | 26 +++++-- pages/account/cash.vue | 13 ++-- pages/account/withdraws.vue | 43 +++++++----- pages/im/chat.vue | 32 +++++++-- pages/im/msg.vue | 126 ++++++++++++++++++++++++++++++++++ pages/work/index.vue | 23 ++++--- static/icons/tabs_icon_04.png | Bin 0 -> 4084 bytes static/icons/tabs_show_04.png | Bin 0 -> 4210 bytes static/im/icon_03.png | Bin 0 -> 3666 bytes 12 files changed, 234 insertions(+), 54 deletions(-) create mode 100644 pages/im/msg.vue create mode 100644 static/icons/tabs_icon_04.png create mode 100644 static/icons/tabs_show_04.png create mode 100644 static/im/icon_03.png diff --git a/apis/index.js b/apis/index.js index 917ef93..bc86f66 100644 --- a/apis/index.js +++ b/apis/index.js @@ -10,8 +10,8 @@ import router from '../router' // 基础配置 const config = { - apiUrl : 'https://douhuo.douhuofalv.com/api/', - // apiUrl : 'https://api.douhuotest.douhuofalv.com/api/', //测试环境 + // apiUrl : 'https://douhuo.douhuofalv.com/api/', + apiUrl : 'https://api.douhuotest.douhuofalv.com/api/', //测试环境 timeout : 60000 } diff --git a/manifest.json b/manifest.json index a9eb27f..ba8855d 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name" : "抖火", "appid" : "__UNI__C305C03", "description" : "纵有疾风起,人生不言弃", - "versionName" : "1.3.4", + "versionName" : "1.3.5", "versionCode" : 103, "transformPx" : false, /* 5+App特有相关 */ diff --git a/pages.json b/pages.json index dde56ef..37d8eb5 100644 --- a/pages.json +++ b/pages.json @@ -555,13 +555,21 @@ "navigationBarBackgroundColor": "#FFFFFF" } }, { - "path": "pages/im/chat", - "auth": true, + "path": "pages/im/chat", + "auth": true, "name": "ImChat", "style": { "navigationBarTitleText": "聊天窗口", + "enablePullDownRefresh": false, + "disableScroll": true, + "navigationBarBackgroundColor": "#FFFFFF" + } + }, { + "path": "pages/im/msg", + "name": "ImMsg", + "style": { + "navigationBarTitleText": "消息", "enablePullDownRefresh": false, - "disableScroll": true, "navigationBarBackgroundColor": "#FFFFFF" } }], @@ -591,6 +599,11 @@ "selectedIconPath": "static/icons/tabs_show_02.png", "pagePath": "pages/work/index", "text": "工作台" + }, { + "iconPath": "static/icons/tabs_icon_04.png", + "selectedIconPath": "static/icons/tabs_show_04.png", + "pagePath": "pages/im/msg", + "text": "消息" }, { "iconPath": "static/icons/tabs_icon_03.png", "selectedIconPath": "static/icons/tabs_show_03.png", diff --git a/pages/account/bonus.vue b/pages/account/bonus.vue index 3f88037..96d415c 100644 --- a/pages/account/bonus.vue +++ b/pages/account/bonus.vue @@ -41,7 +41,7 @@ - [{{item.status.status_text}}]{{item.title || '-'}} + {{item.status.status_text}}{{item.title || '-'}} {{item.remark || '-'}} {{item.created_at}} @@ -278,11 +278,11 @@ font-weight: bold; font-size: 30rpx; color: #666666; - text{ - font-weight: normal; - padding-right: 10rpx; - color: $main-color; - } + // text{ + // font-weight: normal; + // padding-right: 10rpx; + // color: $main-color; + // } span{ font-size: 22rpx; font-weight: normal; @@ -298,6 +298,20 @@ background-color: rgba(#d90017, 0.4); } } + .withdraws-type{ + font-weight: bold; + font-size: 30rpx; + color: #666666; + span{ + font-size: 22rpx; + font-weight: normal; + background-color: rgba(#8E6AFF, 0.4); + padding: 2rpx 20rpx; + border-radius: 40rpx; + color: #fff; + margin-right: 20rpx; + } + } .remark{ font-size: 28rpx; } diff --git a/pages/account/cash.vue b/pages/account/cash.vue index a39d17b..011e4f3 100644 --- a/pages/account/cash.vue +++ b/pages/account/cash.vue @@ -70,10 +70,11 @@ data() { return { tabs : [ + { name: '全部业绩', value: 'all'}, { name: '当月业绩', value: 'month'}, { name: '当年业绩', value: 'year'} ], - dayType : 'month', + dayType : 'all', type : 'self', total : '0.00', list : [], @@ -110,11 +111,11 @@ page: this.page.current }).then(res => { let { total, lists } = res; - let atList = lists.page.current == 1 ? [] : this.list - this.list = atList.concat(lists.data) - this.total = total - this.page = lists.page - this.pagesShow = false + let atList = lists.page.current == 1 ? [] : this.list + this.list = atList.concat(lists.data) + this.total = total + this.page = lists.page + this.pagesShow = false }).catch(err => { uni.showToast({ title: err.message, diff --git a/pages/account/withdraws.vue b/pages/account/withdraws.vue index 14136df..841e475 100644 --- a/pages/account/withdraws.vue +++ b/pages/account/withdraws.vue @@ -5,21 +5,25 @@ 到账银行卡 - + {{banks[bankVal].name}} - + - + - + + + + + @@ -44,15 +48,17 @@ export default { data() { return { - banks : [], - bankVal : 0, - bankNo : '', - mobile : '', - name : '', - amount : '', - min : 0, - rate : 0, - balance : '0.00' + banks : [], + bankVal : 0, + bankNo : '', + mobile : '', + name : '', + idcard : '', + amount : '', + min : 0, + rate : 0, + balance : '0.00', + isDisabled : false }; }, @@ -73,12 +79,13 @@ this.min = min this.balance = balance this.banks = [ { id: '', name: '请选择开户银行'}, ...banks ] + this.name = bank.name if(bank.bank_no){ - bankIndex = this.banks.findIndex(val => val.name === bank.bank_name) - this.bankNo = bank.bank_no - this.mobile = bank.mobile - this.name = bank.name - this.bankVal = bankIndex >= 0 ? bankIndex : 0 + bankIndex = this.banks.findIndex(val => val.name === bank.bank_name) + this.bankNo = bank.bank_no + this.mobile = bank.mobile + this.bankVal = bankIndex >= 0 ? bankIndex : 0 + this.isDisabled = true } uni.hideLoading() }).catch(err => { diff --git a/pages/im/chat.vue b/pages/im/chat.vue index 3ae221e..8084856 100644 --- a/pages/im/chat.vue +++ b/pages/im/chat.vue @@ -1,14 +1,20 @@