TmOct5/dou_fire
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

调整创建订单，实名认证，签约

Browse Source
This commit is contained in:
唐明明
2022-12-29 18:53:36 +08:00
parent 3870865322
commit 2a851d47b2
19 changed files with 862 additions and 539 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apis/interfaces/mailed.js
View File

@@ -31,8 +31,24 @@ const submitExpresses = (id, data) => {
})
}
// 获取订单邮寄列表
const getExpresses = id => {
return request({
url : 'business/' + id + '/expresses'
})
}
// 查看物流
const getLogistic = id => {
return request({
url : 'business/' + id + '/logistic'
})
}
export {
express,
orderAddress,
submitExpresses
submitExpresses,
getExpresses,
getLogistic
}

2
manifest.json
View File

@@ -2,7 +2,7 @@
"name" : "抖火",
"appid" : "__UNI__C305C03",
"description" : "",
"versionName" : "1.0.4",
"versionName" : "1.0.5",
"versionCode" : "100",
"transformPx" : false,
/* 5+App特有相关 */

35
pages.json
View File

@@ -326,9 +326,9 @@
"app-plus": {
"titleNView": {
"buttons": [{
"text": "使用历史",
"text": "使用账户信息",
"color": "#ffffff",
"fontSize": "28rpx",
"fontSize": "30rpx",
"width": "180rpx"
}]
}
@@ -346,9 +346,9 @@
"app-plus": {
"titleNView": {
"buttons": [{
"text": "使用历史",
"text": "使用账户信息",
"color": "#ffffff",
"fontSize": "28rpx",
"fontSize": "30rpx",
"width": "180rpx"
}]
}
@@ -403,14 +403,6 @@
"navigationBarBackgroundColor": "#446EFE",
"navigationBarTextStyle": "white"
}
}, {
"path": "pages/work/mailedInfo",
"auth": true,
"name": "MailedOrderInfo",
"style": {
"navigationBarTitleText": "邮寄信息",
"enablePullDownRefresh": false
}
}, {
"path": "pages/work/schemes",
"auth": true,
@@ -467,8 +459,25 @@
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff"
}
}, {
"path": "pages/work/express",
"auth": true,
"name": "WorkExpress",
"style": {
"navigationBarTitleText": "邮寄状态",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff"
}
],
}, {
"path": "pages/work/expressInfo",
"auth": true,
"name": "WorkExpressInfo",
"style": {
"navigationBarTitleText": "快递详情",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#ffffff"
}
}],
"globalStyle": {
"navigationBarTextStyle": "black",
"navigationBarTitleText": "抖火",

6
pages/account/bonus.vue
View File

@@ -22,10 +22,10 @@
<block v-if="list.length > 0">
<view class="log-flex" v-for="(item, index) in list" :key="index">
<view class="text">
<view class="type nowrap">xxx奖金收益</view>
<view class="time nowrap">2022-12-12 10:18</view>
<view class="type nowrap">{{item.remark || '-'}}</view>
<view class="time nowrap">{{item.created_at}}</view>
</view>
<view class="price nowrap">+50000</view>
<view class="price nowrap">{{item.amount}}</view>
</view>
</block>
<block v-else>

2
pages/account/cash.vue
View File

@@ -9,7 +9,7 @@
<!-- 账户余额 -->
<view class="total" :style="'background-image: url(' + require('@/static/imgs/cash_back.png') + ');'">
<view class="total-value nowrap">{{total}}</view>
<view class="total-text">个人总业绩</view>
<view class="total-text">{{type == 'self' ? '个人总业绩': '团队总业绩'}}</view>
</view>
<!-- 账户记录 -->
<view class="logs">

3
pages/auth/registered.vue
View File

@@ -46,7 +46,7 @@
export default {
data() {
return {
username : '18245180131',
username : '',
password : '',
confirmation: '',
code : '',
@@ -115,6 +115,7 @@
})
let smsTime = 60;
verifyCaptcha({
type : 'register',
mobileNo : this.username,
captcha : this.captcha,
captcha_key : this.captchaKey

1
pages/pay/pay.vue
View File

@@ -101,7 +101,6 @@
title: '支付中...',
mask : true
})
console.log(this.orderId)
coinPay(this.orderId).then(res => {
wx.showModal({
title : '提示',

42
pages/user/certification.vue
View File

@@ -99,8 +99,14 @@
mask : true
})
identityOcr().then(res => {
this.frontCard.showpath = res.front_card
this.backCard.showpath = res.back_card
this.frontCard = {
showpath: res.front_card,
path : res.front_card_path
}
this.backCard = {
showpath: res.back_card,
path : res.back_card_path
}
this.realData = res;
uni.hideLoading()
}).catch(err => {
@@ -123,18 +129,20 @@
redirect_url: 'http://web.douhuofalv.com/app/e-sign?sign_type=personal',
app_scheme: 'doufire://'
}).then(res => {
console.log(res)
let certificationData = res;
wx.showModal({
title : '提示',
content : '您的身份信息已上传，请完成人脸识别以确认您是本人',
showCancel : false,
success : () => {
this.isPathChange = false
this.realData = certificationData.certification
this.signUrl = certificationData.sign.authShortUrl
wx.showModal({
title : '提示',
content : '您的身份信息已上传，请尽快完成人脸识别以确认您是本人',
cancelText : '稍后认证',
confirmText : '立即认证',
success : ModalRes => {
if(ModalRes.confirm){
this.getSignUrl()
}
}
})
}).catch(err => {
uni.showToast({
@@ -148,7 +156,13 @@
getSignUrl(){
if(this.signUrl != ''){
this.isRefresh = true
plus.runtime.openURL(this.signUrl)
this.$Router.push({
name: 'ESign',
params: {
url: this.signUrl
}
})
// plus.runtime.openURL(this.signUrl)
return
}
uni.showLoading({
@@ -160,7 +174,13 @@
app_scheme: 'doufire://'
}).then(res => {
this.isRefresh = true
plus.runtime.openURL(res.authShortUrl)
this.$Router.push({
name: 'ESign',
params: {
url: res.authShortUrl
}
})
// plus.runtime.openURL(res.authShortUrl)
uni.hideLoading()
}).catch(err => {
uni.showToast({
@@ -191,7 +211,7 @@
})
}
})
}
},
}
}
</script>

13
pages/user/eSign.vue
View File

@@ -1,6 +1,6 @@
<template>
<view>
<web-view :src="webUrl"></web-view>
<web-view :src="webUrl" @message="onMessage"></web-view>
</view>
</template>
@@ -13,6 +13,17 @@
},
created() {
this.webUrl = this.$Route.query.url
},
methods: {
onMessage(e){
let { data } = e.detail
data.map(val => {
if(val.type === 'back'){
uni.navigateBack()
return
}
})
}
}
}
</script>

87
pages/work/express.vue Normal file
View File

@@ -0,0 +1,87 @@
<template>
<view class="content">
<view class="express-item" v-for="(item, index) in express" :key="index" @click="onNav('WorkExpressInfo', {id: item.business_order_express_id})">
<view class="express-text">
<view class="express-flex">
<label>邮寄物品</label>
<view class="express-value">{{item.type}}</view>
</view>
<view class="express-flex">
<label>快递公司</label>
<view class="express-value">{{item.express}}</view>
</view>
<view class="express-flex">
<label>快递单号</label>
<view class="express-value">{{item.number}}</view>
</view>
<view class="express-flex">
<label>快递状态</label>
<view class="express-value">{{item.status}}</view>
</view>
</view>
<uni-icons type="right" color="gray"></uni-icons>
</view>
</view>
</template>
<script>
import { getExpresses } from '@/apis/interfaces/mailed.js'
export default {
data() {
return {
express: []
};
},
created() {
getExpresses(this.$Route.query.orderId).then(res => {
this.express = res;
}).catch(err => {
uni.showToast({
title: err.message,
icon : 'none'
})
})
},
methods: {
onNav(name, params){
this.$Router.push({
name,
params
})
}
}
}
</script>
<style lang="scss">
.content{
padding-top: 1rpx;
box-sizing: border-box;
}
.express-item{
display: flex;
background: white;
padding: 20rpx 30rpx;
margin-top: 30rpx;
display: flex;
justify-content: space-between;
align-items: center;
.express-text{
width: calc(100% - 50rpx);
}
.express-flex{
line-height: 50rpx;
display: flex;
justify-content: space-between;
align-items: center;
font-size: 30rpx;
label{
color: gray;
width: 150rpx;
}
.express-value{
width: calc(100% - 150rpx);
}
}
}
</style>

120
pages/work/expressInfo.vue Normal file
View File

@@ -0,0 +1,120 @@
<template>
<view class="content" v-if="express.express_number">
<view class="express">
<image class="express-logo" :src="express.cover"></image>
<view class="express-text">
<view class="title">物流公司：{{express.express_name}}</view>
<view class="no">订单号码：{{express.express_number}}</view>
</view>
</view>
<view class="block-title">物流信息</view>
<view class="logistic">
<view class="logistic-item" v-for="(item, index) in logistics" :key="index">
<view class="context"><text>[{{item.status}}]</text>{{item.context}}</view>
<view class="time">{{item.time}}</view>
</view>
</view>
</view>
</template>
<script>
import { getLogistic } from '@/apis/interfaces/mailed.js'
export default {
data() {
return {
express : {},
logistics : []
};
},
created() {
getLogistic(this.$Route.query.id).then(res => {
let { orderExpress, logistics } = res;
this.express = orderExpress
this.logistics = logistics
}).catch(err => {
uni.showToast({
title: err.message,
icon : 'none'
})
})
}
}
</script>
<style lang="scss">
// 物流公司
.express{
padding: 30rpx;
display: flex;
justify-content: space-between;
align-items: center;
background: white;
.express-logo{
width: 88rpx;
height: 88rpx;
}
.express-text{
width: calc( 100% - 118rpx);
font-size: 30rpx;
line-height: 44rpx;
.title{
font-weight: bold;
}
.no{
color: gray;
}
}
}
// title
.block-title{
padding: 20rpx 30rpx;
font-size: 28rpx;
color: gray;
line-height: 50rpx;
}
// 订单记录
.logistic{
position: relative;
background: white;
padding: 15rpx 0;
&::after{
position: absolute;
left: 30rpx;
top: 0;
bottom: 0;
width: 1rpx;
content: " ";
background: #ddd;
}
.logistic-item{
padding: 15rpx 30rpx 15rpx 70rpx;
font-size: 30rpx;
position: relative;
&::after{
position: absolute;
left: 19rpx;
top: 50%;
margin-top: -12rpx;
content: " ";
height: 20rpx;
width: 20rpx;
border-radius: 50%;
background: #ddd;
border: solid 4rpx white;
}
.status{
color: gray;
}
.context{
padding: 10rpx 0;
line-height: 40rpx;
text{
color: $main-color;
}
}
.time{
color: gray;
}
}
}
</style>

42
pages/work/generate.vue
View File

@@ -35,7 +35,7 @@
:key="formIndex"
v-if="item.subVal[formItem.pre_key] == formItem.pre_value"
>
<block v-if="formItem.type == 'price' || formItem.type == 'number'">
<block v-if="formItem.type == 'price' || formItem.type == 'number' || formItem.type == 'day'">
<label class="block-item-label"><text v-if="formItem.is_required == 1">*</text>{{formItem.title}}</label>
<view class="inputs-flex">
<input
@@ -45,7 +45,7 @@
:placeholder="'请输入' + formItem.title"
>
<text class="unit" v-if="formItem.type == 'price'">元</text>
<text class="unit" v-if="formItem.type == 'number'">天</text>
<text class="unit" v-if="formItem.type == 'number' || formItem.type == 'day'">天</text>
</view>
</block>
<block v-if="formItem.type == 'radio'">
@@ -66,6 +66,15 @@
</label>
</checkbox-group>
</block>
<block v-if="formItem.type == 'select'">
<label class="block-item-label"><text v-if="formItem.is_required == 1">*</text>{{formItem.title}}</label>
<picker :range="formItem.options" :value="item.subVal[formItem.key]" @change="item.subVal[formItem.key] = $event.detail.value">
<view class="institution-picker">
<view class="institution-picker-text nowrap" :class="{'institution-picker-gray': item.subVal[formItem.key] == 0}">{{formItem.options[item.subVal[formItem.key]]}}</view>
<u-icon size="12" color="#999" name="arrow-down-fill"></u-icon>
</view>
</picker>
</block>
<block v-if="formItem.type == 'textarea'">
<label class="block-item-label"><text v-if="formItem.is_required == 1">*</text>{{formItem.title}}</label>
<textarea
@@ -156,7 +165,13 @@
}
})
froms.map(val => {
fromsVal[val.key] = val.type === 'checkbox' ? [] : ''
if(val.type === 'checkbox'){
fromsVal[val.key] = []
}else if(val.type === 'select'){
fromsVal[val.key] = 0
}else {
fromsVal[val.key] = ''
}
})
// 新增卡片
this.serviceArr.push({
@@ -197,7 +212,13 @@
})
// 提交字段
params.map(val => {
paramsVal[val.key] = val.type === 'checkbox' ? [] : ''
if(val.type === 'checkbox'){
paramsVal[val.key] = []
}else if(val.type === 'select'){
paramsVal[val.key] = 0
}else {
paramsVal[val.key] = ''
}
})
// 更新数据
newObj.allInstitution = institutionVal;
@@ -222,11 +243,15 @@
let newObj = old
let params = allInstitution[value].params
let paramsVal = {}
params.map(val => {
paramsVal[val.key] = val.type === 'checkbox' ? [] : ''
if(val.type === 'checkbox'){
paramsVal[val.key] = []
}else if(val.type === 'select'){
paramsVal[val.key] = 0
}else {
paramsVal[val.key] = ''
}
})
newObj.fromIndex = value;
newObj.froms = params;
newObj.subVal = {
@@ -352,6 +377,9 @@
&-text{
width: calc( 100% - 60rpx );
}
&-gray{
color: gray;
}
}
// input
.inputs-flex{

24
pages/work/index.vue
View File

@@ -63,32 +63,32 @@
<view class="total-item">
<image class="icon" src="@/static/icons/work_icon_00.png"></image>
<view class="title">预约咨询单</view>
<view class="number">-<text>单</text></view>
<view class="number">{{orderCount.init_payed}}<text>单</text></view>
</view>
<view class="total-item">
<image class="icon" src="@/static/icons/work_icon_01.png"></image>
<view class="title">已缴费</view>
<view class="number">-<text>单</text></view>
<view class="number">{{orderCount.service_payed}}<text>单</text></view>
</view>
<view class="total-item">
<image class="icon" src="@/static/icons/work_icon_02.png"></image>
<view class="title">办理完成</view>
<view class="number">-<text>单</text></view>
<view class="number">{{orderCount.b_complete}}<text>单</text></view>
</view>
<view class="total-item">
<image class="icon" src="@/static/icons/work_icon_03.png"></image>
<view class="title">退款中</view>
<view class="number">-<text>单</text></view>
<view class="title">已退款</view>
<view class="number">{{orderCount.refund}}<text>单</text></view>
</view>
<view class="total-item">
<image class="icon" src="@/static/icons/work_icon_04.png"></image>
<view class="title">完成结案</view>
<view class="number">-<text>元</text></view>
<view class="title">完成结算</view>
<view class="number">{{orderCount.settlement_count}}<text>单</text></view>
</view>
<view class="total-item">
<image class="icon" src="@/static/icons/work_icon_05.png"></image>
<view class="title">结案金额</view>
<view class="number">-<text>元</text></view>
<view class="title">结算金额</view>
<view class="number">{{orderCount.settlement_price}}<text>元</text></view>
</view>
</view>
</view>
@@ -241,7 +241,6 @@
Promise.all([rights(), index()]).then(res => {
let rightsData = res[0],
indexData = res[1]
let { nickname, avatar, business_orders_count, isCertification, certification, isManager, isAnswer, identity } = indexData
this.rightsArr = rightsData
this.userInfo = {
@@ -254,6 +253,7 @@
this.isAnswer = isAnswer
this.orderCount = business_orders_count
this.identity = identity
uni.hideLoading()
}).catch(err => {
uni.showToast({
title: err.message,
@@ -446,14 +446,16 @@
.title{
font-size: 28rpx;
color: #111;
line-height: 40rpx;
@extend .nowrap;
}
.number{
padding-top: 5rpx;
font-weight: bold;
font-size: 40rpx;
font-size: 34rpx;
color: #111;
font-family: Arial, Helvetica, sans-serif;
line-height: 40rpx;
@extend .nowrap;
text{
font-size: 80%;

8
pages/work/mailed.vue
View File

@@ -38,7 +38,7 @@
<view class="from-flex">
<label>物流公司</label>
<view class="from-inputs">
<picker :range="expressArr" range-key="name" @change="onPicker">
<picker :range="expressArr" range-key="name" :value="expressIndex" @change="onPicker">
<view class="from-inputs-input" :class="{ 'hide': expressIndex == null }">{{expressIndex == null ? '请选择': expressArr[expressIndex].name}}</view>
</picker>
<uni-icons type="right" color="#999999" size="36rpx"></uni-icons>
@@ -92,6 +92,7 @@
this.expressArr = expressData
this.deliverCount = deliverOption
this.address = addressData.address
uni.hideLoading()
}).catch(err => {
uni.showToast({
title: err.message,
@@ -124,7 +125,7 @@
})
return
}
if(this.expressIndex != ''){
if(this.expressIndex == null){
uni.showToast({
title: '请选择物流公司',
icon : 'none'
@@ -145,9 +146,7 @@
content : '材料已邮寄',
showCancel : false,
success : () => {
if(this.deliverCount.length <= 1){
this.$store.commit('setOrderId', this.$Route.query.orderId)
}
this.$Router.back()
}
})
@@ -160,6 +159,7 @@
},
// 选择物流公司
onPicker(e){
console.log(e)
this.expressIndex = e.detail.value
},
// 扫码

19
pages/work/mailedInfo.vue
View File

@@ -1,19 +0,0 @@
<template>
<view class="content">
邮寄信息详情
</view>
</template>
<script>
export default {
data() {
return {
};
}
}
</script>
<style lang="scss">
</style>

24
pages/work/orderInfo.vue
View File

@@ -3,7 +3,7 @@
<view class="order-header"></view>
<!-- 订单主要信息 -->
<view class="order-back order-flex order-info">
<view class="order-state">{{statusText}}</view>
<view class="order-state">{{statusText.text}}</view>
<view class="order-item">
<label>服务类型</label>
<view class="order-value nowrap">
@@ -59,6 +59,18 @@
</view>
<view class="order-btn" @click="onCallPhone(user.username)">联系客户</view>
</view>
<!-- 老师与助理 -->
<view class="order-back order-flex" v-if="statusText.value > 5">
<view class="order-title">法务老师与助理</view>
<view class="order-item">
<label>法务老师</label>
<view class="order-value nowrap">{{teachers || '-'}}</view>
</view>
<view class="order-item">
<label>法务助理</label>
<view class="order-value nowrap">{{tutor || '-'}}</view>
</view>
</view>
<!-- 订单其他信息 -->
<view class="order-back order-flex">
<view class="order-title">订单信息</view>
@@ -96,7 +108,9 @@
item_type : [],
items : [],
services : [],
serviceTotal: ''
serviceTotal: '',
tutor : '',
teachers : ''
};
},
onShow() {
@@ -107,8 +121,8 @@
// 订单详情
getInfo(){
info(this.orderId).then(res => {
let { status, created_at, total, order_no, user, item_type, items, services, service_prices } = res
this.statusText = status.text
let { status, created_at, total, order_no, user, item_type, items, services, service_prices, tutor, teachers } = res
this.statusText = status
this.created_at = created_at
this.total = total
this.order_no = order_no
@@ -117,6 +131,8 @@
this.items = items
this.services = services
this.serviceTotal = service_prices
this.tutor = tutor
this.teachers = teachers
}).catch(err => {
uni.showToast({
title: err.message,

24
pages/work/orders.vue
View File

@@ -47,6 +47,18 @@
<label>咨询服务费</label>
<view class="nowrap">￥{{item.total}}</view>
</view>
<view class="orders-content-item" v-if="item.diff_prices_pays > 0">
<label>补差价金额</label>
<view class="nowrap">￥{{item.diff_prices_pays}}</view>
</view>
<view class="orders-content-item" v-if="item.deliver_count.can && item.deliver_count.num < item.deliver_count.all" @click="$Router.push({name: 'MailedOrder', params: {orderId: item.business_order_id}})">
<label>邮寄资料</label>
<view class="nowrap orders-content-btn">({{item.deliver_count.num}}/{{item.deliver_count.all}})去邮寄<uni-icons type="right" size="32rpx" color="#446EFE"></uni-icons></view>
</view>
<view class="orders-content-item" v-if="item.deliver_count.num > 0" @click="$Router.push({name: 'WorkExpress', params: {orderId: item.business_order_id}})">
<label>邮寄状态</label>
<view class="nowrap orders-content-btn">查看<uni-icons type="right" size="32rpx" color="#446EFE"></uni-icons></view>
</view>
<view class="orders-content-item">
<label>下单时间</label>
<view class="nowrap">{{item.created_at}}</view>
@@ -58,7 +70,6 @@
<view class="user-name">{{item.user.nickname}}</view>
</view>
<view class="btns">
<view class="btns-item btns-border" v-if="item.deliver_count.can && item.deliver_count.num < item.deliver_count.all" @click="$Router.push({name: 'MailedOrder', params: {orderId: item.business_order_id}})">（{{item.deliver_count.num}}/{{item.deliver_count.all}})邮寄材料</view>
<view class="btns-item btns-border" v-if="item.can.transfer" @click="onTransfers(index, item)">转让</view>
<view class="btns-item btns-border" v-if="item.status.value == 2" @click="onOrdersService(item.business_order_id)">匹配</view>
<view class="btns-item btns-border" v-if="item.status.value == 4 && item.is_my" @click="onSign(item.business_order_id)">签约</view>
@@ -246,7 +257,13 @@
}).then(res => {
this.$store.commit('setOrderId', id)
this.getSignState = true
plus.runtime.openURL(res.sign_url)
this.$Router.push({
name: 'ESign',
params: {
url: res.sign_url
}
})
// plus.runtime.openURL(res.sign_url)
uni.hideLoading()
}).catch(err => {
uni.showToast({
@@ -324,6 +341,9 @@
label{
color: #999999;
}
.orders-content-btn{
color: $main-color;
}
&.orders-content-bottom{
padding-right: 40rpx;
position: relative;

5
pages/work/perfectInstitutions.vue
View File

@@ -24,7 +24,7 @@
<input class="from-input" v-model="item.value" :type="item.type" :placeholder="item.placeholder || '请输入'">
</block>
<!-- mobile -->
<block v-if="item.type == 'price' || item.type == 'number' || item.type == 'mobile'">
<block v-if="item.type == 'price' || item.type == 'number' || item.type == 'mobile' || item.type == 'day'">
<label>
<text v-if="item.is_required === 1">*</text>{{item.title}}
<uni-icons v-if="item.reason.description" class="from-icon" type="info" size="18" color="red" @click="modifyToast(item.reason.description)"></uni-icons>
@@ -218,6 +218,7 @@
})
return
}
uni.hideLoading()
// 提交数据提示
uni.showModal({
title : '提示',
@@ -240,6 +241,7 @@
updBaseBase(this.submitId, {
data: dataArr
}).then(res => {
uni.hideLoading()
uni.showModal({
title : '提示',
content : '机构资料已保存',
@@ -249,7 +251,6 @@
this.$Router.back()
}
})
uni.hideLoading()
}).catch(err => {
uni.showToast({
title: err.message,

12
pages/work/schemes.vue
View File

@@ -83,6 +83,18 @@
let { scheme, user } = res;
this.scheme = scheme
this.user = user
if(scheme == ''){
uni.showModal({
title : '提示',
content : '暂未生成预约方案，请稍后再试',
showCancel : false,
success : ModalRes => {
if(ModalRes.confirm){
this.$Router.back()
}
}
})
}
}).catch(err => {
uni.showToast({
title: err.message,