init

更改与线上一致
merge
2023-09-04 14:11:37 +08:00 · 2023-09-04 11:46:41 +08:00 · 2023-07-24 17:53:21 +08:00 · 2023-07-19 16:43:05 +08:00 · 2023-07-07 15:21:50 +08:00 · 2023-07-06 15:04:59 +08:00
16 changed files with 2893 additions and 1931 deletions
--- a/.DS_Store
+++ b/.DS_Store
--- a/.hbuilderx/launch.json
+++ b/.hbuilderx/launch.json
@@ -13,7 +13,7 @@
            "type" : "uniCloud"
        },
        {
-            "playground" : "standard",
+            "playground" : "custom",
            "type" : "uni-app:app-android"
        }
    ]
--- a/README.md
+++ b/README.md
@@ -1,3 +1,3 @@
 # dou-Fire

-抖火App
+抖火App  --  上架 - 版本  删除修改部分功能 使用~
--- a/apis/interfaces/empower.js
+++ b/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
+}
--- a/components/synthesisOrder.vue
+++ b/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">
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
    "name" : "抖火数字化咨询服务平台",
    "appid" : "__UNI__C305C03",
    "description" : "纵有疾风起，人生不言弃",
-    "versionName" : "1.4.8",
-    "versionCode" : 104,
+    "versionName" : "1.5.2",
+    "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" : {
--- a/pages.json
+++ b/pages.json
@@ -585,7 +585,7 @@
 			"name": "Entrust",
 			"auth": true,
 			"style": {
-			"navigationBarTitleText": "案件委托",
+				"navigationBarTitleText": "案件委托咨询",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#FFFFFF"
 			}
@@ -622,7 +622,7 @@
 			"name": "ConsultWork",
 			"auth": true,
 			"style": {
-			"navigationBarTitleText": "协商调解单",
+				"navigationBarTitleText": "协商调解咨询单",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#FFFFFF"
 			}
@@ -640,7 +640,7 @@
 			"name": "ActionWork",
 			"auth": true,
 			"style": {
-			"navigationBarTitleText": "诉讼委托单",
+				"navigationBarTitleText": "诉讼委托咨询单",
 				"enablePullDownRefresh": false,
 				"navigationBarBackgroundColor": "#FFFFFF"
 			}
@@ -727,7 +727,7 @@
 			"name": "EntrustCivil",
 			"auth": true,
 			"style": {
-			"navigationBarTitleText": "案件委托-民事诉讼",
+				"navigationBarTitleText": "案件委托-民事诉讼-咨询",
 				"enablePullDownRefresh": false,
 				"backgroundColor": "#FFF"
 			}
@@ -737,7 +737,7 @@
 			"name": "EntrustWrite",
 			"auth": true,
 			"style": {
-			"navigationBarTitleText": "案件委托-",
+				"navigationBarTitleText": "案件委托-咨询",
 				"enablePullDownRefresh": false,
 				"backgroundColor": "#FFF"
 			}
@@ -755,7 +755,7 @@
 			"name": "ExpandWrite",
 			"auth": true,
 			"style": {
-			"navigationBarTitleText": "拓展服务-",
+				"navigationBarTitleText": "拓展服务-咨询",
 				"enablePullDownRefresh": false,
 				"backgroundColor": "#FFF"
 			}
@@ -777,7 +777,27 @@
 				"navigationBarBackgroundColor": "#FFF"
 			}

-	}],
+		},
+		{
+			"path": "pages/empower/info",
+			"name": "EmpowerInfo",
+			"auth": true,
+			"style": {
+				"navigationBarTitleText": "增收赋能",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#FFF"
+			}
+		}, {
+			"path": "pages/empower/buy",
+			"name": "EmpowerBuy",
+			"auth": true,
+			"style": {
+				"navigationBarTitleText": "报名",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor": "#FFF"
+			}
+		}
+	],
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "抖火",
--- a/pages/empower/buy.vue
+++ b/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>
--- a/pages/empower/info.vue
+++ b/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>
--- a/pages/empower/order.vue
+++ b/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>
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -2,35 +2,17 @@
 	<view class="content">
 		<view class="header">
 			<view class="banner">
-				<u-swiper
-					class="banner-swiper"
-					:list="bannerArr"
-					:indicator="true"
-                    keyName="cover"
-					previousMargin="20"
-					nextMargin="20"
-					circular
-					radius="10"
-					bgColor="#ffffff"
-					height="100%"
-                    @click='swiperClick'
-				/>
+				<u-swiper class="banner-swiper" :list="bannerArr" :indicator="true" keyName="cover" previousMargin="20"
+					nextMargin="20" circular radius="10" bgColor="#ffffff" height="100%" @click='swiperClick' />
 			</view>
 			<view class="notice">
 				<view class="notice-title">
 					<image class="notice-icon" src="@/static/index/index_notice.png" mode="widthFix" /> 公告
 				</view>
-				<u-notice-bar
-					icon=""
-					:text="notice"
-                    url=''
-                    linkType='navigateTo'
-                    fontSize="14"
-					direction="column"
-					bgColor="#fff"
-					color="#111111"
-				/>
-				<view class="notice-more">更多<u-icon class="more-icon" size="20rpx" color="#999" name="arrow-right" /></view>
+				<u-notice-bar icon="" :text="notice" url='' linkType='navigateTo' fontSize="14" direction="column"
+					bgColor="#fff" color="#111111" />
+				<view class="notice-more">更多<u-icon class="more-icon" size="20rpx" color="#999" name="arrow-right" />
+				</view>
 			</view>
 		</view>
 		<!-- 自由服务包 -->
@@ -40,29 +22,23 @@
 		<!--  协商调解类 -->
 		<view class="block">
 			<view class="block-title">
-				<view class="title">协商调解类</view>
+				<view class="title">协商调解咨询类</view>
 			</view>
-            <scroll-view class="the-tabs" scroll-x="true" >
+			<scroll-view class="the-tabs" scroll-x="true">
 				<block v-for="(item, index) in theTabs" :key="index">
