diff --git a/pages/pay/pay.vue b/pages/pay/pay.vue
index 97109ff..b9185a7 100644
--- a/pages/pay/pay.vue
+++ b/pages/pay/pay.vue
@@ -13,47 +13,48 @@
-
@@ -146,7 +147,9 @@
// 二维码支付
payCodeShow : false,
payQrUrl : '',
- payQrType : ''
+ payQrType : '',
+ // 支付选项
+ payCan : {}
};
},
onShow() {
@@ -161,14 +164,15 @@
})
// 自由服务包订单信息
if(this.$Route.query.paytype === 'free'){
- this.payMethod = "wx"
umsFreeInfo(this.$Route.query.serviceId).then(res => {
- let { order_id, price, order_no } = res;
+ let { order_id, price, order_no, can_use_channel } = res;
this.orderId = order_id
this.total = price
this.orderNo = order_no
this.payType = this.$Route.query.paytype
+ this.payCan = can_use_channel
uni.hideLoading()
+ this.getDefaultType(can_use_channel)
}).catch(err => {
uni.showToast({
title: err.message,
@@ -181,7 +185,7 @@
if(this.$Route.query.paytype === 'synthesize'){
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 } = 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
@@ -190,7 +194,9 @@
this.total = price
this.orderNo = order_no
this.balance = score
+ this.payCan = can_use_channel
uni.hideLoading()
+ this.getDefaultType(can_use_channel)
}).catch(err => {
uni.showToast({
title: err.message,
@@ -201,14 +207,16 @@
}
// 其他支付方式订单信息
info(this.$Route.query.orderId).then(res => {
- let { total, order_no, business_order_id, diff_prices, diff, score } = res
+ let { total, order_no, business_order_id, diff_prices, diff, score, can_use_channel } = res
this.orderId = business_order_id
this.diffId = diff.business_order_diff_price_id
this.payType = this.$Route.query.paytype
this.total = this.payType === 'diff' ? diff_prices: total
this.orderNo = order_no
this.balance = score
+ this.payCan = can_use_channel
uni.hideLoading()
+ this.getDefaultType(can_use_channel)
}).catch(err => {
uni.showToast({
title: err.message,
@@ -217,6 +225,16 @@
})
},
methods: {
+ // 检查默认支付选项
+ getDefaultType(can_use_channel){
+ // 检查支付默认选项
+ for(let key of Object.keys(can_use_channel)){
+ if(can_use_channel[key] > 1){
+ this.payMethod = key
+ return
+ }
+ }
+ },
// 查询订单状态
onGetOrderPayState(){
// 查询支付状态
diff --git a/pages/synthesize/difference.vue b/pages/synthesize/difference.vue
index b821297..e88bcdb 100644
--- a/pages/synthesize/difference.vue
+++ b/pages/synthesize/difference.vue
@@ -7,32 +7,42 @@
补差价记录
-
-
-
-
- {{item.price}}
+
+
+
+
+
+ {{item.price}}
+
+
+
+ {{item.status.text}}
+
+
+
+ {{item.created_at}}
+
-
-
- {{item.status.text}}
-
-
-
- {{item.created_at}}
-
-
-
- 取消订单
-
- 立即支付
- 审核中
- 被驳回
+
+ 取消订单
+
+ 立即支付
+ 审核中
+ 被驳回
+
+
+
+
+
+
+
-
-
@@ -139,7 +149,7 @@
},
// 列表补差价
onListPay(obj){
- let { synthesis_diff_price_id, order_type, can, price, remark, offline_pays } = obj
+ let { synthesis_diff_price_id, order_type, can, price, remark, offline_pays, order_id } = obj
if(can.pay_status == 2 || can.pay_status == 4){
uni.showToast({
title: '补差价信息正在审核中',
@@ -150,15 +160,14 @@
if(can.pay_status == 3 || can.pay_status == 6){
uni.showModal({
title : '提示',
- content : '驳回原因：' + remark,
+ content : '驳回原因：' + offline_pays.remark,
showCancel : false,
success : res => {
if(res.confirm && can.pay_status == 3){
this.$Router.push({
name: 'BankPay',
params: {
- payId : payId,
- orderId : offline_pays.offline_pay_id,
+ payId : offline_pays.offline_pay_id,
orderType : order_type.replace(/\\/g, '-'),
price : price,
type : 'edit'
@@ -231,6 +240,13 @@
padding: 1rpx 0;
box-sizing: border-box;
}
+ // 页面空
+ .diff-null{
+ height: 40vh;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ }
// 差价列表
.diff-list{
padding: 0 30rpx;
diff --git a/pages/synthesize/enterprise.vue b/pages/synthesize/enterprise.vue
index f41548d..897de9a 100644
--- a/pages/synthesize/enterprise.vue
+++ b/pages/synthesize/enterprise.vue
@@ -69,18 +69,15 @@
synthesisArr: [], //企业-年费服务包列表
}
},
-
- created() {
+ onShow() {
this.yearServe();
},
-
methods: {
// 年费服务包列表
yearServe(){
yearSynthList({
type: 2
}).then(res => {
- console.log(res)
this.synthesisArr = res
}).catch(err => {
uni.showToast({
diff --git a/pages/synthesize/entrust.vue b/pages/synthesize/entrust.vue
index 01a1f30..2ca13c6 100644
--- a/pages/synthesize/entrust.vue
+++ b/pages/synthesize/entrust.vue
@@ -104,12 +104,10 @@
entrustArr : [], // 案件委托列表
}
},
-
- created() {
+ onShow() {
// 获取-案件委托-列表
this.yearServe();
},
-
methods: {
// 案件委托-列表
yearServe(){
diff --git a/pages/synthesize/entrustCivil.vue b/pages/synthesize/entrustCivil.vue
index ffe60e8..75e2dba 100644
--- a/pages/synthesize/entrustCivil.vue
+++ b/pages/synthesize/entrustCivil.vue
@@ -191,6 +191,8 @@
}
}
},
+
+
methods: {
// 民事类型列表
@@ -307,7 +309,6 @@
type : 'self',
channel : 'app'
}).then(res => {
- console.log(res)
let { order_id, order_type, can } = res;
this.expressSheet(order_id, order_type, can )
uni.hideLoading()
@@ -368,7 +369,7 @@
background-color: #111e4b;
width: 100vw;
overflow-y: scroll;
- position: fixed;
+ // position: fixed;
}
.top {
diff --git a/pages/synthesize/entrustInfo.vue b/pages/synthesize/entrustInfo.vue
index 19cb66d..3f6707a 100644
--- a/pages/synthesize/entrustInfo.vue
+++ b/pages/synthesize/entrustInfo.vue
@@ -33,6 +33,18 @@
+
+
+
+
+ {{lawyer.name}}
+
+
+
+ {{lawyer.username}}
+
+
+
@@ -69,6 +81,7 @@
params : [],
createdAt: '',
user : {},
+ lawyer : null,
price : '0.00'
};
},
@@ -78,13 +91,17 @@
mask : true
})
entrustInfo(this.$Route.query.id).then(res => {
- let { entrust, params, created_at, user, order_no, total } = res;
+
+ console.log(res)
+
+ let { entrust, params, created_at, user, order_no, total, lawyer } = res;
this.entrust = entrust
this.params = params
this.createdAt = created_at
this.user = user
this.no = order_no
this.price = total
+ this.lawyer = lawyer
}).catch(err => {
uni.showToast({
title: err.message,
diff --git a/pages/synthesize/expandInfo.vue b/pages/synthesize/expandInfo.vue
index 7ac0ccc..bdc37ef 100644
--- a/pages/synthesize/expandInfo.vue
+++ b/pages/synthesize/expandInfo.vue
@@ -32,6 +32,18 @@
+
+
+
+
+ {{lawyer.name}}
+
+
+
+ {{lawyer.username}}
+
+
+
@@ -68,6 +80,7 @@
params : [],
createdAt: '',
user : {},
+ lawyer : null,
price : '0.00'
};
},
@@ -77,7 +90,8 @@
mask : true
})
expandInfo(this.$Route.query.id).then(res => {
- let { expand, params, created_at, user, order_no, total } = res;
+ let { expand, params, created_at, user, order_no, total, lawyer } = res;
+ this.lawyer = lawyer
this.expand = expand
this.params = params
this.createdAt = created_at
@@ -85,9 +99,6 @@
this.no = order_no
this.price = total
}).catch(err => {
-
- console.log(err)
-
uni.showToast({
title: err.message,
icon : 'none'
diff --git a/pages/synthesize/expandWrite.vue b/pages/synthesize/expandWrite.vue
index ed10eb2..dcdbef1 100644
--- a/pages/synthesize/expandWrite.vue
+++ b/pages/synthesize/expandWrite.vue
@@ -32,7 +32,7 @@
-
+
@@ -157,6 +157,18 @@
},
methods: {
+ // 判断最小输入金额
+ priceBlur(obj, index){
+ let minPrice = this.price
+ if(Number(obj.value) < Number(minPrice)){
+ obj.value = Number(minPrice)
+ this.$set(this.paramsArr, index, obj)
+ uni.showToast({
+ title: '金额不能小于' + minPrice + '元',
+ icon : 'none'
+ })
+ }
+ },
// 综法咨询-详情
getBusiness(){
expandsInfo(this.$Route.query.entrustId).then(res => {
diff --git a/pages/synthesize/individual.vue b/pages/synthesize/individual.vue
index 6c39898..79b8dd8 100644
--- a/pages/synthesize/individual.vue
+++ b/pages/synthesize/individual.vue
@@ -65,7 +65,6 @@
}
},
onShow() {
-
this.yearServe();
},
methods: {
diff --git a/pages/synthesize/service.vue b/pages/synthesize/service.vue
index 00ecd7d..3dd4cdb 100644
--- a/pages/synthesize/service.vue
+++ b/pages/synthesize/service.vue
@@ -13,7 +13,7 @@
{{item.title}}
- 购买
+ 购买
diff --git a/pages/synthesize/servicesInfo.vue b/pages/synthesize/servicesInfo.vue
index c82d50a..b59b998 100644
--- a/pages/synthesize/servicesInfo.vue
+++ b/pages/synthesize/servicesInfo.vue
@@ -32,6 +32,18 @@
+
+
+
+
+ {{lawyer.name}}
+
+
+
+ {{lawyer.username}}
+
+
+
@@ -68,6 +80,7 @@
params : [],
createdAt: '',
user : {},
+ lawyer : null,
price : '0.00'
};
},
@@ -77,7 +90,8 @@
mask : true
})
servicesInfo(this.$Route.query.id).then(res => {
- let { service, params, created_at, user, order_no, total } = res;
+ let { service, params, created_at, user, order_no, total, lawyer } = res;
+ this.lawyer = lawyer
this.service = service
this.params = params
this.createdAt = created_at
diff --git a/pages/synthesize/synthesisInfo.vue b/pages/synthesize/synthesisInfo.vue
index 01e885d..710ad0b 100644
--- a/pages/synthesize/synthesisInfo.vue
+++ b/pages/synthesize/synthesisInfo.vue
@@ -32,6 +32,18 @@
+
+
+
+
+ {{lawyer.name}}
+
+
+
+ {{lawyer.username}}
+
+
+
@@ -68,6 +80,7 @@
params : [],
createdAt: '',
user : {},
+ lawyer : null,
price : '0.00'
};
},
@@ -77,13 +90,14 @@
mask : true
})
synthesisInfo(this.$Route.query.id).then(res => {
- let { synthesis, params, created_at, user, order_no, price } = res;
+ let { synthesis, params, created_at, user, order_no, price, lawyer } = res;
this.synthesis = synthesis
this.params = params
this.createdAt = created_at
this.user = user
this.no = order_no
this.price = price
+ this.lawyer = lawyer
}).catch(err => {
uni.showToast({
title: err.message,
diff --git a/static/code/btn.png b/static/code/btn.png
index 4df7102..dd69ae2 100644
Binary files a/static/code/btn.png and b/static/code/btn.png differ
diff --git a/static/code/code_btn.png b/static/code/code_btn.png
index 148bcdb..dc28300 100644
Binary files a/static/code/code_btn.png and b/static/code/code_btn.png differ