diff --git a/App.vue b/App.vue index bab82ac..ad1862a 100644 --- a/App.vue +++ b/App.vue @@ -2,6 +2,7 @@ import { getVersions } from './apis/interfaces/versions' export default { onLaunch: function() { + return //#ifdef APP-PLUS // 获取系统版本号 getVersions({ diff --git a/apis/index.js b/apis/index.js index bc86f66..cee64b3 100644 --- a/apis/index.js +++ b/apis/index.js @@ -11,7 +11,7 @@ import router from '../router' // 基础配置 const config = { // apiUrl : 'https://douhuo.douhuofalv.com/api/', - apiUrl : 'https://api.douhuotest.douhuofalv.com/api/', //测试环境 + apiUrl : 'https://douhuo.demos.uzchain.tech/api/', //测试环境 timeout : 60000 } diff --git a/apis/interfaces/index.js b/apis/interfaces/index.js index 76224e3..3f3695e 100644 --- a/apis/interfaces/index.js +++ b/apis/interfaces/index.js @@ -54,6 +54,72 @@ const fwbDetail = (service) =>{ }) } +// 账户管理类 +const accountManagement = () => { + return request({ + url: "account_management/index" + }) +} + +// 账户管理类 - 办理 +const accountFrom = (data, id) => { + return request({ + url : "account_management/" + id + "/store", + method : "POST", + data + }) +} + +// 账户管理类 - 订单 +const accountOrder = data => { + console.log(data) + return request({ + url : "account_management/order/lists", + data + }) +} + +// 账户管理类 - 取消订单 +const accountCancel = id => { + return request({ + url : "account_management/order/" + id + "/cancel", + method : "DELETE" + }) +} + +// 委托管理类 +const delegation = () => { + return request({ + url: "delegation/index" + }) +} + +// 委托管理类 - 办理 +const delegationFrom = (data, id) => { + return request({ + url : "delegation/" + id + "/store", + method : "POST", + data + }) +} + +// 委托管理类 - 订单 +const delegationOrder = data => { + return request({ + url : "delegation/order/lists", + method : "POST", + data + }) +} + +// 委托管理类 - 取消订单 +const delegationCancel = id => { + return request({ + url : "delegation/order/" + id + "/cancel", + method : "DELETE" + }) +} + export { categories, jf, @@ -62,5 +128,13 @@ export { index, recharge, zyPay, + accountManagement, + accountFrom, + accountOrder, + accountCancel, + delegation, + delegationFrom, + delegationOrder, + delegationCancel } diff --git a/apis/interfaces/pay.js b/apis/interfaces/pay.js index ac79a0d..108fcf2 100644 --- a/apis/interfaces/pay.js +++ b/apis/interfaces/pay.js @@ -114,6 +114,15 @@ const coinSynthesize = data => { }) } +// 现在打款支付 +const cashierOffline = data => { + return request({ + url : 'pay/cashier_desk/offline', + data, + method: 'POST' + }) +} + export { coinPay, diffCoinPay, @@ -127,5 +136,6 @@ export { dgFree, umsSynthesize, dgSynthesize, - coinSynthesize + coinSynthesize, + cashierOffline } \ No newline at end of file diff --git a/apis/interfaces/uploading.js b/apis/interfaces/uploading.js index 8d2a528..8136c5c 100644 --- a/apis/interfaces/uploading.js +++ b/apis/interfaces/uploading.js @@ -9,6 +9,9 @@ import { uploading as upd } from '../index' const uploads = (paths, fromData) => { + + console.log(paths) + return upd(paths, fromData) } diff --git a/manifest.json b/manifest.json index c84af97..5a15ead 100644 --- a/manifest.json +++ b/manifest.json @@ -2,8 +2,8 @@ "name" : "抖火法律", "appid" : "__UNI__C305C03", "description" : "纵有疾风起,人生不言弃", - "versionName" : "1.6.2", - "versionCode" : 1062, + "versionName" : "1.6.4", + "versionCode" : 1064, "transformPx" : false, /* 5+App特有相关 */ "app-plus" : { diff --git a/pages.json b/pages.json index 19de60f..d1c42a1 100644 --- a/pages.json +++ b/pages.json @@ -881,6 +881,39 @@ "navigationBarBackgroundColor": "#446EFE", "navigationBarTextStyle": "white" } + }, + { + "path" : "pages/management/account", + "name" : "MagAccount", + "style" : { + "navigationBarTitleText" : "账户咨询办理", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/management/delegation", + "name" : "MagDelegation", + "style" : { + "navigationBarTitleText" : "委托管理办理", + "enablePullDownRefresh" : false + } + }, + { + "path" : "pages/work/account", + "name" : "AccountWork", + "style" : { + "navigationBarTitleText" : "账户管理咨询类", + "enablePullDownRefresh" : false, + "navigationBarBackgroundColor": "#FFFFFF" + } + },{ + "path" : "pages/work/delegation", + "name" : "DelegationWork", + "style" : { + "navigationBarTitleText" : "委托管理类", + "enablePullDownRefresh" : false, + "navigationBarBackgroundColor": "#FFFFFF" + } }], "globalStyle": { "navigationBarTextStyle": "black", diff --git a/pages/index/index.vue b/pages/index/index.vue index 4c7255e..126ca06 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -38,7 +38,7 @@ - + 协商调解咨询类 @@ -66,6 +66,50 @@ + + + + 账户管理咨询类 + + + + + + {{item.title}} + {{item.price}} /{{item.limit}} + + + + + + + + 委托管理类 + + + + + + {{item.title}} + {{item.price}} /{{item.limit}} + + + + @@ -157,7 +201,7 @@ + + diff --git a/pages/management/delegation.vue b/pages/management/delegation.vue new file mode 100644 index 0000000..db48601 --- /dev/null +++ b/pages/management/delegation.vue @@ -0,0 +1,141 @@ + + + + + diff --git a/pages/offline/orders.vue b/pages/offline/orders.vue index 7c883cb..bd4033d 100644 --- a/pages/offline/orders.vue +++ b/pages/offline/orders.vue @@ -65,7 +65,6 @@ 匹配服务包 - 查看订单 diff --git a/pages/pay/pay.vue b/pages/pay/pay.vue index b9185a7..9fce673 100644 --- a/pages/pay/pay.vue +++ b/pages/pay/pay.vue @@ -4,9 +4,9 @@ 实付金额 {{total}} - - 火力值:{{totalFire}} - 当前火力值比例1:{{rate}} + + 最大可抵扣:{{totalFire}} + 订单号:{{orderNo}} @@ -56,9 +56,16 @@ + - + 使用火力值抵扣 @@ -101,9 +108,13 @@ - + + + + + @@ -124,8 +135,10 @@ umsSynthesize, dgSynthesize, coinSynthesize, - } from '@/apis/interfaces/pay.js' + cashierOffline + } from '@/apis/interfaces/pay.js' import mixin from 'uview-ui/libs/mixin/mixin'; + import { uploads } from '@/apis/interfaces/uploading.js' export default { data() { return { @@ -186,6 +199,8 @@ let order_type = this.$Route.query.orderType.replace(/\-/g, '\\') oderinfo( this.$Route.query.orderId, order_type).then(res => { let { order_no, price, score, order_id, rate, total_fire, can_use_channel } = res + + this.rate = rate this.totalFire = total_fire this.orderType = order_type @@ -259,7 +274,7 @@ clearInterval(outTime) wx.showModal({ title : '提示', - content : this.$Route.query.paytype === 'synthesize' ? '支付成功,可在工作台综法订单管理查询您的订单' : '支付成功', + content : this.$Route.query.paytype === 'synthesize' ? '支付成功,可在工作台查询您的订单' : '支付成功', showCancel : false, confirmColor: '#446EFE', success : () => { @@ -355,8 +370,46 @@ if(this.payType == 'free') this.onDgFreePay('app_alipay', false) if(this.payType == 'synthesize') this.onFreeToast('onDgSynthesizePay', 'app_alipay', false) break + case 'offline': + console.log('线下打款') + break } }, + // 上传打款凭证 + onOffline(){ + uni.chooseImage({ + count: 1, + success: path => { + let { tempFiles } = path; + uploads([{ + name: 'file' + tempFiles[0].size, + uri : tempFiles[0].path + }], {}).then(updRes => { + let { path } = updRes + cashierOffline({ + image : path[0], + order_type : this.orderType, + order_id : this.orderId, + }).then(res => { + uni.showModal({ + title : '上传成功', + content : '请耐心等待打款审核', + showCancel : false, + success : () => { + uni.navigateBack() + } + }) + }) + uni.hideLoading() + }).catch(err => { + uni.showToast({ + title: err.message, + icon : 'none' + }) + }) + } + }) + }, // 火力值 - 综法 onCoinSynthesizePay(){ coinSynthesize({ diff --git a/pages/work/account.vue b/pages/work/account.vue new file mode 100644 index 0000000..57b8d1a --- /dev/null +++ b/pages/work/account.vue @@ -0,0 +1,319 @@ + + + + + diff --git a/pages/work/delegation.vue b/pages/work/delegation.vue new file mode 100644 index 0000000..aa146b4 --- /dev/null +++ b/pages/work/delegation.vue @@ -0,0 +1,312 @@ + + + + + diff --git a/pages/work/index.vue b/pages/work/index.vue index e122520..c2b929c 100644 --- a/pages/work/index.vue +++ b/pages/work/index.vue @@ -64,7 +64,7 @@ - + @@ -74,6 +74,24 @@ 去查看 + + + + + 账户管理咨询类 + 客户账户管理咨询类订单 + + 去查看 + + + + + 委托管理类 + 客户委托管理类订单 + + 去查看 + + @@ -99,7 +117,7 @@ 去查看 - + @@ -542,7 +560,7 @@ display: flex; box-sizing: border-box; position: relative; - .flex-icon{ width: 48px; height: 48px; background: #dce1fb; border-radius: 30rpx; } + .flex-icon{ width: 48px; height: 48px; border-radius: 30rpx; } .flex-title{ box-sizing: border-box; padding-left: 30rpx; diff --git a/static/icons/pay_bank.png b/static/icons/pay_bank.png new file mode 100644 index 0000000..b94dc43 Binary files /dev/null and b/static/icons/pay_bank.png differ diff --git a/static/icons/work_icon_29.png b/static/icons/work_icon_29.png new file mode 100644 index 0000000..47d0616 Binary files /dev/null and b/static/icons/work_icon_29.png differ diff --git a/static/icons/work_icon_30.png b/static/icons/work_icon_30.png new file mode 100644 index 0000000..4ee591f Binary files /dev/null and b/static/icons/work_icon_30.png differ