-                    <view class="the-tabs-item" :class="{'active': item.category_id == theTabId}" @click="onTheTab(item)">{{item.title}}</view>
+					<view class="the-tabs-item" :class="{'active': item.category_id == theTabId}"
+						@click="onTheTab(item)">{{item.title}}</view>
 				</block>
 				<view class="the-tabs-acitve-block" :style="theTabStyle"></view>
 			</scroll-view>
-			<scroll-view 
-                class="the-flex" 
-                scroll-x="true" 
-                scroll-with-animation="true" 
-                :scroll-into-view='defaultViewId'
-            >
-                    <view class="the-flex-item"
-                        v-for="item in jfList"
-                        :key="item.service_id"
-                        :id='"_tabs"+item.service_id'
-                        @click="sevicesClick(item.service_id)"
-                    >
+			<scroll-view class="the-flex" scroll-x="true" scroll-with-animation="true"
+				:scroll-into-view='defaultViewId'>
+				<view class="the-flex-item" v-for="item in jfList" :key="item.service_id" :id='"_tabs"+item.service_id'
+					@click="sevicesClick(item.service_id)">
 					<view class="cover" :style="'background-image: url(' + item.cover + ');'"></view>
 					<view class="title nowrap">{{item.title}}</view>
-                        <view class="price nowrap"><text>￥</text>{{item.price}}<text class="ding" v-if="item.type">定金</text></view>
+					<view class="price nowrap"><text>￥</text>{{item.price}}<text class="ding" v-if="item.type">定金</text>
+					</view>
 				</view>
 			</scroll-view>
 		</view>
@@ -71,20 +47,14 @@
 			<view class="block-title">
 				<view class="title">法律咨询类</view>
 			</view>
-			<scroll-view 
-				class="the-flex"
-				style="padding-top: 0;"
-				scroll-x="true" 
-				scroll-with-animation="true" 
-				:scroll-into-view='defaultViewId'
-			>
+			<scroll-view class="the-flex" style="padding-top: 0;" scroll-x="true" scroll-with-animation="true"
+				:scroll-into-view='defaultViewId'>
 				<block v-for="(item, index) in appMenus.service" :key="index">
-					<view class="the-flex-item"
-						@click="onView(item.page)"
-					>
+					<view class="the-flex-item" @click="onView(item.page)">
 						<view class="cover" :style="'background-image: url(' + item.cover + ');'"></view>
 						<view class="title nowrap">{{item.title}}</view>
-						<view class="price nowrap"><text>￥</text>{{item.price}} <text v-if="item.limit != null">/{{item.limit}}</text></view>
+						<view class="price nowrap"><text>￥</text>{{item.price}} <text
+								v-if="item.limit != null">/{{item.limit}}</text></view>
 					</view>
 				</block>
 			</scroll-view>
@@ -100,7 +70,8 @@
 						<view class="lawsuit-cover" :style="'background-image: url(' + item.cover + ');'"></view>
 						<view class="lawsuit-text">
 							<view class="lawsuit-title nowrap">{{item.title}}</view>
-							<view class="lawsuit-price">￥{{item.price}}<text v-if="item.limit != null">{{item.limit}}</text></view>
+							<view class="lawsuit-price">￥{{item.price}}<text
+									v-if="item.limit != null">{{item.limit}}</text></view>
 						</view>
 					</view>
 				</block>
@@ -109,57 +80,23 @@
 		<!-- 增收赋能类 -->
 		<view class="block">
 			<view class="block-title">
-				<view class="title">增收赋能类</view>
+				<view class="title">增收赋能咨询类</view>
 			</view>
-			<scroll-view 
-				class="the-flex"
-				style="padding-top: 0;"
-				scroll-x="true" 
-				scroll-with-animation="true" 
-				:scroll-into-view='defaultViewId'
-				@click="onToast()"
-			>
-				<view class="the-flex-item">
-					<view class="cover" :style="'background-image: url(' + require('@/static/synthesize/img_07.png') + ');'"></view>
-					<view class="title nowrap">巅峰销售思维</view>
-					<view class="price nowrap"><text>￥</text>2980</view>
-				</view>
-				<view class="the-flex-item">
-					<view class="cover" :style="'background-image: url(' + require('@/static/synthesize/img_08.png') + ');'"></view>
-					<view class="title nowrap">团队系统思维</view>
-					<view class="price nowrap"><text>￥</text>3980</view>
-				</view>
-				<view class="the-flex-item">
-					<view class="cover" :style="'background-image: url(' + require('@/static/synthesize/img_09.png') + ');'"></view>
-					<view class="title nowrap">领袖演说思维</view>
-					<view class="price nowrap"><text>￥</text>4980</view>
-				</view>
-				<view class="the-flex-item">
-					<view class="cover" :style="'background-image: url(' + require('@/static/synthesize/img_10.png') + ');'"></view>
-					<view class="title nowrap">卓越领袖能量思维</view>
-					<view class="price nowrap"><text>￥</text>5980</view>
-				</view>
-				<view class="the-flex-item">
-					<view class="cover" :style="'background-image: url(' + require('@/static/synthesize/img_11.png') + ');'"></view>
-					<view class="title nowrap">激发内在无限潜能</view>
-					<view class="price nowrap"><text>￥</text>9980</view>
-				</view>
-				<view class="the-flex-item">
-					<view class="cover" :style="'background-image: url(' + require('@/static/synthesize/img_12.png') + ');'"></view>
-					<view class="title nowrap">其他赋能培训会议</view>
-					<view class="price nowrap">价格另议</view>
+			<scroll-view class="the-flex" style="padding-top: 0;" scroll-x="true" scroll-with-animation="true"
+				:scroll-into-view='defaultViewId'>
+				<view class="the-flex-item" v-for="(item, index) in empowerArr" :key="index" @click="onEmpower(item.id)">
+					<view class="cover" :style="'background-image: url(' + item.cover + ');'"></view>
+					<view class="title nowrap">{{item.title}}</view>
+					<view class="price nowrap"><text>￥</text>{{item.price}}</view>
 				</view>
+		
 			</scroll-view>
 		</view>
 		<!-- 弹窗 -->
 		<u-popup :show="showAdImg" mode="center" bgColor="transparent">
 			<view class="ad-lay">
 				<view class="ad-down">
