init

.hbuilderx/launch.json

@@ -13,7 +13,7 @@
             "type" : "uniCloud"
         },
         {
-            "playground" : "standard",
+            "playground" : "custom",
             "type" : "uni-app:app-android"
         }
     ]

README.md

@@ -1,3 +1,3 @@
 # dou-Fire
 
-抖火App
+抖火App  --  上架 - 版本  删除修改部分功能 使用~

apis/interfaces/empower.js

@@ -0,0 +1,47 @@
+
+/**
+ * Web唐明明
+ * 匆匆数载恍如梦，岁月迢迢华发增。
+ * 碌碌无为枉半生，一朝惊醒万事空。
+ * moduleName: 增收赋能
+ */
+
+import { request } from '../index'
+
+// 增收赋能列表
+const lists = () =>{
+	return request({
+		url		: "empower/index"
+	})
+}
+
+// 增收赋能详情
+const info = id => {
+	return request({
+		url		: "empower/" + id + "/show"
+	})
+}
+
+// 下单前置
+const buyInit = id => {
+	return request({
+		url		: "empower/" + id + "/buy/init",
+		method	: "POST"
+	})
+}
+
+// 下单购买
+const buy = data => {
+	return request({
+		url		: "empower/buy/order",
+		method	: "POST",
+		data
+	})
+}
+
+export {
+	lists,
+	info,
+	buyInit,
+	buy
+}

components/synthesisOrder.vue

@@ -12,7 +12,7 @@
 					<view class="nowrap" style="color: #FFAB3F;" v-else>待匹配律师</view>
 				</view>
 				<view class="order-content-type">
-					<label>服务金额</label>
+					<label>订单类型</label>
 					<view class="nowrap">{{ synthesis.title || '-' }}</view>
 				</view>
 				<view class="order-content-type">

manifest.json

@@ -2,8 +2,8 @@
     "name" : "抖火数字化咨询服务平台",
     "appid" : "__UNI__C305C03",
     "description" : "纵有疾风起，人生不言弃",
-    "versionName" : "1.4.8",
+    "versionName" : "1.5.2",
-    "versionCode" : 104,
+    "versionCode" : 152,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {
@@ -44,7 +44,8 @@
                     "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>"
                 ],
                 "schemes" : "doufire",
