diff --git a/App.vue b/App.vue index f562823..373d752 100644 --- a/App.vue +++ b/App.vue @@ -6,7 +6,8 @@ // 获取系统版本号 getVersions({ platform: plus.os.name, - version : plus.runtime.version + version : plus.runtime.version, + channel : 'app' }).then(res => { if (res.update) { uni.showModal({ diff --git a/apis/index.js b/apis/index.js index 33e6bb6..bc86f66 100644 --- a/apis/index.js +++ b/apis/index.js @@ -67,7 +67,6 @@ const request = (parameter, hideLoding = true) => { errToast(res.statusCode) }, fail(err) { - console.log(err) uni.showToast({ title: '网络错误，请检查您设备网络状态', icon : 'none' diff --git a/apis/interfaces/account.js b/apis/interfaces/account.js index 6be342b..b7cb453 100644 --- a/apis/interfaces/account.js +++ b/apis/interfaces/account.js @@ -50,9 +50,6 @@ const withdrawsCreate = () => { // 奖金提现申请 const withdraws = data => { - - console.log(data) - return request({ url: 'withdraws/index', method: 'POST', diff --git a/components/entrustOrder.vue b/components/entrustOrder.vue index b7b26ac..3c87e74 100644 --- a/components/entrustOrder.vue +++ b/components/entrustOrder.vue @@ -38,6 +38,8 @@ 审核中 被驳回 + + @@ -129,6 +131,10 @@ // 取消订单 onCancel(id){ this.$emit('cancel', id) + }, + // 线上支付被驳回 + onPayTurn(id){ + this.$emit('payTurn', id) } } } diff --git a/components/synthesisOrder.vue b/components/synthesisOrder.vue index 4ef2090..daac3cc 100644 --- a/components/synthesisOrder.vue +++ b/components/synthesisOrder.vue @@ -6,8 +6,8 @@ {{user.nickname}}{{user.username}} - - + + --> {{ lawyer.name || '-' }} 待匹配律师 @@ -71,6 +71,12 @@ isSelf: { type : Boolean, default : false + }, + can : { + type : Object, + default : () => { + return { } + } } }, methods: { @@ -78,8 +84,6 @@ this.$emit('info', id) }, onPhone(mobile){ - console.log(mobile) - this.$emit('callPhone', mobile) }, onSing(id){ diff --git a/pages/account/cash.vue b/pages/account/cash.vue index 93cb315..4f66e66 100644 --- a/pages/account/cash.vue +++ b/pages/account/cash.vue @@ -148,9 +148,6 @@ this.page = lists.page this.pagesShow = false }).catch(err => { - - console.log(err) - uni.showToast({ title: err.message, icon : 'none' diff --git a/pages/account/yunying.vue b/pages/account/yunying.vue index 67ad001..eaf5aee 100644 --- a/pages/account/yunying.vue +++ b/pages/account/yunying.vue @@ -278,7 +278,6 @@ // 获取提现记录 getTeams() { getTeamLogs({identity_id:this.id}).then(res => { - console.log(res) this.list = res this.pagesShow = false uni.hideLoading() diff --git a/pages/index/index.vue b/pages/index/index.vue index 2aff17f..78911eb 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -37,11 +37,10 @@ - + - 金法产品 - + 协商调解类 @@ -61,56 +60,79 @@ :id='"_tabs"+item.service_id' @click="sevicesClick(item.service_id)" > - + {{item.title}} ￥{{item.price}}定金 - + - 综法产品 + 法律咨询类 - - - - - - 个人全年法律 - 咨询服务 抖火法律 - - ￥365.00/年 + + + + 个人全年法律 + ￥365 /年 + + + + 企业全年法律 + ￥3650 /年 + + + + 企业全年法律 + ￥8888 /年 + + + + 企业全年法律 + ￥20000 /年 + + + + 企业全年法律 + ￥50000 /年 + + + + + + + 诉讼委托类 + + + + + + 案件委托 + ￥200 - - - - - 案件委托 - 咨询服务 抖火法律 - - ￥200元起 - - - - - - - 企业全年法律 - 咨询服务 抖火法律 - - ￥3650.00起/年 - - - - - - - 拓展服务 - 咨询服务 抖火法律 - - ￥500元起 + + + + 拓展服务 + ￥500 @@ -217,7 +239,7 @@ duration:2000 }) }) - },// 获取综法列表 + }, // 首页轮播图及公告 getIndex(){ index().then(res=>{ @@ -270,10 +292,6 @@ this.getJf() } }, - // 选择城市节点 - onCityPicker(e){ - this.getRegion(e.value); - }, // 点击轮播图 swiperClick(e){ // console.log(this.bannerArr[e]) @@ -282,14 +300,6 @@ onView(name){ this.$Router.push({ name }) }, - // 获取城市数据 - getRegion(id){ - region({ - parent_id: id - }).then(res => { - console.log(res) - }) - }, // 关闭弹窗广告 onRemoveAd(){ this.first = 0; @@ -348,7 +358,7 @@ width: 100%; } } - // 轮播 + // 公告 .notice{ background: white; padding: $padding; @@ -393,51 +403,40 @@ width: 100%; } } - // 综法 - .zong-list{ - padding: 0 $padding 20rpx; - margin-bottom: 30rpx; + // 诉讼委托类 + .lawsuit{ + padding: 0 20rpx $padding; + display: flex; + justify-content: space-between; &-item{ - position: relative; - margin-bottom: 30rpx; - padding-left: 210rpx; - height: 180rpx; - .cover{ - position: absolute; - left: 0; - top: 0; - width: 180rpx; - height: 180rpx; - } - .colum-flex{ - display: flex; - flex-direction: column; - justify-content: space-between; - height: 180rpx; - .title{ - font-size: 34rpx; - color: #111111; - line-height: 40rpx; - margin-bottom: 10rpx; - @extend .nowrap; - } - .subtitle{ - font-size: 28rpx; - color: gray; - line-height: 40rpx; - @extend .nowrap; - } - .price{ - font-weight: bold; - color: #d51959; - font-size: 36rpx; - line-height: 40rpx; - text{ - font-size: 80%; - } - @extend .nowrap; - } - } + background: #F6F6F6; + border-radius: 10rpx; + display: flex; + justify-content: space-between; + align-items: center; + overflow: hidden; + width: calc(50% - 20rpx); + margin: 0 10rpx; + } + &-cover{ + width: 138rpx; + height: 138rpx; + background-size: cover; + background-position: center; + } + &-text{ + width: calc(100% - 138rpx); + padding: 0 20rpx; + box-sizing: border-box; + } + &-title{ + font-size: 30rpx; + margin-bottom: 20rpx; + } + &-price{ + font-size: 32rpx; + color: #d51959; + font-weight: bold; } } // 经法 @@ -479,18 +478,23 @@ padding: $padding 20rpx; box-sizing: border-box; white-space: nowrap; - &-item{ - width: calc(33.33% - 20rpx); + width: calc(33% - 20rpx); margin: 0 10rpx; display: inline-block; + &:last-child{ + margin-right: 20rpx; + } .cover{ width: 100%; - height: 200rpx; + padding-top: 100%; + background-position: center; + background-size: cover; + background-position: center; border-radius: 10rpx; } .title{ - font-size: 28rpx; + font-size: 30rpx; color: #111111; padding: 10rpx 0; line-height: 40rpx; @@ -499,7 +503,7 @@ line-height: 40rpx; font-weight: bold; color: #d51959; - font-size: 38rpx; + font-size: 32rpx; text{ font-size: 80%; } diff --git a/pages/synthesize/entrustCivil.vue b/pages/synthesize/entrustCivil.vue index 75e2dba..3efbfc0 100644 --- a/pages/synthesize/entrustCivil.vue +++ b/pages/synthesize/entrustCivil.vue @@ -324,7 +324,20 @@ expressSheet(id, type, can) { this.orderId = id this.orderType = type - + // 支付金额是0 + if(can.pay_status == 4){ + uni.showModal({ + title : '提示', + content : '下单成功', + showCancel : false, + success : modalRes => { + if(modalRes.confirm){ + uni.navigateBack() + } + } + }) + return + } // 仅支持线下打款 if(!can.online){ this.onToBankPay() @@ -493,7 +506,7 @@ margin-right: $margin; font-size: 30rpx; text { - color: $main-color; + color: red; padding-right: 10rpx; } } diff --git a/pages/synthesize/entrustInfo.vue b/pages/synthesize/entrustInfo.vue index a7a52cf..082aea8 100644 --- a/pages/synthesize/entrustInfo.vue +++ b/pages/synthesize/entrustInfo.vue @@ -59,6 +59,10 @@ {{user.parent.username}} + + + {{centerUser}} + {{no}} @@ -77,13 +81,14 @@ export default { data() { return { - entrust : {}, - params : [], - createdAt: '', - payType : '', - user : {}, - lawyer : null, - price : '0.00' + entrust : {}, + params : [], + createdAt : '', + payType : '', + user : {}, + lawyer : null, + price : '0.00', + centerUser: '' }; }, created() { @@ -92,7 +97,7 @@ mask : true }) entrustInfo(this.$Route.query.id).then(res => { - let { entrust, params, created_at, user, order_no, total, lawyer, pay_driver_text } = res; + let { entrust, params, created_at, user, order_no, total, lawyer, pay_driver_text, center_user } = res; this.entrust = entrust this.params = params this.createdAt = created_at @@ -100,7 +105,8 @@ this.no = order_no this.price = total this.lawyer = lawyer - this.payType = pay_driver_text || '-' + this.payType = pay_driver_text || '-', + this.centerUser= center_user }).catch(err => { uni.showToast({ title: err.message, diff --git a/pages/synthesize/entrustWrite.vue b/pages/synthesize/entrustWrite.vue index 4619c26..33dad2b 100644 --- a/pages/synthesize/entrustWrite.vue +++ b/pages/synthesize/entrustWrite.vue @@ -256,7 +256,20 @@ expressSheet(id, type, can) { this.orderId = id this.orderType = type - + // 支付金额是0 + if(can.pay_status == 4){ + uni.showModal({ + title : '提示', + content : '下单成功', + showCancel : false, + success : modalRes => { + if(modalRes.confirm){ + uni.navigateBack() + } + } + }) + return + } // 仅支持线下打款 if(!can.online){ this.onToBankPay() @@ -418,7 +431,7 @@ margin-right: $margin; font-size: 30rpx; text { - color: $main-color; + color: red; padding-right: 10rpx; } } diff --git a/pages/synthesize/expandInfo.vue b/pages/synthesize/expandInfo.vue index a0f8b61..e38f5c3 100644 --- a/pages/synthesize/expandInfo.vue +++ b/pages/synthesize/expandInfo.vue @@ -58,6 +58,10 @@ {{user.parent.username}} + + + {{centerUser}} + {{no}} @@ -76,13 +80,14 @@ export default { data() { return { - expand : {}, - params : [], - createdAt: '', - user : {}, - payType : '', - lawyer : null, - price : '0.00' + expand : {}, + params : [], + createdAt : '', + user : {}, + payType : '', + lawyer : null, + price : '0.00', + centerUser: '' }; }, created() { @@ -91,7 +96,7 @@ mask : true }) expandInfo(this.$Route.query.id).then(res => { - let { expand, params, created_at, user, order_no, total, lawyer, pay_driver_text } = res; + let { expand, params, created_at, user, order_no, total, lawyer, pay_driver_text, center_user } = res; this.lawyer = lawyer this.expand = expand this.params = params @@ -100,6 +105,7 @@ this.no = order_no this.price = total this.payType = pay_driver_text || '' + this.centerUser= center_user }).catch(err => { uni.showToast({ title: err.message, diff --git a/pages/synthesize/expandWrite.vue b/pages/synthesize/expandWrite.vue index dcdbef1..51acc1f 100644 --- a/pages/synthesize/expandWrite.vue +++ b/pages/synthesize/expandWrite.vue @@ -394,7 +394,7 @@ margin-right: $margin; font-size: 30rpx; text { - color: $main-color; + color: red; padding-right: 10rpx; } } diff --git a/pages/synthesize/order.vue b/pages/synthesize/order.vue index 6bc167f..91ab76d 100644 --- a/pages/synthesize/order.vue +++ b/pages/synthesize/order.vue @@ -69,6 +69,7 @@ @diff="onDiff" @callPhone="onCallPhone" @cancel="onCancel" + @payTurn="onPayTurn" /> val.order_no === no) + uni.showModal({ + title : '提示', + content : '支付驳回原因：' + orderObj.remark, + showCancel : false + }) + }, // 取消订单 onCancel(no){ let orderArr = this.orderArr @@ -284,7 +295,6 @@ icon : 'none' }) }) - // console.log(is_) uni.hideLoading() }).catch(err => { uni.showToast({ @@ -300,7 +310,6 @@ let orderObj = orderArr.find(val => val.order_no === no) let { can, price, order_id, order_type } = orderObj - console.log(orderObj) switch(can.pay_status){ case 1: this.expressSheet(order_id, order_type, can, price) diff --git a/pages/synthesize/servicesInfo.vue b/pages/synthesize/servicesInfo.vue index ded7083..51f3f71 100644 --- a/pages/synthesize/servicesInfo.vue +++ b/pages/synthesize/servicesInfo.vue @@ -58,6 +58,10 @@ {{user.parent.username}} + + + {{centerUser}} + {{no}} @@ -76,13 +80,14 @@ export default { data() { return { - service : {}, - params : [], - createdAt: '', - user : {}, - lawyer : null, - price : '0.00', - payType : '', + service : {}, + params : [], + createdAt : '', + user : {}, + lawyer : null, + price : '0.00', + payType : '', + centerUser: '' }; }, created() { @@ -91,15 +96,16 @@ mask : true }) servicesInfo(this.$Route.query.id).then(res => { - let { service, params, created_at, user, order_no, total, lawyer, pay_driver_text } = res; - this.lawyer = lawyer - this.service = service - this.params = params - this.createdAt = created_at - this.user = user - this.no = order_no - this.price = total - this.payType = pay_driver_text || '' + let { service, params, created_at, user, order_no, total, lawyer, pay_driver_text, center_user } = res; + this.lawyer = lawyer + this.service = service + this.params = params + this.createdAt = created_at + this.user = user + this.no = order_no + this.price = total + this.payType = pay_driver_text || '' + this.centerUser = center_user }).catch(err => { uni.showToast({ title: err.message, diff --git a/pages/synthesize/standWrite.vue b/pages/synthesize/standWrite.vue index efc18c8..1867363 100644 --- a/pages/synthesize/standWrite.vue +++ b/pages/synthesize/standWrite.vue @@ -356,7 +356,7 @@ margin-right: $margin; font-size: 30rpx; text { - color: $main-color; + color: red; padding-right: 10rpx; } } diff --git a/pages/synthesize/synthesisInfo.vue b/pages/synthesize/synthesisInfo.vue index 660f149..eca803e 100644 --- a/pages/synthesize/synthesisInfo.vue +++ b/pages/synthesize/synthesisInfo.vue @@ -58,6 +58,10 @@ {{user.parent.username}} + + + {{centerUser}} + {{no}} @@ -76,13 +80,14 @@ export default { data() { return { - synthesis: {}, - params : [], - createdAt: '', - user : {}, - payType : '', - lawyer : null, - price : '0.00' + synthesis : {}, + params : [], + createdAt : '', + user : {}, + payType : '', + lawyer : null, + price : '0.00', + centerUser: '' }; }, created() { @@ -91,7 +96,7 @@ mask : true }) synthesisInfo(this.$Route.query.id).then(res => { - let { synthesis, params, created_at, user, order_no, price, lawyer, pay_driver_text } = res; + let { synthesis, params, created_at, user, order_no, price, lawyer, pay_driver_text, center_user } = res; this.synthesis = synthesis this.params = params this.createdAt = created_at @@ -100,6 +105,7 @@ this.price = price this.lawyer = lawyer this.payType = pay_driver_text || '-' + this.centerUser= center_user }).catch(err => { uni.showToast({ title: err.message, diff --git a/pages/user/contract.vue b/pages/user/contract.vue index 89628d1..482d763 100644 --- a/pages/user/contract.vue +++ b/pages/user/contract.vue @@ -149,8 +149,6 @@ open.openFile({ filename : plus.io.convertLocalFileSystemURL(path.tempFilePath), isShowBackIcon : true - }, res => { - console.log(res) }) } }) diff --git a/pages/user/index.vue b/pages/user/index.vue index 0631be2..f43d737 100644 --- a/pages/user/index.vue +++ b/pages/user/index.vue @@ -437,7 +437,8 @@ // 获取系统版本号 getVersions({ platform: plus.os.name, - version : plus.runtime.version + version : plus.runtime.version, + channel : 'app' }).then(res => { uni.hideLoading() if (res.update) { diff --git a/pages/user/team.vue b/pages/user/team.vue index 0f802b6..05a0444 100644 --- a/pages/user/team.vue +++ b/pages/user/team.vue @@ -75,8 +75,6 @@ page : this.page.current }).then(res => { let { users, count } = res; - - console.log(users) let atList = users.page.current == 1 ? [] : this.users this.count = count this.users = atList.concat(users.data) diff --git a/pages/work/mailed.vue b/pages/work/mailed.vue index b769fcc..f73b16c 100644 --- a/pages/work/mailed.vue +++ b/pages/work/mailed.vue @@ -159,7 +159,6 @@ }, // 选择物流公司 onPicker(e){ - console.log(e) this.expressIndex = e.detail.value }, // 扫码 diff --git a/pages/work/orders.vue b/pages/work/orders.vue index 6a96f68..63c9b60 100644 --- a/pages/work/orders.vue +++ b/pages/work/orders.vue @@ -77,7 +77,6 @@ 缴费 完善 查看资料 - 查看记录 去确认 查看 diff --git a/pages/work/perfectInstitutionsInfo.vue b/pages/work/perfectInstitutionsInfo.vue index bd27e3a..72f45f4 100644 --- a/pages/work/perfectInstitutionsInfo.vue +++ b/pages/work/perfectInstitutionsInfo.vue @@ -22,9 +22,6 @@ }) baseBase(this.$Route.query.itemId).then(res => { let { params } = res; - - console.log(params) - this.params = params uni.hideLoading() }).catch(err => { diff --git a/static/synthesize/img_04.png b/static/synthesize/img_04.png new file mode 100644 index 0000000..fed905c Binary files /dev/null and b/static/synthesize/img_04.png differ diff --git a/static/synthesize/img_05.png b/static/synthesize/img_05.png new file mode 100644 index 0000000..9f011fd Binary files /dev/null and b/static/synthesize/img_05.png differ diff --git a/static/synthesize/img_06.png b/static/synthesize/img_06.png new file mode 100644 index 0000000..7c8e42d Binary files /dev/null and b/static/synthesize/img_06.png differ