-					<u-count-down
-						ref="adCountDown"
-						:time="showAdTime"
-						:autoStart="false"
-						@change="timeData = $event"
+					<u-count-down ref="adCountDown" :time="showAdTime" :autoStart="false" @change="timeData = $event"
 						@finish="showAdImg = false">
 						<view>
 							自动关闭<text>{{ timeData.seconds }}</text>S
@@ -168,13 +105,8 @@
 				</view>
 				<image class="ad-img" :src="layAdImg" mode="widthFix"></image>
 				<view class="ad-btn">
-					<u-icon
-						class="ad-btn-icon"
-						name="close-circle"
-						color="white"
-						size="36px"
-						@click="onRemoveAd"
-					></u-icon>
+					<u-icon class="ad-btn-icon" name="close-circle" color="white" size="36px"
+						@click="onRemoveAd"></u-icon>
 				</view>
 			</view>
 		</u-popup>
@@ -182,119 +114,151 @@
 </template>

 <script>
-	import { region } from '@/apis/interfaces/address.js'
-    import { categories, jf, index } from '@/apis/interfaces/index.js'
+	import {
+		region
+	} from '@/apis/interfaces/address.js'
+	import { lists } from '@/apis/interfaces/empower.js'
+	import {
+		categories,
+		jf,
+		index
+	} from '@/apis/interfaces/index.js'
 	export default {
 		data() {
 			return {
-				theTabs		: [
-					{ category_id: '', title: '全部' }
-				],
-				theTabId	: '',
-				theTabStyle	: {
+				theTabs: [{
+					category_id: '',
+					title: '全部'
+				}],
+				theTabId: '',
+				theTabStyle: {
 					left: '0%'
 				},
-				bannerArr	: [],
-                notice		: [],
-                jfList:[],
-                defaultViewId:'',
-                zfList:[],
+				bannerArr: [],
+				notice: [],
+				jfList: [],
+				defaultViewId: '',
+				zfList: [],
 				// 首次进入弹窗
-				timeData	: {},
-				first		: 1,
-				showAdTime  : 0,
-				showAdImg	: true,
-				layAdImg	: '',
-				appMenus	: {
-					cases	: [],
-					service	: []
-				}
+				timeData: {},
+				first: 1,
+				showAdTime: 0,
+				showAdImg: true,
+				layAdImg: '',
+				appMenus: {
+					cases: [],
+					service: []
+				},
+				// 增收赋能列表
+				empowerArr: []
 			}
 		},
 		onLoad() {
 			this.getCategory()
 			this.getJf()
 			this.getIndex()
+			// 增收赋能
+			this.getEmpower()
 		},
 		methods: {
-			onToast(){
-				uni.showToast({
-					title: '即将开放，敬请期待',
-					icon : 'none'
+			// 查看增收赋能详情
+			onEmpower(id) {
+				this.$Router.push({
+					name: 'EmpowerInfo',
+					params: {
+						id
+					}
 				})
 			},
+			// 增收赋能接口
+			getEmpower() {
+				lists().then(res => {
+					this.empowerArr = res;
+					console.log(res)
+				}).catch(err => {
+					uni.showToast({
+						title: err.message,
+						icon: 'none'
+					})
+				})
+			},
+
 			// 获取金法列表
-            getJf(){
+			getJf() {
 				let params = {
-                    category_id:this.theTabId
+					category_id: this.theTabId
 				}
-                jf(params).then(res=>{
-                    if(res.length>0){
-                        setTimeout(()=>{
-                            this.defaultViewId = '_tabs'+res[0].service_id
-                        },300)
+				jf(params).then(res => {
+					if (res.length > 0) {
+						setTimeout(() => {
+							this.defaultViewId = '_tabs' + res[0].service_id
+						}, 300)
 					}
 					this.jfList = res
-                }).catch(err=>{
+				}).catch(err => {
 					uni.showToast({
-                        title:err.message,
-                        icon:'none',
-                        mask:true,
-                        duration:2000
+						title: err.message,
+						icon: 'none',
+						mask: true,
+						duration: 2000
 					})
 				})
 			},
 			// 点击金法产品跳转金法详情
-            sevicesClick(id){
+			sevicesClick(id) {
 				uni.navigateTo({
-                    url:'/pages/index/introduces?id='+id
+					url: '/pages/index/introduces?id=' + id
 				})
 			},
 			// 首页轮播图及公告
-            getIndex(){
-                index().then(res=>{
+			getIndex() {
+				index().then(res => {
 					this.bannerArr = res.bannners
 					this.appMenus = res.app_menus
 					let list = []
-                    res.notices.map(item=>{
+					res.notices.map(item => {
 						let params = item.user.name + ' ' + item.user.text
 						list.push(params)
 					})
 					this.notice = list
-					let { is_lay_ad, lay_ad_img, times } = res.layad
-					if(is_lay_ad) this.layAdImg = lay_ad_img
-					if(this.first === 1 && is_lay_ad){
+					let {
+						is_lay_ad,
+						lay_ad_img,
+						times
+					} = res.layad
+					if (is_lay_ad) this.layAdImg = lay_ad_img
+					if (this.first === 1 && is_lay_ad) {
 						this.showAdImg = true
 						this.showAdTime = times * 1000
 						this.$nextTick(() => {
 							this.$refs.adCountDown.start()
 						})
 					}
-                }).catch(err=>{
+				}).catch(err => {
 					uni.showToast({
-                        title:err.message,
-                        icon:'none',
-                        mask:true,
-                        duration:2000
+						title: err.message,
+						icon: 'none',
+						mask: true,
+						duration: 2000
 					})
 				})
 			},
 			// 获取金法分类列表
-            getCategory(){
-                categories().then(res=>{
+			getCategory() {
+				categories().then(res => {
 					this.theTabs = this.theTabs.concat(res)
-                }).catch(err=>{
+				}).catch(err => {
 					uni.showToast({
-                        title:err.message,
-                        icon:'none',
-                        mask:true,
-                        duration:2000
+						title: err.message,
+						icon: 'none',
+						mask: true,
+						duration: 2000
 					})
 				})
 			},
 			// 金法产品筛选
-            onTheTab(e){
-            	if(e.category_id != this.theTabId){
+			onTheTab(e) {
+				if (e.category_id != this.theTabId) {
 					let index = this.theTabs.findIndex(val => val.category_id === e.category_id)
 					this.theTabStyle = {
 						left: index * 25 + '%'
@@ -304,15 +268,17 @@
 				}
 			},
 			// 点击轮播图
-            swiperClick(e){
+			swiperClick(e) {
 				// console.log(this.bannerArr[e])
 			},
 			// 点击轮播图跳转自由服务包
-            onView(name){
-				this.$Router.push({ name })
+			onView(name) {
+				this.$Router.push({
+					name
+				})
 			},
 			// 关闭弹窗广告
-			onRemoveAd(){
+			onRemoveAd() {
 				this.first = 0;
 				this.showAdImg = false;
 			}
@@ -321,15 +287,17 @@
 </script>

 <style lang="scss" scoped>
-	.header{
+	.header {
 		background-color: white;
 		padding-top: 20rpx;
 	}
+
 	// ad弹窗广告
-	.ad-lay{
+	.ad-lay {
 		width: 70vw;
 		position: relative;
-		.ad-down{
+
+		.ad-down {
 			position: absolute;
 			top: 20rpx;
 			right: 20rpx;
@@ -340,43 +308,51 @@
 			line-height: 30rpx;
 			border-radius: 24rpx;
 			color: white;
-			.ad-down-u{
+
+			.ad-down-u {
 				display: inline-block;
 				line-height: 30rpx;
 			}
 		}
-		.ad-img{
+
+		.ad-img {
 			width: 70vw;
 			border-radius: 20rpx;
 		}
-		.ad-btn{
+
+		.ad-btn {
 			text-align: center;
 			margin-top: 30rpx;
-			.ad-btn-icon{
+
+			.ad-btn-icon {
 				display: inline-block;
 			}
 		}
 	}
+
 	// 轮播图
-	.banner{
+	.banner {
 		position: relative;
 		width: 100%;
 		padding-top: 43%;
-		.banner-swiper{
+
+		.banner-swiper {
 			position: absolute;
 			top: 0;
 			left: 0;
 			width: 100%;
 		}
 	}
+
 	// 公告
-	.notice{
+	.notice {
 		background: white;
 		padding: $padding;
 		display: flex;
 		flex-direction: row;
 		align-items: center;
-		.notice-title{
+
+		.notice-title {
 			background-color: #ececec;
 			color: #000;
 			height: 60rpx;
@@ -386,7 +362,8 @@
 			font-size: 26rpx;
 			font-weight: bold;
 			border-radius: 20rpx;
-			.notice-icon{
+
+			.notice-icon {
 				width: 32rpx;
 				vertical-align: middle;
 				margin-bottom: 8rpx;
@@ -394,7 +371,8 @@
 				display: inline-block;
 			}
 		}
-		.notice-more{
+
+		.notice-more {
 			font-size: 24rpx;
 			height: 50rpx;
 			border-radius: 25rpx;
@@ -402,55 +380,66 @@
 			line-height: 50rpx;
 			text-align: center;
 			color: #999999;
-			.more-icon{
+
+			.more-icon {
 				display: inline-block;
 			}
 		}
 	}
+
 	// 自由服务包
-	.free{
+	.free {
 		padding: $padding $padding $padding - 10 $padding ;
-		.free-img{
+
+		.free-img {
 			width: 100%;
 		}
 	}
+
 	// 增收赋能类
-	.closed{
+	.closed {
 		background: white;
 		margin: 0 $margin;
 		border-radius: 35rpx;
 		padding-bottom: 10rpx;
-		.closed-item{
+
+		.closed-item {
 			display: flex;
 			margin-bottom: 20rpx;
 			padding-bottom: 20rpx;
 			border-bottom: solid 1rpx #f8f8f8;
-			&:last-child{
+
+			&:last-child {
 				margin-bottom: 0;
 				border-bottom: none;
 			}
-			.closed-cover{
+
+			.closed-cover {
 				width: 168rpx;
 				height: 168rpx;
 				background-size: cover;
 				background-position: center;
 				border-radius: 10rpx;
 			}
-			.closed-text{
+
+			.closed-text {
 				width: calc(100% - 168rpx);
 				padding-left: 30rpx;
 				box-sizing: border-box;
-				.closed-title{
+
+				.closed-title {
 					font-size: 32rpx;
 					font-weight: bold;
 					line-height: 50rpx;
 				}
-				.closed-subtitle{ 
+
+				.closed-subtitle {
 					color: gray;
 					font-size: 28rpx;
 					line-height: 40rpx;
 				}
-				.closed-price{
+
+				.closed-price {
 					color: #d51959;
 					font-size: 34rpx;
 					line-height: 40rpx;
@@ -460,12 +449,14 @@
 			}
 		}
 	}
+
 	// 诉讼委托类
-	.lawsuit{ 
+	.lawsuit {
 		padding: 0 20rpx $padding;
 		display: flex;
 		justify-content: space-between;
-		&-item{
+
+		&-item {
 			background: #F6F6F6;
 			border-radius: 10rpx;
 			display: flex;
@@ -475,29 +466,34 @@
 			width: calc(50% - 20rpx);
 			margin: 0 10rpx;
 		}
-		&-cover{
+
+		&-cover {
 			width: 138rpx;
 			height: 138rpx;
 			background-size: cover;
 			background-position: center;
 		}
-		&-text{
+
+		&-text {
 			width: calc(100% - 138rpx);
 			padding: 0 20rpx;
 			box-sizing: border-box;
 		}
-		&-title{ 
+
+		&-title {
 			font-size: 30rpx;
 			margin-bottom: 20rpx;
 		}
-		&-price{
+
+		&-price {
 			font-size: 32rpx;
 			color: #d51959;
 			font-weight: bold;
 		}
 	}
+
 	// 经法
-	.the-tabs{
+	.the-tabs {
 		background: #ececec;
 		margin: 0 $margin;
 		height: 60rpx;
@@ -506,7 +502,8 @@
 		position: relative;
 		white-space: nowrap;
 		width: calc(100% - 60rpx);
-		&-item{
+
+		&-item {
 			position: relative;
 			z-index: 2;
 			width: 25%;
@@ -516,33 +513,39 @@
 			color: #454545;
 			transition: all .4s;
 			display: inline-block;
-			&.active{
+
+			&.active {
 				color: white;
 			}
 		}
-		&-acitve-block{
+
+		&-acitve-block {
 			display: inline-block;
 			width: 25%;
 			height: 60rpx;
-			background: linear-gradient( to right, #d51959, #ec7247);
+			background: linear-gradient(to right, #d51959, #ec7247);
 			border-radius: 35rpx;
 			position: absolute;
 			left: 0;
 			transition: all .4s;
 		}
 	}
-	.the-flex{
+
+	.the-flex {
 		padding: $padding 20rpx;
 		box-sizing: border-box;
 		white-space: nowrap;
-		&-item{
+
+		&-item {
 			width: calc(33% - 20rpx);
 			margin: 0 10rpx;
 			display: inline-block;
-			&:last-child{
+
+			&:last-child {
 				margin-right: 20rpx;
 			}
-			.cover{
+
+			.cover {
 				width: 100%;
 				padding-top: 100%;
 				background-position: center;
@@ -550,21 +553,25 @@
 				background-position: center;
 				border-radius: 10rpx;
 			}
-			.title{
+
+			.title {
 				font-size: 30rpx;
 				color: #111111;
 				padding: 10rpx 0;
 				line-height: 40rpx;
 			}
-			.price{
+
+			.price {
 				line-height: 40rpx;
 				font-weight: bold;
 				color: #d51959;
 				font-size: 32rpx;
-				text{
+
+				text {
 					font-size: 80%;
 				}
-                .ding{
+
+				.ding {
 					font-size: 64%;
 					margin-left: 4rpx;
 					position: relative;
@@ -573,23 +580,27 @@
 			}
 		}
 	}
+
 	// 模块
-	.block{
+	.block {
 		background-color: white;
 		border-radius: $radius;
 		margin: 0 $margin $margin;
-		.block-title{
+
+		.block-title {
 			padding: 0 $padding;
 			height: 100rpx;
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
-			.title{
+
+			.title {
 				font-weight: bold;
 				color: #111111;
 				font-size: 36rpx;
 			}
-			.more{
+
+			.more {
 				background-color: #ececec;
 				font-size: 28rpx;
 				height: 50rpx;
@@ -600,11 +611,11 @@
 				line-height: 50rpx;
 				text-align: center;
 				color: #454545;
-				.more-icon{
+
+				.more-icon {
 					display: inline-block;
 				}
 			}
 		}
 	}
-
 </style>
--- a/pages/synthesize/actionWork.vue
+++ b/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">
--- a/pages/synthesize/consultWork.vue
+++ b/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>
--- a/pages/synthesize/order.vue
+++ b/pages/synthesize/order.vue
@@ -162,7 +162,7 @@
 				case 'entrust':
 					isScroll = true
 					funName  = entrustOrder
-					tabName  = '委托订单'
+					tabName  = '委托咨询订单'
 					tabsArr  = [
 						{ name: '待支付', type: 0 },
 						{ name: '待审核', type: 1 },
--- a/pages/work/generate.vue
+++ b/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()
--- a/pages/work/index.vue
+++ b/pages/work/index.vue
@@ -6,8 +6,10 @@
 				<view class="status_bar"></view>
 				<view class="work-bar">
 					<view class="work-bar-user">
-						<image class="cover" :src="userInfo.avatar || require('@/static/imgs/default-active.png')" mode="aspectFill"></image>
-						<view class="nickname">{{userInfo.nickname}}<text class="card" v-if="isManager">{{identity.name}}</text></view>
+						<image class="cover" :src="userInfo.avatar || require('@/static/imgs/default-active.png')"
+							mode="aspectFill"></image>
+						<view class="nickname">{{userInfo.nickname}}<text class="card"
+								v-if="isManager">{{identity.name}}</text></view>
 					</view>
 					<view class="work-bar-add" @click="onCreateOrder" v-if="isManager">
 						<uni-icons class="icon" type="plusempty" size="30rpx" color="#111"></uni-icons>创建订单
@@ -19,7 +21,8 @@
 				<view class="block open-interest">
 					<view class="title">实习顾问专属权益</view>
 					<view class="open-interest-flex">
-						<view class="open-interest-item" v-for="(item, index) in rightsArr" :key="index" @click="onToast(item)">
+						<view class="open-interest-item" v-for="(item, index) in rightsArr" :key="index"
+							@click="onToast(item)">
 							<image class="open-interest-icon" :src="item.icon"></image>
 							<view class="open-interest-text">{{item.title}}</view>
 						</view>
@@ -28,37 +31,48 @@
 				<view class="block open-interest">
 					<view class="title">仅需3步即可成为实习顾问</view>
 					<view class="open-interest-block">
-						<image class="open-interest-icon" :src="isCertification ? require('@/static/icons/work_icon_25.png'): require('@/static/icons/work_icon_24.png')"></image>
+						<image class="open-interest-icon"
+							:src="isCertification ? require('@/static/icons/work_icon_25.png'): require('@/static/icons/work_icon_24.png')">
+						</image>
 						<view class="open-interest-text">
 							<view class="open-interest-title">实名认证</view>
 							<view class="open-interest-submit">通过身份证实名认证</view>
 						</view>
-						<button class="open-interest-btn" size="mini" :disabled="isCertification" @click="$Router.push({name: 'UserCertification'})">{{isCertification ? '已认证': '去认证'}}</button>
+						<button class="open-interest-btn" size="mini" :disabled="isCertification"
+							@click="$Router.push({name: 'UserCertification'})">{{isCertification ? '已认证': '去认证'}}</button>
 					</view>
 					<view class="open-interest-block">
-						<image class="open-interest-icon" :src="isAnswer ? require('@/static/icons/work_icon_25.png'): require('@/static/icons/work_icon_23.png')"></image>
+						<image class="open-interest-icon"
+							:src="isAnswer ? require('@/static/icons/work_icon_25.png'): require('@/static/icons/work_icon_23.png')">
+						</image>
 						<view class="open-interest-text">
 							<view class="open-interest-title">通过实习顾问考试</view>
 							<view class="open-interest-submit">通过线上考试即可完成</view>
 						</view>
-						<button class="open-interest-btn" size="mini" :disabled="isAnswer" @click="$Router.pushTab({name: 'CollegeTest'})">{{isAnswer ? '已通过': '去考试'}}</button>
+						<button class="open-interest-btn" size="mini" :disabled="isAnswer"
+							@click="$Router.pushTab({name: 'CollegeTest'})">{{isAnswer ? '已通过': '去考试'}}</button>
 					</view>
 					<view class="open-interest-block">
-						<image class="open-interest-icon" :src="sign.isSign ? require('@/static/icons/work_icon_25.png'): require('@/static/icons/work_icon_27.png')"></image>
+						<image class="open-interest-icon"
+							:src="sign.isSign ? require('@/static/icons/work_icon_25.png'): require('@/static/icons/work_icon_27.png')">
+						</image>
 						<view class="open-interest-text">
 							<view class="open-interest-title">实习顾问签约</view>
 							<view class="open-interest-submit">完成实习顾问在线签约</view>
 						</view>
-						<button class="open-interest-btn" size="mini" :disabled="sign.isSign" @click="onSign">{{sign.isSign ? '已签约': '去签约'}}</button>
+						<button class="open-interest-btn" size="mini" :disabled="sign.isSign"
+							@click="onSign">{{sign.isSign ? '已签约': '去签约'}}</button>
 					</view>
 				</view>
 				<!-- 提示信息 -->
 				<u-popup :show="privilegeShow" mode="center" bgColor="transparent">
 					<view class="privilege-lay">
-						<image class="privilege-lay-img" src="@/static/imgs/privilege-lay-header.png" mode="widthFix"></image>
+						<image class="privilege-lay-img" src="@/static/imgs/privilege-lay-header.png" mode="widthFix">
+						</image>
 						<view class="privilege-lay-content"><text>{{privilegeText}}</text></view>
 						<view class="privilege-lay-remove">
-							<u-icon class="privilege-lay-icon" name="close-circle" color="white" size="30" @click="privilegeShow = false"></u-icon>
+							<u-icon class="privilege-lay-icon" name="close-circle" color="white" size="30"
+								@click="privilegeShow = false"></u-icon>
 						</view>
 					</view>
 				</u-popup>
@@ -69,7 +83,7 @@
 					<view class="flex-item" @click="onNav('ConsultWork')">
 						<image class="flex-icon" src="/static/icons/icon_00.png" mode="aspectFill"></image>
 						<view class="flex-title">
-							<view class="flex-name">协商调解类</view>
+							<view class="flex-name">协商调解咨询类</view>
 							<view class="flex-tips">信用卡、贷款业务</view>
 						</view>
 						<view class="flex-btn">去查看</view>
@@ -94,7 +108,7 @@
 						<!-- @click="onNav('EnableWork')" -->
 						<image class="flex-icon" src="/static/icons/icon_03.png" mode="aspectFill"></image>
 						<view class="flex-title">
-							<view class="flex-name">增收赋能类</view>
+							<view class="flex-name">增收赋能咨询类</view>
 							<view class="flex-tips">销售、领袖、演说等</view>
 						</view>
 						<view class="flex-btn">去查看</view>
@@ -104,11 +118,7 @@
 		</view>
 		<!-- 未登录 -->
 		<view v-else class="auth-null">
-			<u-empty
-			        mode="permission"
-			        icon="http://cdn.uviewui.com/uview/empty/permission.png"
-					text="暂未登录"
-			>
+			<u-empty mode="permission" icon="http://cdn.uviewui.com/uview/empty/permission.png" text="暂未登录">
 			</u-empty>
 			<button class="auth-null-btn" size="mini" @click="onNav('Auth')">登录</button>
 		</view>
@@ -116,94 +126,109 @@
 </template>

 <script>
-	import { index, rights, sign, synthesisCount } from '@/apis/interfaces/work.js'
+	import {
+		index,
+		rights,
+		sign,
+		synthesisCount
+	} from '@/apis/interfaces/work.js'
 	export default {
 		data() {
 			return {
-				isAuth			: false,
-				rightsArr		: [],
-				userInfo		: {
+				isAuth: false,
+				rightsArr: [],
+				userInfo: {
 					nickname: '',
-					avatar	: ''
+					avatar: ''
 				},
-				identity		: {},
-				isAnswer		: false,
-				isCertification	: false,
-				certification	: null,
-				isManager		: false,
-				orderCount		: {},
+				identity: {},
+				isAnswer: false,
+				isCertification: false,
+				certification: null,
+				isManager: false,
+				orderCount: {},
 				// 权益说明
-				privilegeShow	: false,
-				privilegeText	: '',
+				privilegeShow: false,
+				privilegeText: '',
 				// 签约状态
-				sign			: {
-					isSign	: false,
-					address	: ""
+				sign: {
+					isSign: false,
+					address: ""
 				},
 				// 综法订单管理
-				synthesisData	: {}
+				synthesisData: {}
 			};
 		},
 		onShow() {
 			let i = 0;
 			this.isAuth = this.$store.getters.getToken != ''
-			if(this.isAuth){
+			if (this.isAuth) {
 				this.getIndex()
 			}
 		},
 		methods: {
 			// 签约
-			onSign(){
-				if(!this.isCertification){
+			onSign() {
+				if (!this.isCertification) {
 					uni.showToast({
 						title: '暂未实名认证，无法签约，请完成实名认证',
-						icon : 'none'
+						icon: 'none'
 					})
 					return
 				}
-				if(this.sign.address == ''){
+				if (this.sign.address == '') {
 					uni.showToast({
 						title: '暂时无法签约，请前往“我的”，点击用户头像，完善通讯地址信息后重试',
-						icon : 'none'
+						icon: 'none'
 					})
 					return
 				}
 				uni.showLoading({
-					title	: '获取签约地址',
-					mask	: true
+					title: '获取签约地址',
+					mask: true
 				})
 				sign().then(res => {
 					uni.hideLoading()
 					this.$Router.push({
-						name	: 'ESign',
-						params	: {
+						name: 'ESign',
+						params: {
 							url: res.sign_url
 						}
 					})
 				}).catch(err => {
 					uni.showToast({
 						title: err.message,
-						icon : 'none'
+						icon: 'none'
 					})
 				})
 			},
 			// 显示业务员权益
-			onToast(val){
+			onToast(val) {
 				this.privilegeText = val.content
 				this.privilegeShow = true
 			},
 			// 工作台信息
-			getIndex(){
+			getIndex() {
 				uni.showLoading({
 					title: '加载中...',
-					mask : true
+					mask: true
 				})
 				Promise.all([rights(), index(), synthesisCount()]).then(res => {
 					let rightsData = res[0],
 						indexData = res[1],
 						synthesisData = res[2]

-					let { nickname, avatar, business_orders_count, isCertification, certification, isManager, isAnswer, identity, sign } = indexData
+					let {
+						nickname,
+						avatar,
+						business_orders_count,
+						isCertification,
+						certification,
+						isManager,
+						isAnswer,
+						identity,
+						sign
+					} = indexData
 					this.rightsArr = rightsData
 					this.userInfo = {
 						nickname,
@@ -223,20 +248,23 @@
 				}).catch(err => {
 					uni.showToast({
 						title: err.message,
-						icon : 'none'
+						icon: 'none'
 					})
 				})
 			},
 			// 导航
-			onNav(name, obj){
+			onNav(name, obj) {
 				let params = obj || {}
-				this.$Router.push({name, params})
+				this.$Router.push({
+					name,
+					params
+				})
 			},
 			// 创建订单
-			onCreateOrder(){
+			onCreateOrder() {
 				uni.showActionSheet({
 					itemList: ['个人订单', '客户订单'],
-					success : res => {
+					success: res => {
 						this.onNav('OrderCreate', {
 							type: res.tapIndex === 0 ? 'self' : 'other'
 						})
@@ -244,10 +272,10 @@
 				})
 			},

-			onToastTips(){
+			onToastTips() {
 				uni.showToast({
 					title: '即将开放，敬请期待',
-					icon : 'none'
+					icon: 'none'
 				})
 			},
 		}
@@ -255,11 +283,12 @@
 </script>

 <style lang="scss" scoped>
-	.content{
+	.content {
 		padding-bottom: 30rpx;
 	}
+
 	// 登录提示
-	.auth-null{
+	.auth-null {
 		height: 100vh;
 		width: 100vw;
 		background: white;
@@ -267,7 +296,8 @@
 		flex-direction: column;
 		justify-content: center;
 		align-items: center;
-		.auth-null-btn{
+
+		.auth-null-btn {
 			height: 90rpx;
 			line-height: 90rpx;
 			padding: 0;
@@ -279,14 +309,17 @@
 			font-weight: bold;
 		}
 	}
+
 	// 弹出特权
-	.privilege-lay{
+	.privilege-lay {
 		width: 70vw;
-		.privilege-lay-img{
+
+		.privilege-lay-img {
 			width: 70vw;
 			vertical-align: top;
 		}
-		.privilege-lay-content{
+
+		.privilege-lay-content {
 			background: white;
 			border-radius: 0 0 20rpx 20rpx;
 			width: 70vw;
@@ -297,29 +330,34 @@
 			color: #111111;
 			font-size: 30rpx;
 		}
-		.privilege-lay-remove{
+
+		.privilege-lay-remove {
 			padding-top: 30rpx;
 			text-align: center;
-			.privilege-lay-icon{
+
+			.privilege-lay-icon {
 				display: inline-block;
 			}
 		}
 	}
+
 	// header
-	.work-bar{
+	.work-bar {
 		padding: 30rpx;
 		margin-bottom: 30rpx;
 		display: flex;
 		justify-content: space-between;
 		align-items: center;
-		&-user{
+
+		&-user {
 			position: relative;
 			line-height: 70rpx;
 			height: 70rpx;
 			width: calc(100% - 200rpx);
 			padding-left: 90rpx;
 			box-sizing: border-box;
-			.cover{
+
+			.cover {
 				width: 70rpx;
 				height: 70rpx;
 				border-radius: 50%;
@@ -327,10 +365,12 @@
 				left: 0;
 				top: 0;
 			}
-			.nickname{
+
+			.nickname {
 				font-weight: bold;
 				font-size: 34rpx;
-				.card{
+
+				.card {
 					color: $main-color;
 					font-size: 24rpx;
 					display: inline-block;
@@ -341,39 +381,45 @@
 					margin-left: 20rpx;
 					margin-bottom: 2rpx;
 					vertical-align: middle;
-					border:solid 1rpx $main-color;
+					border: solid 1rpx $main-color;
 					font-weight: normal;
 				}
 			}
 		}
-		&-add{
+
+		&-add {
 			width: 200rpx;
 			font-size: 30rpx;
 			text-align: right;
 			line-height: 70rpx;
-			.icon{
+
+			.icon {
 				margin-right: 5rpx;
 				font-weight: bold;
 			}
 		}
 	}
+
 	// 订单管理
-	.tool-flex{
+	.tool-flex {
 		padding: 0 10rpx;
 		display: flex;
 		flex-wrap: wrap;
-		.tool-flex-item{
+
+		.tool-flex-item {
 			width: 25%;
 			text-align: center;
 			margin-bottom: 30rpx;
 			position: relative;
-			.icon{
+
+			.icon {
 				width: 78rpx;
 				height: 78rpx;
 				background: #ddd;
 				border-radius: 20rpx;
 			}
-			.number{
+
+			.number {
 				position: absolute;
 				right: 20%;
 				background: #fe4444;
@@ -385,7 +431,8 @@
 				color: white;
 				border-radius: 50%;
 			}
-			.text{
+
+			.text {
 				line-height: 40rpx;
 				font-size: 26rpx;
 				color: #111;
@@ -393,13 +440,15 @@
 			}
 		}
 	}
+
 	// 数据统计单
-	.total-flex{
+	.total-flex {
 		padding: 0 20rpx 20rpx;
 		display: flex;
 		flex-direction: row;
 		flex-wrap: wrap;
-		.total-item{
+
+		.total-item {
 			margin: 0 10rpx 20rpx;
 			background: #f8f8f8;
 			width: calc(50% - 20rpx);
@@ -408,7 +457,8 @@
 			border-radius: $radius;
 			position: relative;
 			min-height: 140rpx;
-			.icon{
+
+			.icon {
 				position: absolute;
 				left: 20rpx;
 				top: 50%;
@@ -416,13 +466,15 @@
 				height: 70rpx;
 				margin-top: -35rpx;
 			}
-			.title{
+
+			.title {
 				font-size: 28rpx;
 				color: #111;
 				line-height: 40rpx;
 				@extend .nowrap;
 			}
-			.number{
+
+			.number {
 				padding-top: 5rpx;
 				font-weight: bold;
 				font-size: 34rpx;
@@ -430,7 +482,8 @@
 				font-family: Arial, Helvetica, sans-serif;
 				line-height: 40rpx;
 				@extend .nowrap;
-				text{
+
+				text {
 					font-size: 80%;
 					font-weight: normal;
 					padding-left: 10rpx;
@@ -438,12 +491,14 @@
 			}
 		}
 	}
+
 	// 通用板块
-	.block{
+	.block {
 		background: white;
 		margin: 0 30rpx 20rpx;
 		border-radius: $radius;
-		.block-title{
+
+		.block-title {
 			padding: 30rpx;
 			display: flex;
 			justify-content: space-between;
@@ -453,63 +508,75 @@
 			font-size: 32rpx;
 		}
 	}
+
 	// 开通业务员
-	.open-interest{
+	.open-interest {
 		padding: 30rpx;
 		margin-bottom: 30rpx;
-		.title{
+
+		.title {
 			text-align: center;
 			font-size: 34rpx;
 			font-weight: bold;
 			line-height: 80rpx;
 		}
-		.open-interest-flex{
+
+		.open-interest-flex {
 			display: flex;
 			flex-wrap: wrap;
 			padding-top: 30rpx;
 			justify-content: space-between;
-			.open-interest-item{
+
+			.open-interest-item {
 				text-align: center;
-				.open-interest-icon{
+
+				.open-interest-icon {
 					width: 88rpx;
 					height: 88rpx;
 					vertical-align: top;
 					margin-bottom: 15rpx;
 				}
-				.open-interest-text{
+
+				.open-interest-text {
 					font-size: 28rpx;
 					color: #111111;
 					line-height: 40rpx;
 				}
 			}
 		}
+
 		// 开通步骤
-		.open-interest-block{
+		.open-interest-block {
 			padding: 30rpx 0;
 			display: flex;
 			justify-content: space-between;
 			align-items: center;
-			.open-interest-icon{
+
+			.open-interest-icon {
 				width: 88rpx;
 				height: 88rpx;
 			}
-			.open-interest-text{
-				width: calc( 100% - 258rpx);
-				padding:0 30rpx;
+
+			.open-interest-text {
+				width: calc(100% - 258rpx);
+				padding: 0 30rpx;
 				box-sizing: border-box;
-				.open-interest-title{
+
+				.open-interest-title {
 					font-weight: bold;
 					color: #111111;
 					line-height: 40rpx;
 					font-size: 30rpx;
 				}
-				.open-interest-submit{
+
+				.open-interest-submit {
 					color: #666666;
 					font-size: 26rpx;
 					line-height: 40rpx;
 				}
 			}
-			.open-interest-btn[size="mini"]{
+
+			.open-interest-btn[size="mini"] {
 				width: 170rpx;
 				height: 70rpx;
 				line-height: 70rpx;
@@ -518,10 +585,12 @@
 				background: $main-color;
 				color: white;
 				font-size: 30rpx;
-				&::after{
+
+				&::after {
 					display: none;
 				}
-				&[disabled]{
+
+				&[disabled] {
 					background: #EEEEEE;
 					color: #999999;
 				}
@@ -529,11 +598,12 @@
 		}
 	}

-	.flex{
+	.flex {
 		width: 100%;
 		padding: 0 30rpx;
 		box-sizing: border-box;
-		&-item{
+
+		&-item {
 			background: white;
 			padding: 30rpx;
 			border-radius: 30rpx;
@@ -541,21 +611,31 @@
 			display: flex;
 			box-sizing: border-box;
 			position: relative;
-			.flex-icon{ width: 48px; height: 48px; background: #dce1fb; border-radius: 30rpx; }
-			.flex-title{
+
+			.flex-icon {
+				width: 48px;
+				height: 48px;
+				background: #dce1fb;
+				border-radius: 30rpx;
+			}
+
+			.flex-title {
 				box-sizing: border-box;
 				padding-left: 30rpx;
+
 				.flex-name {
 					color: #293f66;
 					font-size: 34rpx;
 					font-weight: bold;
 					padding: 4rpx 0;
 				}
+
 				.flex-tips {
 					color: #929db3;
 					font-size: 28rpx;
 				}
 			}
+
 			.flex-btn {
 				position: absolute;
 				right: 30rpx;
Author	SHA1	Message	Date
zhangdongxue	149b75a7dd	init	2023-09-04 14:11:37 +08:00
zhangdongxue	eab46f3108	更改与线上一致	2023-09-04 11:46:41 +08:00
Jason	f75e48a3f9	merge	2023-07-24 17:53:21 +08:00
Jason	480d4416c2	..	2023-07-19 16:43:05 +08:00
Jason	3f8baac1bd	删除赋能	2023-07-07 15:21:50 +08:00
Jason	a234b15f65	增加咨询字段	2023-07-06 15:04:59 +08:00
Jason	06771c8a68	切换环境	2023-07-06 13:30:23 +08:00
Jason	5f290f3b78	咨询订单服务金额改成订单类型	2023-07-06 12:00:40 +08:00
Jason	cba40b636e	更改文字	2023-07-06 11:16:57 +08:00
Jason	8b742c6212	更新	2023-07-06 10:27:19 +08:00
Jason	2758d4b5b2	更新	2023-07-06 10:24:58 +08:00