-                "minSdkVersion" : 21
+                "minSdkVersion" : 21,
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a", "x86" ]
             },
             /* ios打包配置 */
             "ios" : {

pages/empower/buy.vue

@@ -0,0 +1,227 @@
+<template>
+	<view class="content">
+		<!-- 课程信息 -->
+		<view class="info">
+			<image class="info-cover" :src="empower.cover" mode="aspectFill"></image>
+			<view class="info-text">
+				<view class="info-title">{{empower.title}}</view>
+				<view class="info-subtitle">{{empower.sub_title}}</view>
+				<view class="info-price"><text>￥</text>{{empower.price}}</view>
+			</view>
+		</view>
+		<!-- 报名信息 -->
+		<view class="user-title">报名人</view>
+		<view class="user-block" v-for="(item, index) in formData" :key="index">
+			<view class="user-block-flex">报名信息{{index + 1}}<view class="user-block-remove" v-if="formData.length > 1" @click="onRemoveUser(index)">删除</view></view>
+			<view class="user-block-input">
+				<label>真实姓名</label>
+				<input placeholder="输入姓名" v-model="item.name" maxlength="10" />
+			</view>
+			<view class="user-block-input">
+				<label>手机号码</label>
+				<input placeholder="输入手机号码" v-model="item.mobile" maxlength="11" type="number" />
+			</view>
+			<view class="user-block-input" v-if="semesters.length > 0">
+				<label>选择学期</label>
+				<picker mode="selector" :value="item.index" :range="semesters" range-key="title" @change="onChange($event, index, item)">
+					<view class="user-block-picker">{{semesters[item.index].title}}<uni-icons class="user-block-icon" type="bottom" size="20" color="#999"></uni-icons></view>
+				</picker>
+			</view>
+		</view>
+		<view class="user-add" @click="onAddUser"><uni-icons type="plus" size="24" color="#446EFE"></uni-icons> 添加报名人</view>
+		<view class="footer">
+			<view class="footer-text">
+				<view class="footer-text-price"><text>￥</text>{{allPrice}}</view>
+				<view class="footer-text-subtitle">共计{{formData.length}}人报名</view>
+			</view>
+			<button class="footer-btn" @click="onSubmit">提交</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	// ($event) => item.index = $event.detail.value
+	import { buyInit, buy } from '@/apis/interfaces/empower.js'
+	export default {
+		data() {
+			return {
+				semesters: [],
+				formData : [{
+					name	: '',
+					mobile	: '',
+					index	: 0
+				}],
+				empower	 : {},
+				allPrice : '0.00'
+			};
+		},
+		onShow() {
+			buyInit(this.$Route.query.id).then(res => {
+				let { empower, semesters } = res;
+				this.empower   = empower
+				this.semesters = semesters
+				this.getTotalPrice()
+			}).catch(err => {
+				uni.showToast({
+					title: err.message,
+					icon : 'none'
+				})
+			})
+		},
+		methods: {
+			// 计算价格
+			getTotalPrice(){
+				let totalPrice = 0
+				this.formData.map(val => {
+					totalPrice += Number(this.semesters[val.index].price)
+				})
+				this.allPrice = totalPrice.toFixed(2)
+			},
+			// 选择学期
+			onChange(e, index, item){
+				item.index = e.detail.value
+				this.$set(this.formData, index, item)
+				this.getTotalPrice()
+			},
+			// 删除用户数据
+			onRemoveUser(index){
+				this.formData.splice(index,1)
+				this.getTotalPrice()
+			},
+			// 添加新用户
+			onAddUser(){
+				this.formData.push({
+					name	: '',
+					mobile	: '',
+					index	: 0
+				})
+				this.getTotalPrice()
+			},
+			// 提交报名
+			onSubmit(){
+				let submitData = this.formData.map(val => {
+					return {
+						name		: val.name,
+						mobile		: val.mobile,
+						semester_id	: this.semesters[val.index].id
+					}
+				})
+				buy({
+					empower_id: this.$Route.query.id,
+					data: submitData
+				}).then(res => {
+					let { order_type, order_id } = res;
+					this.$Router.replace({
+						name	: 'Pay',
+						params	: {
+							paytype		: 'synthesize',
+							orderId		: order_id,
+							orderType	: order_type.replace(/\\/g, '-')
+						},
+					})
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content{ background: $window-color; padding: 30rpx 30rpx 210rpx; }
+	// 报名人信息
+	.user-title{ padding-top: 30rpx; font-size: 30rpx; line-height: 40rpx; color: gray; }
+	.user-block{
+		background: white;
+		margin-top: 30rpx;
+		border-radius: 20rpx;
+		padding: 20rpx 30rpx;
+		&-flex{
+			display: flex;
+			justify-content: space-between;
+			height: 90rpx;
+			align-items: center;
+			font-size: 30rpx;
+			color: gray;
+			@extend .border-solid;
+		}
+		&-remove{ color: $main-color; line-height: 90rpx; }
+		&-input{
+			display: flex;
+			justify-content: space-between;
+			height: 90rpx;
+			align-items: center;
+			flex-wrap: wrap;
+			label{ font-size: 32rpx; width: 200rpx; }
+			picker,
+			input{ width: calc(100% - 200rpx); font-size: 32rpx; }
+			.user-block-picker{
+				padding-right: 50rpx;
+				box-sizing: border-box;
+				position: relative;
+				@extend .nowrap;
+				.user-block-icon{ position: absolute; right: 0; }
+			}
+		}
+	}
+	.user-add{ text-align: center; background: white; border-radius: 20rpx; margin-top: 30rpx; display: flex; align-items: center; height: 120rpx; justify-content: center; color: $main-color; font-size: 32rpx; }
+	// 报名课程信息
+	.info{
+		display: flex;
+		background: white;
+		padding: 30rpx;
+		border-radius: 20rpx;
+		flex-wrap: wrap;
+		justify-content: space-between;
+		&-cover{ width: 180rpx; height: 180rpx; border-radius: 10rpx; }
+		&-text{ width: calc(100% - 210rpx); }
+		&-title{ font-size: 38rpx; font-weight: bold; line-height: 50rpx; height: 50rpx; }
+		&-subtitle{ line-height: 40rpx; height: 80rpx; font-size: 30rpx; }
+		&-price{
+			font-weight: bold;
+			color: $text-price;
+			font-size: 42rpx;
+			font-family: Arial, Helvetica, sans-serif;
+			line-height: 50rpx;
+			height: 50rpx;
+			text{
+				font-size: 80%;
+				margin-right: 5rpx;
+			}
+		}
+	}
+	// 底部
+	.footer{
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		padding: 30rpx 30rpx 50rpx;
+		display: flex;
+		flex-wrap: wrap;
+		align-items: center;
+		z-index: 99;
+		box-shadow: 0 0 10rpx 10rpx rgba(0, 0, 0, .04);
+		background: white;
+		.footer-text{
+			width: 200rpx;
+			&-price{ font-weight: bold; color: $text-price; font-size: 40rpx; text{ font-size: 80%; margin-right: 5rpx; } }
+			&-subtitle{ font-size: 28rpx; color: gray; }
+		}
+		.footer-btn{
+			background: $main-color;
+			color: white;
+			line-height: 100rpx;
+			border-radius: 50rpx;
+			flex: 1;
+			text-align: center;
+			font-weight: bold;
+			font-size: 36rpx;
+			margin-left: 50rpx;
+			&::after{ display: none; }
+		}
+	}
+</style>

pages/empower/info.vue

@@ -0,0 +1,145 @@
+<template>
+	<view class="content">
+		<!-- 封面 -->
+		<view class="cover">
+			<image class="cover-src" :src="cover" mode="aspectFill"></image>
+		</view>
+		<!-- 课程信息 -->
+		<view class="info">
+			<view class="info-title">{{ title }}</view>
+			<view class="info-subtitle">{{ subtitle }}</view>
+			<view class="info-info">
+				<view class="info-info-item">
+					<label>总学期</label>
+					<view class="info-value">{{count.all || '-'}}期</view>
+				</view>
+				<view class="info-info-item">
+					<label>已结束</label>
+					<view class="info-value">{{count.over || 0}}期</view>
+				</view>
+				<view class="info-info-item" v-if="semester != null">
+					<label>当期时间</label>
+					<view class="info-value">{{semester.time.start || '-'}}</view>
+				</view>
+				<view class="info-info-item" v-if="semester != null">
+					<label>报名价格</label>
+					<view class="info-value price">{{semester.price || '0.00'}}</view>
+				</view>
+			</view>
+		</view>
+		<!-- 课程介绍 -->
+		<rich-text :nodes="content"></rich-text>
+		<!-- 报名信息 -->
+		<view class="footer">
+			<view :class="['footer-btn', count.ing <= 0 ? 'in' : '']" @click="onBuy">立即购买</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import { info } from '@/apis/interfaces/empower.js'
+	export default {
+		data() {
+			return {
+				id			: '',
+				cover		: '',
+				title		: '',
+				subtitle	: '',
+				price		: '0.00',
+				semester	: null,
+				count		: {},
+				content		: []
+			};
+		},
+		onShow() {
+			info(this.$Route.query.id).then(res => {
+				let { cover, title, subtitle, price, semester_current, count, content, id } = res;
+				this.id			= id
+				this.cover 		= cover
+				this.title 		= title
+				this.subtitle	= subtitle
+				this.price		= price
+				this.semester	= semester_current
+				this.count		= count
+				this.content	= content.replace(/\<img/gi, '<img style="width:100%;height:auto"');
+				uni.setNavigationBarTitle({
+					title: title
+				})
+			}).catch(err => {
+				uni.showToast({
+					title: err.message,
+					icon : 'none'
+				})
+			})
+		},
+		methods: {
+			onBuy(){
+				if(this.count.ing <= 0){
+					uni.showToast({
+						title: '暂无可报名学期',
+						icon : 'none'
+					})
+					return
+				}
+				this.$Router.push({
+					name	: 'EmpowerBuy',
+					params	: { id: this.id }
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.content{ padding-bottom: 180rpx; }
+	// 封面图
+	.cover{ 
+		position: relative;
+		padding-top: 70%;
+		background: #f7f8f9;
+		&-src{ position: absolute; top: 0; left: 0; width: 100%; height: 100%; }
+	}
+	// 信息
+	.info{
+		padding: 40rpx;
+		&-title{ font-weight: bold; font-size: 50rpx; margin-bottom: 20rpx; line-height: 65rpx; color: #333; text-align: justify; }
+		&-subtitle{ font-size: 30rpx; line-height: 50rpx; margin-bottom: 40rpx; color: #333; text-align: justify; }
+		&-info{
+			background: $window-color;
+			padding: 0 30rpx;
+			font-size: 30rpx;
+			border-radius: 20rpx;
+			&-item{
+				padding: 30rpx 0;
+				line-height: 40rpx;
+				display: flex;
+				justify-content: space-between;
+				@extend .border-solid;
+				label{ font-weight: bold; width: 170rpx; }
+				&:last-child::after{ display: none; }
+			}
+		}
+		&-value{
+			width: calc(100% - 170rpx);
+			text-align: right;
+			font-family: Arial, Helvetica, sans-serif;
+			&.price{ font-weight: bold; color: $text-price; }
+		}
+	}
+	// 底部
+	.footer{
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		padding: 30rpx 30rpx 50rpx;
+		display: flex;
+		flex-wrap: wrap;
+		align-items: center;
+		z-index: 99;
+		background-color: white;
+		box-shadow: 0 0 10rpx 10rpx rgba(0, 0, 0, .04);
+		.footer-btn{ background: $main-color; color: white; line-height: 100rpx; border-radius: 50rpx; flex: 1; text-align: center; font-weight: bold; font-size: 36rpx; }
+		.footer-btn.in{ opacity: .6; }
+	}
+</style>

pages/empower/order.vue

@@ -0,0 +1,431 @@
+<template>
+	<view class="content">
+		<!-- tabs -->
+		<u-sticky bgColor="#FFF" zIndex="9" >
+			<view class="screen-flex">
+				<view class="screen-picker">
+					<picker :range="statusArr" range-key="title" :value="statusIndex" @change="onPickerChange($event, 'statusIndex')">
+						<view class="screen-text nowrap">
+							{{ statusArr[statusIndex].title }}
+							<uni-icons class="screen-icon" type="bottom" size="32rpx" color="#999"></uni-icons>
+						</view>
+					</picker>
+				</view>
+				<view class="screen-picker">
+					<picker :range="empowerArr" range-key="title" :value="empowerIndex" @change="onPickerChange($event, 'empowerIndex')">
+						<view class="screen-text nowrap">
+							{{ empowerArr[empowerIndex].title }}
+							<uni-icons class="screen-icon" type="bottom" size="32rpx" color="#999"></uni-icons>
+						</view>
+					</picker>
+				</view>
+			</view>
+		</u-sticky>
+		<!-- 订单管理列表 -->
+		<view class="orders" v-if="orders.length > 0">
+			<view class="orders-item" v-for="(item, index) in orders" :key="index">
+				<view class="orders-flex">
+					<view class="no nowrap" @click="copyNo(item.order_no)">
+						<text class="orders-tag" v-if="!item.is_my">客户</text>
+						<text class="orders-tag order-tag-my" v-else>个人</text>
+						{{item.order_no}}
+					</view>
+					<view class="state">{{item.status_text}}</view>
+				</view>
+				<view class="orders-content">
+					<view class="orders-content-item">
+						<label>课程名称</label>
+						<view class="nowrap orders-content-type">{{item.empower.title}}</view>
+					</view>
+					<view class="orders-content-item orders-content-bottom" @click="item.is_show_type = !item.is_show_type">
+						<label>课程数量</label>
+						<view class="nowrap orders-content-type">
+							×{{item.items.count}}
+						</view>
+						<uni-icons class="orders-content-icon" :type="item.is_show_type ? 'top': 'bottom'" size="14" color="gray"></uni-icons>
+					</view>
+					<view class="orders-content-block" v-show="item.is_show_type">
+						<view class="item-flex" v-for="(citem, cindex) in item.items.lists" :key="cindex">
+							<view class="item-flex-title">{{citem.semester.subtitle}}({{citem.name}})</view>
+							<view class="item-flex-value">￥{{citem.price}}</view>
+						</view>
+					</view>
+					<view class="orders-content-item">
+						<label>支付金额</label>
+						<view class="nowrap">￥{{item.price}}</view>
+					</view>
+					<view class="orders-content-item">
+						<label>下单时间</label>
+						<view class="nowrap">{{item.created_at}}</view>
+					</view>
+					<view class="orders-content-item" v-if="item.paid_at != ''">
+						<label>支付时间</label>
+						<view class="nowrap">{{item.paid_at}}</view>
+					</view>
+				</view>
+				<view class="orders-flex">
+					<view class="btns">
+						<view class="btns-item btns-border" v-if="item.status == 0" @click="onCancel(item.order_id)">取消</view>
+						<view class="btns-item btns-border" v-if="item.status == 0" @click="onPay(item)">支付</view>
+						<view class="btns-item" @click="onShowUsers(item.items)">报名信息</view>
+					</view>
+				</view>
+			</view>
+			<!-- 分页 -->
+			<u-loadmore v-if="pagesShow" :status="status" />
+		</view>
+		<!-- 订单是空的 -->
+		<view class="order-null" v-else>
+			<u-empty
+				mode="order"
+				icon="http://cdn.uviewui.com/uview/empty/order.png"
+				text="暂无相关订单"
+			>
+			</u-empty>
+		</view>
+		<!-- 弹出报名人信息 -->
+		<u-popup :show="usersShow" closeable round="30rpx" @close="usersShow = false">
+			<view class="users-content">
+				<view class="users-title">报名信息</view>
+				<view class="users-lists">
+					<view class="users-lists-item" v-for="(item, index) in users" :key="index">
+						<view class="users-item nowrap"><label>报名姓名</label>{{item.name}}</view>
+						<view class="users-item nowrap"><label>报名手机</label>{{item.mobile}}</view>
+						<view class="users-item nowrap"><label>课程名称</label>{{item.semester.subtitle}}</view>
+						<view class="users-item nowrap"><label>签到状态</label><text class="bold">{{item.status_text}}</text></view>
+						<view class="users-item"><label>课程地址</label>{{item.semester.address}}</view>
+					</view>
+				</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	import { orderInit, orderList, orderCancel } from '@/apis/interfaces/empower.js'
+	export default {
+		data() {
+			return {
+				statusArr	: [{ title: '全部订单', id: '' }],
+				empowerArr	: [{ title: '全部课程', id: '' }],
+				statusIndex	: 0,
+				empowerIndex: 0,
+				// 报名信息
+				users		: [],
+				usersTotal	: 0,
+				usersShow	: false,
+				// 订单列表
+				orders		: [],
+				// 分页
+				page		: {
+					current	: 1,
+					has_more: false,
+				},
+				pagesShow	: false,
+				status   	: ''
+			};
+		},
+		created() {
+			orderInit().then(res => {
+				let { status, empower } = res;
+				this.statusArr   = status
+				this.empowerArr  = [...this.empowerArr, ...empower]
+				this.statusIndex = status.findIndex(val => val.id == this.$Route.query.status)
+				// 获取列表
+				this.getList()
+			}).catch(err => {
+				uni.showToast({
+					title: err.message,
+					icon : 'none'
+				})
+			})
+		},
+		onShow(){
+			// 是否处理当前列表状态
+			let isOrderId = this.$store.getters.getOrderId
+			if(isOrderId != null){
+				if(this.getSignState){
+					this.onGetSign(isOrderId)
+					return
+				}
+				this.getList()
+			}
+		},
+		methods: {
+			// 报名信息
+			onShowUsers(obj){
+				let { count, lists } = obj
+				this.users 		= lists
+				this.usersTotal = count
+				this.usersShow	= true
+			},
+			// 筛选类型
+			onPickerChange(e, key){
+				let { value } = e.detail
+				this[key] = value
+				this.page 			= { current: 1, has_more: false }
+				this.orders 		= []
+				this.getList()
+			},
+			// 获取列表
+			getList(){
+				uni.showLoading({
+					title: '加载中...',
+					mask : true
+				})
+				if(this.$store.getters.getOrderId != null){
+					this.page = { current: 1, has_more: false }
+					this.$store.commit('setOrderId', null)
+				}
+				orderList({
+					status	: this.statusArr[this.statusIndex].id,
+					empower	: this.empowerArr[this.empowerIndex].id,
+					page  	: this.page.current ,
+				}).then(res => {
+					let { data, page } = res;
+					data.map(val => {
+						val.is_show_type = false
+					})
+					let atList   	= page.current == 1 ? [] : this.orders
+					this.orders 	= atList.concat(data)
+					this.page  		= page
+					this.pagesShow 	= false
+					uni.hideLoading()
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon : 'none'
+					})
+				})
+			},
+			// 复制订单号码
+			copyNo(no){
+				uni.setClipboardData({
+					data	: no,
+					success	: res => {
+						uni.showToast({
+							title: '订单号已复制',
+							icon : 'none'
+						})
+					}
+				})
+			},
+			// 取消订单
+			onCancel(id){
+				uni.showModal({
+					title	: '提示',
+					content	: '取消订单后无法找回，确认取消吗？',
+					success : modalRes => {
+						if(modalRes.confirm){
+							uni.showLoading({
+								title: '加载中...',
+								mask : true
+							})
+							orderCancel(id).then(res => {
+								uni.showToast({
+									title: '订单已取消',
+									icon : 'none'
+								})
+								this.removeListVal(id)
+							}).catch(err => {
+								uni.showToast({
+									title: err.message,
+									icon : 'none'
+								})
+							})
+						}
+					}
+				})
+			},
+			// 变更当前列表状态
+			removeListVal(id){
+				let ListArr 	= this.orders
+				let ListIndex 	= ListArr.findIndex(val => val.business_order_id == id)
+				if(ListIndex >= 0){
+					this.orders.splice(ListIndex, 1)
+				}
+			},
+			// 订单支付
+			onPay(obj){
+				let { order_id, order_type } = obj
+				this.$store.commit('setOrderId', order_id)
+				this.$Router.push({
+					name	: 'Pay',
+					params	: {
+						paytype		: 'synthesize',
+						orderId		: order_id,
+						orderType	: order_type.replace(/\\/g, '-')
+					},
+				})
+			}
+		},
+		onReachBottom() {
+			this.pagesShow = true;
+			if(this.page.has_more){
+				this.status    = 'loading';
+				this.page.current++
+				this.getList()
+				return
+			}
+			this.status    = 'nomore';
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.content{ background: #f7f8f9; min-height: 100vh; }
+	// 订单弹出层
+	.users-content{
+		.users-title{
+			text-align: center;
+			font-weight: bold;
+			font-size: 44rpx;
+			color: #333;
+			height: 70rpx;
+			line-height: 70rpx;
+			padding: 30rpx;
+		}
+		.users-lists{ 
+			padding: 0 30rpx 50rpx;
+			max-height: 70vh;
+			overflow-y: scroll;
+			.users-lists-item{
+				background: #f7f8f9;
+				padding: 30rpx;
+				border-radius: 20rpx;
+				font-size: 30rpx;
+				margin-bottom: 30rpx;
+				.users-item{
+					position: relative;
+					line-height: 45rpx;
+					min-height: 45rpx;
+					padding-left: 160rpx;
+					margin: 5rpx 0;
+					text-align: right;
+					label{ position: absolute; left: 0; top: 0; color: gray; }
+					.bold{ font-weight: bold; color: $text-price; }
+				}
+			}
+		}
+	}
+	// 订单筛选
+	.screen-flex{
+		display: flex;
+		flex-wrap: wrap;
+		.screen-picker{ width: 50%; text-align: center; }
+		.screen-text{ line-height: 90rpx; height: 90rpx; display: inline-block; font-size: 30rpx; }
+		.screen-icon{ margin-left: 10rpx; }
+	}
+	// 订单为空
+	.order-null{
+		height: 80vh;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
+	// 订单列表
+	.orders{
+		padding: 30rpx 0 10rpx;
+		.orders-item{
+			margin: 0 30rpx 20rpx;
+			background-color: white;
+			border-radius: $radius;
+		}
+		.orders-content{
+			padding: 20rpx 30rpx;
+			&-item{
+				line-height: 70rpx;
+				display: flex;
+				justify-content: space-between;
+				font-size: 30rpx;
+				color: #111111;
+				label{
+					color: #999999;
+				}
+				&.orders-content-bottom{
+					padding-right: 40rpx;
+					position: relative;
+					.orders-content-icon{
+						position: absolute;
+						right: 0;
+						top: 0;
+					}
+				}
+			}
+			&-block{
+				background: rgba(68, 110, 254, .03);
+				padding: 20rpx;
+				font-size: 28rpx;
+				border-radius: 10rpx;
+				margin: 10rpx 0;
+				.item-flex{
+					display: flex;
+					justify-content: space-between;
+					line-height: 50rpx;
+				}
+			}
+		}
+		.orders-flex{
+			border-bottom: solid 1rpx #F6F6F6;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			padding: 20rpx $padding;
+			&:last-child{
+				border-top: solid 1rpx #F6F6F6;
+				border-bottom: none;
+			}
+			.orders-tag{
+				display: inline-block;
+				background: $main-color;
+				font-size: 26rpx;
+				color: white;
+				border-radius: 10rpx;
+				padding: 0 10rpx;
+				height: 40rpx;
+				line-height: 40rpx;
+				margin-right: 10rpx;
+				&.order-tag-my{
+					background: $text-price;
+				}
+			}
+			.no{
+				font-size: 30rpx;
+				color: #111;
+				line-height: 60rpx;
+				width: calc(100% - 150rpx);
+			}
+			.state{
+				color: $main-color;
+				font-weight: bold;
+				font-size: 30rpx;
+				line-height: 60rpx;
+				width: 150rpx;
+				text-align: right;
+			}
+			
+			.btns{
+				text-align: right;
+				width: 100%;
+				.btns-item{
+					display: inline-block;
+					height: 70rpx;
+					line-height: 70rpx;
+					background: $main-color;
+					color: white;
+					border-radius: 35rpx;
+					padding: 0 30rpx;
+					font-size: 30rpx;
+					&.btns-border{
+						line-height: 68rpx;
+						box-sizing: border-box;
+						border:solid 1rpx $main-color;
+						background: white;
+						color: $main-color;
+						margin-right: 20rpx;
+					}
+				}
+			}
+		}
+	}
+</style>

pages/synthesize/actionWork.vue

@@ -5,7 +5,7 @@
 			<view class="total-flex">
 				<view class="total-item">
 					<image class="icon" src="@/static/icons/work_icon_00.png"></image>
-					<view class="title">诉讼委托单</view>
+					<view class="title">诉讼委托咨询单</view>
 					<view class="number">{{orderAll.all}}<text>单</text></view>
 				</view>
 				<view class="total-item">

pages/synthesize/consultWork.vue

@@ -38,7 +38,7 @@
 			</view>
 		</view>
 		<view class="block">
-			<view class="block-title">协商调解订单管理</view>
+			<view class="block-title">协商调解咨询订单管理</view>
 			<view class="tool-flex">
 				<view class="tool-flex-item" @click="onNav('Orders', { 'type': 0 })">
 					<image class="icon" src="@/static/icons/work_icon_06.png"></image>

pages/synthesize/order.vue

@@ -162,7 +162,7 @@
 				case 'entrust':
 					isScroll = true
 					funName  = entrustOrder
-					tabName  = '委托订单'
+					tabName  = '委托咨询订单'
 					tabsArr  = [
 						{ name: '待支付', type: 0 },
 						{ name: '待审核', type: 1 },

pages/work/generate.vue

@@ -18,7 +18,7 @@
 				</view>
 				<!-- 业务类型 -->
 				<view class="block-item">
-					<label class="block-item-label"><text>*</text>业务类型</label>
+					<label class="block-item-label"><text>*</text>业务咨询类型</label>
 					<picker :range="item.fromType" range-key="title" :value="item.fromIndex" @change="businessChange($event, item, index)">
 						<view class="institution-picker">
 							<view class="institution-picker-text nowrap">{{item.fromType[item.fromIndex].title}}</view>
@@ -327,7 +327,7 @@
 				}).then(res => {
 					uni.showModal({
 						title		: '提示',
-						content		: '订单已创建，请尽快提醒用户完善用户资料',
+						content		: '咨询订单已创建，请尽快提醒用户完善用户资料',
 						showCancel	: false,
 						success 	: () => {
 							this.$Router.back()