commit bf8dc07cb7f64f577b994378f25b6861a657bd06
Author: 山兮 <3208053815@qq.com>
Date:   Thu Mar 21 13:53:51 2024 +0800

    初始化项目

diff --git a/.buildpath b/.buildpath
new file mode 100644
index 0000000..8bcb4b5
--- /dev/null
+++ b/.buildpath
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<buildpath>
+	<buildpathentry kind="src" path=""/>
+	<buildpathentry kind="con" path="org.eclipse.php.core.LANGUAGE"/>
+</buildpath>
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..a503fa2
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+/unpackage/
diff --git a/.hbuilderx/launch.json b/.hbuilderx/launch.json
new file mode 100644
index 0000000..ee5be77
--- /dev/null
+++ b/.hbuilderx/launch.json
@@ -0,0 +1,20 @@
+{ // launch.json 配置了启动调试时相关设置，configurations下节点名称可为 app-plus/h5/mp-weixin/mp-baidu/mp-alipay/mp-qq/mp-toutiao/mp-360/
+  // launchtype项可配置值为local或remote, local代表前端连本地云函数，remote代表前端连云端云函数
+    "version": "0.0",
+    "configurations": [{
+     	"app-plus" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"default" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"mp-weixin" : 
+     	{
+     		"launchtype" : "local"
+     	},
+     	"type" : "uniCloud"
+     }
+    ]
+}
diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..10b731c
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,5 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
diff --git a/.idea/UniappTool.xml b/.idea/UniappTool.xml
new file mode 100644
index 0000000..8694db6
--- /dev/null
+++ b/.idea/UniappTool.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="cn.fjdmy.uniapp.UniappProjectDataService">
+    <option name="basePath" value="$PROJECT_DIR$" />
+    <option name="generalBasePath" value="$PROJECT_DIR$" />
+    <option name="manifestPath" value="$PROJECT_DIR$/manifest.json" />
+    <option name="pagesPath" value="$PROJECT_DIR$/pages.json" />
+    <option name="scanNum" value="1" />
+    <option name="type" value="store" />
+    <option name="uniapp" value="true" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/dengLan_home_mpWeixin.iml b/.idea/dengLan_home_mpWeixin.iml
new file mode 100644
index 0000000..24643cc
--- /dev/null
+++ b/.idea/dengLan_home_mpWeixin.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..6db107f
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/dengLan_home_mpWeixin.iml" filepath="$PROJECT_DIR$/.idea/dengLan_home_mpWeixin.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.project b/.project
new file mode 100644
index 0000000..3bf5aad
--- /dev/null
+++ b/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>djh5</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.wst.validation.validationbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.dltk.core.scriptbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.php.core.PHPNature</nature>
+	</natures>
+</projectDescription>
diff --git a/.settings/org.eclipse.php.core.prefs b/.settings/org.eclipse.php.core.prefs
new file mode 100644
index 0000000..d8cdb4a
--- /dev/null
+++ b/.settings/org.eclipse.php.core.prefs
@@ -0,0 +1,3 @@
+eclipse.preferences.version=1
+include_path=0;/djh5
+use_asp_tags_as_php=false
diff --git a/App.vue b/App.vue
new file mode 100644
index 0000000..6ec7375
--- /dev/null
+++ b/App.vue
@@ -0,0 +1,381 @@
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	import $api from "@/api/index.js"
+	import $store from "@/store/index.js"
+	export default {
+		data() {
+			return {
+				timer: null
+			}
+		},
+		async mounted() {
+			// #ifdef H5
+			if (typeof window.entryUrl === 'undefined' || window.entryUrl === '') {
+				window.entryUrl = window.location.href.split('#')[0]
+			}
+			if (window.location.href.indexOf('?#') < 0) {
+				window.location.href = window.location.href.replace("#", "?#");
+			}
+			// #endif
+			console.log('App mounted')
+		},
+		async onLaunch() {
+			let configInfo = uni.getStorageSync('configInfo') || ''
+			if (configInfo) {
+				$store.commit('updateConfigItem', {
+					key: 'configInfo',
+					val: configInfo
+				})
+			}
+			let isGzhLogin = uni.getStorageSync('isGzhLogin') || false
+			$store.commit('updateUserItem', {
+				key: 'isGzhLogin',
+				val: isGzhLogin
+			})
+			console.log('isGzhLogin',isGzhLogin)
+			let arr = ['autograph', 'userInfo', 'location', 'appLogin', 'loginType']
+			
+			arr.map(key => {
+				let val = uni.getStorageSync(key) || ''
+				// #ifdef H5
+				val = isGzhLogin ? val : ''
+				// #endif
+				$store.commit('updateUserItem', {
+					key,
+					val
+				})
+				// #ifdef APP-PLUS
+				if (key == 'userInfo') {
+					$store.commit('updateUserItem', {
+						key: 'isShowLogin',
+						val: val && val.id ? false : true
+					})
+				}
+				// #endif
+			})
+			let {
+				commonOptions
+			} = this
+			let {
+				coach_id = 0
+			} = commonOptions
+			if (coach_id) {
+				commonOptions.coach_id = 0
+				$store.commit('updateUserItem', {
+					key: 'commonOptions',
+					val: commonOptions
+				})
+			}
+			this.initIndex()
+			console.log('App onLaunch')
+		},
+		async onShow() {
+			if (this.timer) {
+				clearInterval(this.timer)
+			}
+			let {
+				coach_position = 0
+			} = this.userInfo
+			let {
+				id: coachId = 0,
+				status = 0
+			} = this.coachInfo
+			if (coach_position == 1) {
+				if (!coachId) {
+					await this.getCoachInfo()
+				}
+				$store.commit('updateUserItem', {
+					key: 'locationChange',
+					val: true
+				})
+			}
+			uni.onNetworkStatusChange((res) => {
+				let {
+					isConnected
+				} = res
+				if (isConnected) return
+				let methodArr = ['updateServiceItem', 'updateTechnicianItem']
+				methodArr.map(item => {
+					$store.commit(item, {
+						key: 'pageActive',
+						val: false
+					})
+				})
+			})
+		},
+		async onHide() {
+			console.log('App Hide')
+			let {
+				coach_position = 0
+			} = this.userInfo
+			let {
+				status = 0
+			} = this.coachInfo
+			if (!coach_position || status != 2) return
+			$store.commit('updateUserItem', {
+				key: 'locationChange',
+				val: false
+			})
+			// #ifdef H5
+			if (this.$jweixin.isWechat()) {
+				await this.$jweixin.wxReady2();
+				this.toHidePage()
+				this.timer = setInterval(() => {
+					this.toHidePage()
+				}, 60000)
+			}
+			// #endif
+		},
+		onUnload() {
+			uni.offLocationChange((res) => {
+				console.log("====offLocationChange onUnload", res)
+			})
+		},
+		watch: {
+			locationChange(newVal, oldVal) {
+				if (newVal) {
+					uni.startLocationUpdate({
+						complete: msg => console.log(`startLocationUpdate API complete`, msg)
+					})
+				} else {
+					uni.stopLocationUpdate({
+						complete: msg => console.log(`stopLocationUpdate API complete`, msg)
+					})
+				}
+			},
+			'configInfo.attendant_name'(newVal, oldVal) {
+				if (newVal) {
+					this.mergeLocaleMessage()
+				}
+			}
+
+		},
+		computed: mapState({
+			configInfo: state => state.config.configInfo,
+			old_attendant_name: state => state.config.old_attendant_name,
+			commonOptions: state => state.user.commonOptions,
+			locationChange: state => state.user.locationChange,
+			locationChangeUnix: state => state.user.locationChangeUnix,
+			userInfo: state => state.user.userInfo,
+			coachInfo: state => state.user.coachInfo,
+		}),
+		methods: {
+			...mapActions(['getConfigInfo', 'getUserInfo', 'getCoachInfo']),
+			async initIndex() {
+				
+				let that = this
+				let {
+					coach_position = 0
+				} = that.userInfo
+				uni.onLocationChange((res) => {
+					console.log("====onLocationChange", res)
+					let {
+						latitude: lat,
+						longitude: lng
+					} = res
+					that.toChangeLocation({
+						lat,
+						lng
+					})
+				})
+				if (coach_position == 1) {
+					let {
+						id: coachId = 0
+					} = that.coachInfo
+					if (!coachId) {
+						await that.getCoachInfo()
+					}
+					$store.commit('updateUserItem', {
+						key: 'locationChange',
+						val: true
+					})
+				}
+				let {
+					primaryColor = '',
+						plugAuth = {},
+						tabBar = []
+				} = that.configInfo
+				let mineInd = tabBar.findIndex(item => {
+					return item.id == 5
+				})
+				console.log(mineInd, "======mineInd")
+				// if ((primaryColor && plugAuth.length > 0) || mineInd != -1) return
+				await that.getConfigInfo()
+			},
+			async mergeLocaleMessage() {
+				let zh = JSON.parse(JSON.stringify(this.$i18n.messages.zh))
+				let {
+					attendant_name: name,
+				} = this.configInfo
+				let oldName = this.old_attendant_name
+				let reg = new RegExp(oldName, 'g')
+				for (let i in zh.action) {
+					if (zh.action[i].includes(oldName)) {
+						zh.action[i] = zh.action[i].replace(reg, name)
+					}
+				}
+				this.$i18n.mergeLocaleMessage('zh', zh)
+				$store.commit('updateConfigItem', {
+					key: 'old_attendant_name',
+					val: name
+				})
+				// console.log(this.$t('action.attendantName'), this.$i18n.messages.zh, "=====");
+			},
+			async toHidePage() {
+				let {
+					latitude: lat,
+					longitude: lng
+				} = await this.$jweixin.getWxLocation()
+				if (lat && lng) {
+					let val = this.$util.DateToUnix(this.$util.formatTime(new Date(), 'YY-M-D h:m:s'))
+					$store.commit('updateUserItem', {
+						key: 'locationChangeUnix',
+						val
+					})
+					this.toChangeLocation({
+						lat,
+						lng
+					})
+				}
+			},
+			async toChangeLocation(param) {
+				let {
+					lat,
+					lng
+				} = param
+				let {
+					id = 0,
+						coach_position = 0
+				} = this.userInfo
+				let {
+					lat: coach_lat,
+					lng: coach_lng,
+					status = 0
+				} = this.coachInfo
+				let {
+					locationChangeUnix
+				} = this
+				let curUnix = this.$util.DateToUnix(this.$util.formatTime(new Date(), 'YY-M-D h:m:s'))
+				let second = 3
+				// #ifdef APP-PLUS
+				second = 1
+				// #endif
+				// console.log(curUnix, locationChangeUnix, curUnix - locationChangeUnix,
+				// 	"=====curUnix - locationChangeUnix")
+				let isMin = curUnix - locationChangeUnix <= second || curUnix - locationChangeUnix >= 60
+				let isSame = coach_lat * 1 == lat && coach_lng * 1 == lng
+				// console.log(lat, lng, coach_position, isMin, isSame, "=====lat, lng, coach_position, isMin")
+				if (!coach_position || status != 2 || !isMin || isSame) return
+
+				let val = this.$util.DateToUnix(this.$util.formatTime(new Date(), 'YY-M-D h:m:s'))
+				$store.commit('updateUserItem', {
+					key: 'locationChangeUnix',
+					val
+				})
+
+				let key = `${lat},${lng}`
+				try {
+					let data = await this.$api.base.getMapInfo({
+						location: key
+					})
+					let {
+						status,
+						result
+					} = JSON.parse(data)
+					if (status == 0) {
+						let {
+							address
+						} = result
+						console.log("toChangeLocation==>", `${lat}-${lng}-${address}`)
+						await this.$api.technician.coachUpdate({
+							lat,
+							lng,
+							address
+						})
+						await this.getCoachInfo()
+					}
+				} catch (e) {
+					console.log('=====getMapInfo catch')
+					uni.stopLocationUpdate({
+						complete: msg => console.log(`stopLocationUpdate API complete`, msg)
+					})
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "/styles/index.wxss";
+
+	/* #ifdef H5 */
+	uni-page-head {
+		display: none;
+	}
+
+	/* #endif */
+
+	page {
+		font-size: 28rpx;
+		color: #222;
+		line-height: 1.5;
+		background: #F6F6F6;
+		font-family: -apple-system-font, Helvetica Neue, Helvetica, sans-serif;
+	}
+
+	input {
+		// font-family: PingFangSC-Medium, PingFang SC, -apple-system-font, Helvetica Neue, Helvetica, sans-serif;
+	}
+
+	input::-webkit-input-placeholder {
+		/* WebKit browsers */
+		color: #A9A9A9;
+	}
+
+	input:-moz-placeholder {
+		/* Mozilla Firefox 4 to 18 */
+		color: #A9A9A9;
+	}
+
+	input::-moz-placeholder {
+		/* Mozilla Firefox 19+ */
+		color: #A9A9A9;
+	}
+
+	input:-ms-input-placeholder {
+		/* Internet Explorer 10+ */
+		color: #A9A9A9;
+	}
+
+	view {
+		box-sizing: border-box;
+	}
+
+	image {
+		display: block;
+	}
+
+	.h5-image {
+		background-position: center center;
+		background-size: cover;
+		background-repeat: no-repeat;
+	}
+
+	/*隐藏滚动条*/
+	::-webkit-scrollbar {
+		width: 0;
+		height: 0;
+		color: transparent;
+	}
+
+	/* #ifdef MP-BAIDU */
+	.swan-button.swan-button-radius-ios {
+		border-radius: 0;
+	}
+
+	/* #endif */
+</style>
\ No newline at end of file
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..e69de29
diff --git a/agent/pages/account.vue b/agent/pages/account.vue
new file mode 100644
index 0000000..753085c
--- /dev/null
+++ b/agent/pages/account.vue
@@ -0,0 +1,135 @@
+<template>
+	<view class="agent-account pd-lg" v-if="isLoad">
+
+		<view class="pt-md pb-md c-title text-bold" style="font-size:34rpx">账号信息</view>
+
+		<view class="flex-warp pb-lg">
+			<view class="f-paragraph">账号名称</view>
+			<view class="f-desc">{{detail.username}}</view>
+		</view>
+		<view class="flex-warp pb-lg">
+			<view class="f-paragraph">账号密码</view>
+			<view class="f-desc">{{detail.passwd_text | handlePassWord}}</view>
+		</view>
+		<view class="flex-warp pb-lg">
+			<view class="f-paragraph">真实姓名</view>
+			<view class="f-desc">{{detail.agent_name}}</view>
+		</view>
+		<view class="flex-warp pt-lg pb-lg b-1px-t">
+			<view class="f-paragraph">当前等级</view>
+			<view class="f-desc">{{cityType[detail.city_type]}}代理({{detail.city_name}})</view>
+		</view>
+		<!-- 省/市 查下级；区县查上级 -->
+		<view class="flex-warp pb-lg" v-if="detail.city_type != 3">
+			<view class="f-paragraph">关联上级代理</view>
+			<view class="f-desc">
+				{{detail.top_data && detail.top_data.hasOwnProperty('username')?detail.top_data.username:'-'}}
+			</view>
+		</view>
+		<view class="flex-warp pb-lg" v-if="detail.city_type != 2">
+			<view class="f-paragraph">关联下级代理</view>
+			<view class="f-desc">
+				<block v-if="detail.sub_data.length==0">-</block>
+				<view class="mb-sm" v-for="(item,index) in detail.sub_data" :key="index">{{item.agent_name}}</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		data() {
+			return {
+				isLoad: false,
+				detail: {},
+				cityType: {
+					1: '城市',
+					2: '区县',
+					3: '省'
+				},
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			commonOptions: state => state.user.commonOptions,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad() {
+			this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		methods: {
+			...mapMutations([]),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				this.$util.showLoading()
+				this.detail = await this.$api.agent.adminInfoData()
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				this.isLoad = true
+				this.$util.hideAll()
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			toJump(key, index) {
+				let {
+					url
+				} = this[key][index]
+				this.$util.goUrl({
+					url
+				})
+			},
+		},
+		filters: {
+			handlePassWord(val) {
+				let len = val.length
+				let text = val.substring(0, len > 6 ? 3 : 1) + '***'
+				text += val.substring(len == 6 ? len - 2 : len - 3, len)
+				return text
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	page {
+		background: #fff
+	}
+
+	.agent-account {
+
+		.f-paragraph {
+			width: 200rpx;
+			color: #4A4A4A;
+		}
+
+		.f-desc {
+			width: 490rpx;
+			color: #777777;
+		}
+
+	}
+</style>
\ No newline at end of file
diff --git a/agent/pages/apply.vue b/agent/pages/apply.vue
new file mode 100644
index 0000000..868e0b5
--- /dev/null
+++ b/agent/pages/apply.vue
@@ -0,0 +1,315 @@
+<template>
+	<view class="apply-pages" v-if="isLoad">
+
+		<view class="page-height" v-if="mineInfo.is_admin">
+			<abnor percent="150%" @confirm="$util.goUrl({url:`/agent/pages/index?agent=1`,openType: `reLaunch`})"
+				title="您已经是代理商了" :tip="[{ text: '快去管理订单吧', color: 0 }]" :button="[{ text: '去管理', type: 'confirm' }]"
+				image="https://lbqny.migugu.com/admin/public/apply_suc.jpg"></abnor>
+		</view>
+
+		<block v-else>
+
+			<view class="apply-info-box rel" :style="{background:primaryColor}">
+				<image class="bg-1 abs" src="https://lbqny.migugu.com/admin/anmo/apply/bg-4.png">
+				</image>
+				<image class="bg-2 abs" src="https://lbqny.migugu.com/admin/anmo/apply/bg-3.png">
+				</image>
+				<image class="join-us abs" src="https://lbqny.migugu.com/admin/anmo/apply/join-us-1.png">
+				</image>
+				<view class="join-us pd-lg abs" style="z-index: 3;">
+					<view style="height:90rpx"></view>
+					<view class="f-title c-title text-bold">您的姓名</view>
+					<input v-model="form.user_name" type="text"
+						class="item-input fill-base f-mini-title c-title mt-sm pl-lg pr-lg radius-10" maxlength="20"
+						placeholder-class="c-caption" :placeholder="rule[0].errorMsg"
+						:style="{borderColor:primaryColor}" />
+					<view class="mt-md f-title c-title text-bold">代理类型</view>
+					<view class="flex-y-center mt-sm">
+						<view @tap.stop="form.city_type = item.id" class="flex-y-center f-mini-title c-title"
+							:class="[{'mr-lg pr-lg':index!=2}]"
+							:style="{color:form.city_type == item.id ? primaryColor:''}"
+							v-for="(item,index) in cityList" :key="index"><i class="iconfont mr-sm"
+								:class="[{'icon-xuanze':form.city_type != item.id},{'icon-radio-fill':form.city_type == item.id}]"></i>{{item.title}}代理
+						</view>
+					</view>
+					<view class="mt-md f-title c-title text-bold">手机号</view>
+					<view class="item-input fill-base f-mini-title c-title mt-sm pl-lg pr-lg radius-10"
+						style="height:auto;min-height:82rpx" :style="{borderColor:primaryColor}">
+						<input v-model="form.phone" type="text" maxlength="20" placeholder-class="c-caption"
+							:placeholder="rule[1].errorMsg" style="margin-top: 15rpx;" />
+						<view class="flex-between" v-if="configInfo.short_code_status">
+							<input v-model="form.short_code" type="text" maxlength="6" placeholder-class="c-caption"
+								placeholder="请输入验证码" :style="{borderColor:primaryColor}" />
+							<view @tap.stop="toSend" :style="{color:primaryColor}">
+								{{authTime>0?`重新获取(${authTime}s)`:'获取验证码'}}
+							</view>
+						</view>
+					</view>
+					<view class="mt-md f-title c-title text-bold">申请加入的区域</view>
+					<input v-model="form.city" type="text"
+						class="item-input fill-base f-mini-title c-title mt-sm pl-lg pr-lg radius-10" maxlength="50"
+						placeholder-class="c-caption" :placeholder="rule[2].errorMsg"
+						:style="{borderColor:primaryColor}" />
+				</view>
+				<image @tap.stop="submit" class="submit abs"
+					src="https://lbqny.migugu.com/admin/anmo/apply/submit-1.png">
+				</image>
+			</view>
+		</block>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		data() {
+			return {
+				isLoad: false,
+				options: {},
+				authTime: 0,
+				timer: null,
+				cityList: [{
+					id: 3,
+					title: '省'
+				}, {
+					id: 1,
+					title: '城市'
+				}, {
+					id: 2,
+					title: '区县'
+				}],
+				form: {
+					user_name: '', //姓名 
+					city_type: 3,
+					phone: '', //手机号 
+					short_code: '',
+					city: ''
+				},
+				rule: [{
+						name: "user_name",
+						checkType: "isNotNull",
+						errorMsg: "输入您的姓名",
+						regType: 2
+					},
+					{
+						name: "phone",
+						checkType: "isMobile",
+						errorMsg: "输入手机号"
+					},
+					{
+						name: "city",
+						checkType: "isNotNull",
+						errorMsg: "请输入您想代理的区域"
+					}
+				],
+				lockTap: false
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			mineInfo: state => state.user.mineInfo,
+		}),
+		async onLoad(options) {
+			this.options = options
+			this.$util.showLoading()
+			await this.initIndex()
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getMineInfo']),
+			...mapMutations(['updateUserItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				if (!this.configInfo.id || !this.configInfo.hasOwnProperty(
+						'plugAuth') || (this.configInfo.hasOwnProperty(
+						'plugAuth') && !this.configInfo.plugAuth.hasOwnProperty(
+						'store')) || refresh) {
+					await this.getConfigInfo()
+				}
+				await this.getMineInfo()
+				let {
+					is_admin = 0
+				} = this.mineInfo
+				uni.setNavigationBarTitle({
+					title: is_admin ? '' : '招商加盟'
+				})
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				this.$util.hideAll()
+				this.isLoad = true
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			// 发送验证码
+			async toSend() {
+				let {
+					authTime
+				} = this
+				if (authTime) return
+				let {
+					phone = ''
+				} = this.form
+				if (phone == null || !/^(1[0-9]{10})$/.test(phone)) {
+					this.$util.showToast({
+						title: phone == null ? `请输入手机号` : `${phone} 手机号无效`
+					});
+					return;
+				}
+				if (this.lockTap) return
+				this.lockTap = true
+				this.$util.showLoading()
+				try {
+					await this.$api.user.sendShortMsg({
+						phone
+					})
+					this.$util.hideAll()
+					this.lockTap = false
+					let time = 60
+					this.timer = setInterval(() => {
+						if (time === 0) {
+							clearInterval(this.timer)
+							return
+						}
+						time--
+						this.authTime = time
+					}, 1000)
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+			},
+			//表单验证
+			validate(param) {
+				let validate = new this.$util.Validate();
+				this.rule.map(item => {
+					let {
+						name,
+					} = item
+					validate.add(param[name], item);
+				})
+				let message = validate.start();
+				return message;
+			},
+			async submit() {
+				let param = this.$util.deepCopy(this.form)
+				let msg = this.validate(param);
+				if (msg) {
+					this.$util.showToast({
+						title: msg
+					});
+					return;
+				}
+				let {
+					short_code_status
+				} = this.configInfo
+				if (short_code_status && (param.short_code == null || param.short_code.length != 6)) {
+					this.$util.showToast({
+						title: `请输入6位数短信验证码`
+					})
+					return
+				}
+				if (!short_code_status) {
+					delete param.short_code
+				}
+				if (this.lockTap) return
+				this.lockTap = true
+				this.$util.showLoading()
+				try {
+					await this.$api.agent.agentApply(param)
+					this.$util.hideAll()
+					this.$util.showToast({
+						title: `提交成功，即将跳转个人中心`,
+					})
+					if (this.timer) {
+						clearInterval(this.timer)
+					}
+					setTimeout(() => {
+						if (getCurrentPages().length > 1) {
+							this.$util.back()
+						}
+						this.$util.goUrl({
+							url: '/pages/mine',
+							openType: `reLaunch`
+						})
+					}, 2000)
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.apply-info-box {
+		width: 100%;
+		height: 1632rpx;
+
+		.bg-1 {
+			width: 750rpx;
+			height: 1632rpx;
+			top: 0;
+			left: 0;
+			z-index: 1;
+		}
+
+		.bg-2 {
+			width: 750rpx;
+			height: 575rpx;
+			top: 0;
+			left: 0;
+			z-index: 3;
+		}
+
+		.join-us {
+			width: 671rpx;
+			height: 890rpx;
+			top: 482rpx;
+			left: 44rpx;
+			z-index: 2;
+
+			.item-input {
+				height: 74rpx;
+				border: 4rpx solid #069F5E;
+
+				.flex-between {
+					height: 74rpx;
+				}
+			}
+
+			.item-input.text {
+				height: 82rpx;
+			}
+		}
+
+		.submit {
+			width: 662rpx;
+			height: 93rpx;
+			top: 1400rpx;
+			left: 47rpx;
+			z-index: 2;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/agent/pages/income/commission.vue b/agent/pages/income/commission.vue
new file mode 100644
index 0000000..8d2cc6c
--- /dev/null
+++ b/agent/pages/income/commission.vue
@@ -0,0 +1,576 @@
+<template>
+	<view class="agent-income-commission" v-if="isLoad">
+
+
+		<fixed @height="initFixHeight" zIndex="997">
+			<view class="record-search-info fill-body pt-md pl-md c-base">
+				<view class="record-info radius-32" :style="{background:primaryColor}">
+					<view class="search-item flex-between ml-lg mr-lg f-desc b-1px-b">
+						<view>查询时间</view>
+						<view @tap.stop="toShowTimePopup($event)" class="flex-y-center">
+							{{ prev_time | handleTimeText(1) }}<i class="iconfont icon-right"></i>
+						</view>
+					</view>
+					<view class="search-item flex-between ml-lg mr-lg f-desc">
+						<view>入账状态</view>
+						<view @tap.stop="$refs.show_status_item.open()" class="flex-y-center">
+							{{typeList[typeIndex].title}}<i class="iconfont icon-right"></i>
+						</view>
+					</view>
+				</view>
+			</view>
+		</fixed>
+
+		<block v-for="(item,index) in list.data" :key="index">
+			<view @tap.stop="toShowTimePopup($event,item.month)" class="count-item fill-body pl-md pr-md"
+				v-if="prev_time.activeIndex==0 && (index==0 || (index>0&&item.month!=list.data[index-1].month))">
+				<veiw class="title flex-y-center">
+					<view class="f-title c-title text-bold">{{item.month}}</view>
+					<i class="iconfont iconxia"></i>
+				</veiw>
+				<view class="f-caption c-caption">获得总提成¥{{item.total_cash}}（{{cityType[item.my_city_type]}}代理）
+				</view>
+			</view>
+			<view @tap.stop="toShowTimePopup($event,item.month)" class="count-item fill-body pl-md pr-md"
+				v-if="prev_time.activeIndex==1 && index==0">
+				<veiw class="title flex-y-center">
+					<view class="f-title c-title text-bold">{{prev_time | handleTimeText(2)}}</view>
+					<i class="iconfont iconxia"></i>
+				</veiw>
+				<view class="f-caption c-caption">获得总提成¥{{item.total_cash}}（{{cityType[item.my_city_type]}}代理）
+				</view>
+			</view>
+
+			<view class="list-item ml-md mr-md fill-base radius-16" :class="[{'mt-md':index!==0}]">
+				<view class="flex-between pt-lg pb-lg ml-lg mr-lg b-1px-b">
+					<view class="flex-y-center f-caption c-caption">{{$t('action.attendantName')}}
+						<view class="f-paragraph c-title text-bold ml-md max-380 ellipsis">
+							{{item.coach_info.coach_name}}
+						</view>
+					</view>
+					<view class="f-paragraph text-bold" :style="{color:item.status==1?subColor:primaryColor}">
+						{{statusType[item.have_tx]}}
+					</view>
+				</view>
+				<view class="pd-lg f-caption">
+					<view class="flex-warp">
+						<view class="item-text c-paragraph">创建时间: </view>
+						<view class="c-title">{{item.create_time}}</view>
+					</view>
+					<view class="flex-warp mt-md">
+						<view class="item-text c-paragraph">服务时间: </view>
+						<view class="c-title">{{item.start_time}}</view>
+					</view>
+					<view class="flex-warp mt-md">
+						<view class="item-text c-paragraph">项目: </view>
+						<view class="c-title" style="max-width:410rpx">
+							<view :class="[{'mt-md':aindex!=0}]" v-for="(aitem,aindex) in item.order_goods"
+								:key="aindex">
+								{{aitem.goods_name}}
+							</view>
+						</view>
+					</view>
+					<view class="flex-warp mt-md">
+						<view class="item-text c-paragraph">订单实际支付价格: </view>
+						<view class="flex-y-center c-title">
+							<view class="mr-sm">¥{{item.pay_price}}</view>
+							<block v-if="item.true_car_price*1>0">(含车费¥{{item.true_car_price}})</block>
+						</view>
+					</view>
+					<view class="flex-warp mt-lg pt-md">
+						<view class="item-text c-paragraph">{{$t('action.attendantName')}}分成: </view>
+						<view class="c-title" :style="{color:primaryColor}">¥{{item.coach_cash}}</view>
+					</view>
+					<view class="flex-warp mt-md" v-for="(aitem,aindex) in item.admin_cash_list" :key="aindex">
+						<view class="item-text c-paragraph">{{cityType[aitem.city_type]}}代理分成: </view>
+						<view class="c-title" :style="{color:primaryColor}">¥{{aitem.cash}}</view>
+					</view>
+				</view>
+			</view>
+
+		</block>
+
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+
+		<view class="space-footer"></view>
+
+
+
+		<uni-popup ref="show_choose_time" type="bottom">
+			<view class="popup-choose-time fill-base">
+				<view class="pl-lg pr-lg">
+					<view class="flex-between b-1px-b">
+						<tab @change="handerTabChange" :list="tabList" :activeIndex="activeIndex*1"
+							:activeColor="primaryColor" height="100rpx"></tab>
+						<i @tap.stop="toClose" class="iconfont icon-close"></i>
+					</view>
+					<view class="flex-center mt-md pt-lg pb-lg">
+						<view class="flex-1 flex-y-baseline">
+							<view class="f-paragraph c-title text-bold">{{activeIndex==0?'选择月份':'自定义时间'}}</view>
+							<view class="f-caption c-warning ml-sm" v-if="activeIndex==1">最长可查找时间跨度一年的交易</view>
+						</view>
+						<view class="f-paragraph" @tap.stop="toReset" style="color: #5A677E;"
+							v-if="(activeIndex==0&&check_time.month) || (activeIndex==1&&(check_time.start_time || check_time.end_time))">
+							清除</view>
+					</view>
+					<view class="flex-center pb-lg" v-if="activeIndex==0">
+						<view @tap.stop="toShowTime('month')" class="item-child flex-center flex-column">
+							<view>开始月份</view>
+							<view class="mt-sm" :style="{color:check_time.month ? primaryColor : '#999'}">
+								{{check_time.month || '选择月份'}}
+							</view>
+						</view>
+					</view>
+					<view class="flex-center pb-lg" v-if="activeIndex==1">
+						<view @tap.stop="toShowTime('start_time')" class="item-child flex-center flex-column">
+							<view>开始时间</view>
+							<view class="mt-sm" :style="{color:check_time.start_time ? primaryColor : '#999'}">
+								{{check_time.start_time || '选择时间'}}
+							</view>
+						</view>
+						<view @tap.stop="toShowTime('end_time')" class="item-child flex-center flex-column  b-1px-l">
+							<view>结束时间</view>
+							<view class="mt-sm" :style="{color:check_time.end_time ? primaryColor : '#999'}">
+								{{check_time.end_time || '选择时间'}}
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="flex-center flex-column fill-body">
+					<view class="space-lg"></view>
+					<view @tap.stop="toConfirm" class="confirm-btn flex-center f-title c-base radius-16"
+						:style="{background: primaryColor}">确定</view>
+					<view class="space-lg"></view>
+					<view class="space-safe"></view>
+				</view>
+			</view>
+		</uni-popup>
+
+		<w-picker mode="date" :startYear="startYear*1-10" :endYear="startYear"
+			:value="activeIndex == 0 ?curMonth:curDay" :current="false" :fields="activeIndex == 0 ?'month':'day'"
+			@confirm="onConfirm($event)" :disabled-after="false" ref="day" :themeColor="primaryColor"
+			:visible.sync="showDate">
+		</w-picker>
+
+		<uni-popup type="bottom" ref="show_status_item" :custom="true">
+			<view class="popup-status pd-lg fill-base">
+				<view @tap.stop="handerTypeChange(index)" class="flex-center f-paragraph mb-lg"
+					:class="[{'mt-lg':index==0}]" :style="{color:typeIndex==index?primaryColor:''}"
+					v-for="(item,index) in typeList" :key="index">
+					{{item.title}}
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	import $util from "@/utils/index.js"
+	import wPicker from "@/components/w-picker/w-picker.vue";
+	export default {
+		components: {
+			wPicker
+		},
+		data() {
+			return {
+				isLoad: false,
+				popupHeight: '',
+				curDay: '',
+				curMonth: '',
+				startYear: '',
+				showKey: '',
+				showDate: false,
+				time_text: '',
+				prev_time: {
+					activeIndex: 0,
+					month: '',
+					start_time: '',
+					end_time: ''
+				},
+				check_time: {
+					activeIndex: 0,
+					month: '',
+					start_time: '',
+					end_time: ''
+				},
+				activeIndex: 0,
+				tabList: [{
+					id: 1,
+					title: '月份选择'
+				}, {
+					id: 2,
+					title: '自定义时间'
+				}],
+				typeIndex: 0,
+				typeList: [{
+					title: '全部',
+					id: -1
+				}, {
+					title: '未到账',
+					id: 0,
+				}, {
+					title: '已到账',
+					id: 1
+				}],
+				statusType: {
+					0: '未到账',
+					1: '已到账'
+				},
+				cityType: ['', '城市', '区县', '省'],
+				param: {
+					page: 1,
+					start_time: '',
+					end_time: ''
+				},
+				list: {
+					data: []
+				},
+				loading: true,
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+		}),
+		async onLoad() {
+			this.$util.showLoading()
+			let cur_time = new Date(Math.ceil(new Date().getTime()))
+			this.curDay = this.$util.formatTime(cur_time, 'YY-M-D')
+			this.curMonth = this.$util.formatTime(cur_time, 'YY-M')
+			this.startYear = this.$util.formatTime(cur_time, 'YY')
+			await this.initIndex()
+			this.isLoad = true
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			...mapMutations([]),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				await this.getList()
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			async getList(page) {
+				if (page) {
+					this.param.page = 1
+					this.list.data = []
+					uni.pageScrollTo({
+						scrollTop: 0
+					})
+				}
+				let {
+					list: oldList,
+					param,
+					activeIndex,
+					typeIndex,
+					typeList
+				} = this
+				let {
+					id
+				} = typeList[typeIndex]
+				if (id != -1) {
+					param.have_tx = id
+				}
+				let {
+					month,
+					start_time,
+					end_time
+				} = this.$util.deepCopy(this.check_time)
+				if (activeIndex == 0) {
+					param.month = month ? this.$util.DateToUnix(`${month}-01`) : ''
+				}
+				if (activeIndex == 1) {
+					param.start_time = start_time && end_time ? this.$util.DateToUnix(start_time) : ''
+					param.end_time = start_time && end_time ? this.$util.DateToUnix(end_time) + 24 * 3600 - 1 : ''
+				}
+				let newList = await this.$api.agent.commList(param);
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+			},
+			initFixHeight(val) {
+				this.popupHeight = val
+			},
+			handerTabChange(index) {
+				this.activeIndex = index
+				this.check_time.activeIndex = index
+			},
+			handerTypeChange(index) {
+				this.typeIndex = index
+				this.getList(1)
+				this.$refs.show_status_item.close()
+			},
+			toChangeType(index) {
+				this.active = index
+			},
+			toShowTimePopup(e, month = 0) {
+				this.check_time = this.$util.deepCopy(this.prev_time)
+				if (month && month != 0) {
+					this.activeIndex = 0
+					this.curMonth = month
+					this.check_time.month = month
+				}
+				this.activeIndex = this.check_time.activeIndex
+				this.$refs.show_choose_time.open()
+			},
+			toReset() {
+				let {
+					activeIndex
+				} = this
+				if (activeIndex == 0) {
+					this.check_time.month = ''
+					return
+				}
+				this.check_time.start_time = ''
+				this.check_time.end_time = ''
+				this.getList(1)
+			},
+			async toClose() {
+				let {
+					activeIndex
+				} = this
+				let {
+					month,
+					start_time,
+					end_time
+				} = this.check_time
+
+				if ((activeIndex == 0 && !month) || (activeIndex == 1 && (!start_time || !end_time))) {
+					if (activeIndex == 1 && (!start_time || !end_time)) {
+						this.activeIndex = 0
+						this.check_time.activeIndex = 0
+						this.check_time.month = ''
+					}
+					this.prev_time = this.$util.deepCopy(this.check_time)
+				}
+				if ((activeIndex == 0 && month) || (activeIndex == 1 && (start_time && end_time))) {
+					this.check_time = this.$util.deepCopy(this.prev_time)
+				}
+				this.$refs.show_choose_time.close()
+				this.getList(1)
+			},
+			toShowTime(key) {
+				let {
+					activeIndex
+				} = this
+				if (activeIndex == 1 && key == 'end_time' && !this.check_time.start_time) {
+					this.$util.showToast({
+						title: `请选择开始时间`
+					})
+					return
+				}
+				let showTime = this.check_time[key]
+				if (showTime) {
+					if (key == 'month') {
+						this.curMonth = showTime
+					} else {
+						this.curDay = showTime
+					}
+				}
+				this.showKey = key
+				this.showDate = true
+			},
+			async onConfirm(val) {
+				let {
+					start_time,
+					end_time
+				} = this.check_time
+				let {
+					showKey,
+					activeIndex = 0
+				} = this
+				let show_unit = this.$util.DateToUnix(showKey == 'month' ? `${val.result}-01` : val.result)
+				let start_unit = start_time ? this.$util.DateToUnix(start_time) : 0
+				let end_unit = end_time ? this.$util.DateToUnix(end_time) : 0
+				let cur_month = this.$util.formatTime(new Date(Math.ceil(new Date().getTime())), 'YY-M-D')
+				let cur_unit = this.$util.DateToUnix(cur_month) + 1
+
+				let msgType = {
+					month: '开始月份',
+					start_time: '开始时间',
+					end_time: '结束时间',
+				}
+
+				if (show_unit > cur_unit) {
+					this.$util.showToast({
+						title: `${msgType[showKey]}不能选择未来时间哦`
+					})
+					return
+				}
+
+				if (activeIndex == 1 && ((showKey == 'start_time' && end_unit && end_unit < this.$util.DateToUnix(val
+							.result)) ||
+						(showKey == 'end_time' && start_unit && start_unit > this.$util.DateToUnix(val.result)))) {
+					this.$util.showToast({
+						title: `结束时间不能小于开始时间`
+					})
+					return
+				}
+				this.check_time[showKey] = val.result
+			},
+			async toConfirm() {
+				let {
+					month = '',
+						start_time = '',
+						end_time = ''
+				} = this.check_time
+				let {
+					activeIndex = 0
+				} = this
+				let start_unit = this.$util.DateToUnix(start_time) * 1000
+				let end_unit = this.$util.DateToUnix(end_time) * 1000
+
+				if (activeIndex == 0 && !month) {
+					this.$util.showToast({
+						title: `请选择开始月份`
+					})
+					return
+				}
+				if (activeIndex == 1 && (!start_time || !end_time || (end_unit -
+						start_unit > 365 * 24 * 3600 * 1000))) {
+					this.$util.showToast({
+						title: !start_time ? `请选择开始时间` : !end_time ? `请选择结束时间` : `查询时间跨度最长为一年哦`
+					})
+					return
+				}
+				this.check_time.activeIndex = activeIndex
+				this.prev_time = this.$util.deepCopy(this.check_time)
+				this.$refs.show_choose_time.close()
+				if (activeIndex == 1) {
+					await this.getCount()
+				}
+				this.getList(1)
+			}
+		},
+		filters: {
+			handleTimeText(val, type) {
+				let text = '请选择'
+				let {
+					activeIndex,
+					month,
+					start_time,
+					end_time
+				} = val
+				if (activeIndex == 0 && month) {
+					text = $util.formatTime($util.DateToUnix(`${month}-01`) * 1000, 'YY年M月')
+				}
+				let formatType = type == 1 ? 'YY.M.D' : 'YY年M月D日'
+				if (activeIndex == 1 && start_time && end_time) {
+					text = $util.formatTime($util.DateToUnix(start_time) * 1000, formatType) + ' - ' +
+						$util.formatTime($util.DateToUnix(end_time) * 1000, formatType)
+				}
+				return text
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.agent-income-commission {
+
+		.record-search-info {
+			width: 750rpx;
+			// height: 200rpx;
+
+			.record-info {
+				width: 710rpx;
+
+				.search-item {
+					height: 100rpx;
+
+					.text {
+						color: #3D2C1B;
+					}
+
+					.iconfont {
+						font-size: 26rpx;
+					}
+				}
+
+			}
+		}
+
+
+		.count-item {
+			height: 120rpx;
+
+			.title {
+				padding-top: 18rpx;
+
+				.iconfont {
+					font-size: 16rpx;
+				}
+			}
+
+		}
+
+
+		.list-item {
+			.item-text {
+				width: 240rpx;
+			}
+		}
+
+		.popup-choose-time {
+			width: 750rpx;
+			border-radius: 30rpx 30rpx 0 0;
+
+			.icon-close {
+				color: #A8AEB8;
+				font-size: 40rpx;
+			}
+
+			.item-child {
+				width: 50%;
+			}
+
+			.confirm-btn {
+				width: 670rpx;
+				height: 100rpx;
+			}
+
+		}
+
+		.popup-status {
+			width: 750rpx;
+			height: 360rpx;
+			border-radius: 30rpx 30rpx 0 0;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/agent/pages/index.vue b/agent/pages/index.vue
new file mode 100644
index 0000000..efc49af
--- /dev/null
+++ b/agent/pages/index.vue
@@ -0,0 +1,653 @@
+<template>
+	<view class="agent-index" v-if="isLoad">
+		<block v-if="options.agent">
+			<view class="mine-count-list c-base pd-lg radius-16" :style="{background:primaryColor}">
+				<view class="flex-between">
+					<view>
+						<view class="text flex-center f-caption">可提现(元)</view>
+						<view class="f-sm-title">{{detail.cash}} </view>
+					</view>
+					<view @tap.stop="$util.goUrl({url:`/user/pages/cash-out?type=agent`})"
+						class="cash-out-btn fill-base flex-center f-desc text-bold radius"
+						:style="{color: primaryColor}">
+						我要提现
+					</view>
+				</view>
+				<view class="count-data-list flex-x-center mt-lg pt-lg b-1px-t">
+					<view class="list-item flex-center flex-column">
+						<view class="f-sm-title">{{detail.total_cash}}</view>
+						<view class="text f-caption c-caption">总金额 (元)</view>
+					</view>
+					<view class="list-item flex-center flex-column">
+						<view class="f-sm-title">{{detail.unrecorded_cash}}</view>
+						<view @tap.stop="$refs.show_rule_item.open()" class="text flex-center f-caption c-caption">未入账
+							(元)<i class="iconfont iconshuyi_shuoming ml-sm"></i></view>
+					</view>
+				</view>
+			</view>
+
+			<view @tap.stop="$util.goUrl({url:`/user/pages/distribution/bind-technician`})"
+				class="mine-menu-list share flex-center fill-base radius-16">
+				<view class="icon-info flex-center">
+					<i class="iconfont iconjishi1" :style="{color:primaryColor}"></i>
+				</view>
+				<view class="flex-1">
+					<view class="f-mini-title c-title text-bold">绑定{{$t('action.attendantName')}}</view>
+					<view class="f-desc c-caption mt-sm ellipsis">整合自己的{{$t('action.attendantName')}}资源,获取分润</view>
+				</view>
+				<view class="share-btn flex-center f-desc c-base text-bold" :style="{background:primaryColor}">邀请Ta
+				</view>
+			</view>
+			<view @tap.stop="$util.goUrl({url:`/agent/pages/poster/salesman`})"
+				class="mine-menu-list share flex-center fill-base radius-16" v-if="detail.salesman_auth">
+				<view class="icon-info flex-center">
+					<i class="iconfont iconbangdingyewuyuan" :style="{color:primaryColor}"></i>
+				</view>
+				<view class="flex-1">
+					<view class="f-mini-title c-title text-bold">绑定业务员</view>
+					<view class="f-desc c-caption mt-sm ellipsis">招揽人才,为自己拓宽渠道</view>
+				</view>
+				<view class="share-btn flex-center f-desc c-base text-bold" :style="{background:primaryColor}">邀请Ta
+				</view>
+			</view>
+			<view @tap.stop="$util.goUrl({url:`/agent/pages/poster/channel`})"
+				class="mine-menu-list share flex-center fill-base radius-16" v-if="detail.channel_auth">
+				<view class="icon-info flex-center">
+					<i class="iconfont iconbangdingqudaoshang" :style="{color:primaryColor}"></i>
+				</view>
+				<view class="flex-1">
+					<view class="f-mini-title c-title text-bold">绑定渠道商</view>
+					<view class="f-desc c-caption mt-sm ellipsis">直招渠道,获利更多</view>
+				</view>
+				<view class="share-btn flex-center f-desc c-base text-bold" :style="{background:primaryColor}">邀请Ta
+				</view>
+			</view>
+		</block>
+
+		<view class="mine-menu-list fill-base radius-16">
+			<view class="menu-title flex-between pl-lg pr-sm">
+				<view class="f-paragraph c-title text-bold">智能助手</view>
+			</view>
+			<view @tap.stop="goOrder(index)" class="notice-info flex-center pl-lg pr-md pb-lg"
+				v-for="(item,index) in detail.notice" :key="index">
+				<view class="title flex-center f-icontext c-base mr-md"
+					:style="{background:item.type==1?primaryColor: item.type==2?'#FFA229':'#E82F21'}">
+					{{noticeType[item.type].title}}
+				</view>
+				<view class="flex-1 flex-between f-desc">
+					<view class="c-title">{{item.id ? noticeType[item.type].text : '暂无数据'}}</view>
+					<view class="flex-y-center c-caption" v-if="item.id">点击查看<i class="iconfont icon-right"></i></view>
+				</view>
+			</view>
+		</view>
+
+		<view class="mine-menu-list box-shadow fill-base radius-16" v-if="detail.node.includes('shopOrder')">
+			<view class="menu-title flex-between pl-lg pr-sm">
+				<view class="f-paragraph c-title text-bold">订单管理</view>
+			</view>
+			<view class="flex-warp pb-lg">
+				<view @tap.stop="toJump('shopOrder', index)"
+					class="item-child flex-center flex-column f-caption c-title" v-for="(item, index) in shopOrder"
+					:key="index">
+					<view class="item-img rel flex-center radius">
+						<view class="abs dot-unread-number flex-center"
+							:style="{width: item.number>99 ? '44rpx': item.number > 9 ? '34rpx' :'',right: item.number>99 ? '-32rpx': item.number > 9 ? '-22rpx' :'-12rpx'}"
+							v-if="item.number > 0">
+							{{item.number < 100 ? item.number : '99+'}}
+						</view>
+						<view class="item-img radius abs" :style="{background:primaryColor}"></view>
+						<i class="iconfont c-title" :class="item.icon" :style="{color:primaryColor}"></i>
+					</view>
+					<view class="mt-sm">{{ item.text }}</view>
+				</view>
+			</view>
+		</view>
+		<view class="mine-menu-list box-shadow fill-base radius-16" v-if="detail.node.includes('shopBellOrder')">
+			<view class="menu-title flex-between pl-lg pr-sm">
+				<view class="f-paragraph c-title text-bold">加钟管理</view>
+			</view>
+			<view class="flex-warp pb-lg">
+				<view @tap.stop="toJump('shopBellOrder', index)"
+					class="item-child flex-center flex-column f-caption c-title" v-for="(item, index) in shopBellOrder"
+					:key="index">
+					<view class="item-img rel flex-center radius">
+						<view class="abs dot-unread-number flex-center"
+							:style="{width: item.number>99 ? '44rpx': item.number > 9 ? '34rpx' :'',right: item.number>99 ? '-32rpx': item.number > 9 ? '-22rpx' :'-12rpx'}"
+							v-if="item.number > 0">
+							{{item.number < 100 ? item.number : '99+'}}
+						</view>
+						<view class="item-img radius abs" :style="{background:primaryColor}"></view>
+						<image mode="heightFix" class="icon-img" :src="item.icon"></image>
+					</view>
+					<view class="mt-sm">{{ item.text }}</view>
+				</view>
+			</view>
+		</view>
+		<view class="mine-menu-list box-shadow fill-base radius-16" v-if="detail.node.includes('shopRefuseOrder')">
+			<view class="menu-title flex-between pl-lg pr-sm">
+				<view class="f-paragraph c-title text-bold">拒单管理</view>
+			</view>
+			<view class="flex-warp pb-lg">
+				<view @tap.stop="toJump('shopRefuseOrder', index)"
+					class="item-child flex-center flex-column f-caption c-title"
+					v-for="(item, index) in shopRefuseOrder" :key="index">
+					<view class="item-img rel flex-center radius">
+						<view class="abs dot-unread-number flex-center"
+							:style="{width: item.number>99 ? '44rpx': item.number > 9 ? '34rpx' :'',right: item.number>99 ? '-32rpx': item.number > 9 ? '-22rpx' :'-12rpx'}"
+							v-if="item.number > 0">
+							{{item.number < 100 ? item.number : '99+'}}
+						</view>
+						<view class="item-img radius abs" :style="{background:primaryColor}"></view>
+						<i class="iconfont c-title" :class="item.icon" :style="{color:primaryColor}"></i>
+					</view>
+					<view class="mt-sm">{{ item.text }}</view>
+				</view>
+			</view>
+		</view>
+		<view class="mine-menu-list box-shadow fill-base radius-16" v-if="detail.node.includes('shopRefund')">
+			<view class="menu-title flex-between pl-lg pr-sm">
+				<view class="f-paragraph c-title text-bold">服务退款</view>
+			</view>
+			<view class="flex-warp pb-lg">
+				<view @tap.stop="toJump('shopRefund', index)"
+					class="item-child flex-center flex-column f-caption c-title" v-for="(item, index) in shopRefund"
+					:key="index">
+					<view class="item-img rel flex-center radius">
+						<view class="abs dot-unread-number flex-center"
+							:style="{width: item.number>99 ? '44rpx': item.number > 9 ? '34rpx' :'',right: item.number>99 ? '-32rpx': item.number > 9 ? '-22rpx' :'-12rpx'}"
+							v-if="item.number > 0">
+							{{item.number < 100 ? item.number : '99+'}}
+						</view>
+						<view class="item-img radius abs" :style="{background:primaryColor}"></view>
+						<i class="iconfont c-title" :class="item.icon" :style="{color:primaryColor}"></i>
+					</view>
+					<view class="mt-sm">{{ item.text }}</view>
+				</view>
+			</view>
+		</view>
+		<view class="mine-menu-list box-shadow fill-base radius-16" v-if="detail.node.includes('shopBellRefund')">
+			<view class="menu-title flex-between pl-lg pr-sm">
+				<view class="f-paragraph c-title text-bold">加钟退款</view>
+			</view>
+			<view class="flex-warp pb-lg">
+				<view @tap.stop="toJump('shopBellRefund', index)"
+					class="item-child flex-center flex-column f-caption c-title" v-for="(item, index) in shopBellRefund"
+					:key="index">
+					<view class="item-img rel flex-center radius">
+						<view class="abs dot-unread-number flex-center"
+							:style="{width: item.number>99 ? '44rpx': item.number > 9 ? '34rpx' :'',right: item.number>99 ? '-32rpx': item.number > 9 ? '-22rpx' :'-12rpx'}"
+							v-if="item.number > 0">
+							{{item.number < 100 ? item.number : '99+'}}
+						</view>
+						<view class="item-img radius abs" :style="{background:primaryColor}"></view>
+						<image mode="heightFix" class="icon-img" :src="item.icon"></image>
+					</view>
+					<view class="mt-sm">{{ item.text }}</view>
+				</view>
+			</view>
+		</view>
+
+
+		<view class="mine-menu-list fill-base radius-16" v-if="options.agent">
+			<view class="menu-title flex-between pl-lg pr-sm">
+				<view class="f-paragraph c-title text-bold">其他功能</view>
+			</view>
+			<view class="flex-warp pb-sm">
+				<view @tap.stop="toJump('toolList', index)" class="item-child flex-center flex-column f-caption c-title"
+					style="width: 25%;margin:10rpx 0 20rpx 0" v-for="(item, index) in toolList" :key="index">
+					<i class="iconfont c-title" :class="item.icon" :style="{color:primaryColor}"></i>
+					<view class="mt-sm">{{ item.text }}</view>
+				</view>
+			</view>
+		</view>
+		<view class="space-footer"></view>
+
+
+		<uni-popup ref="show_rule_item" type="center" :maskClick="false">
+			<view class="common-popup-content fill-base pd-lg radius-34">
+				<view class="title">未入账</view>
+				<view class="f-desc c-title mt-lg">
+					平台未到账的服务订单金额
+				</view>
+				<view class="button">
+					<view @tap.stop="$refs.show_rule_item.close()" class="item-child c-base"
+						:style="{background: primaryColor,color:'#fff'}">知道了</view>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	import tabbar from "@/components/tabbar.vue"
+	export default {
+		components: {
+			tabbar
+		},
+		data() {
+			return {
+				isLoad: false,
+				options: {},
+				detail: {},
+				noticeType: {
+					1: {
+						title: '订单通知',
+						text: '您有新的订单来啦!'
+					},
+					2: {
+						title: '退款通知',
+						text: '您有新的客户退款通知!'
+					},
+					3: {
+						title: '拒单通知',
+						text: '有' + this.$t('action.attendantName') + '拒单, 请尽快处理!'
+					},
+				},
+				shopOrder: [{
+					icon: 'icondaifuwu4',
+					text: '待服务',
+					url: '/agent/pages/order/list?tab=1',
+					key: 2,
+					number: 0
+				}, {
+					icon: 'iconjishijiedan1',
+					text: this.$t('action.attendantName') + '接单',
+					url: '/agent/pages/order/list?tab=2',
+					key: 3,
+					number: 0
+				}, {
+					icon: 'iconjishichufa1',
+					text: this.$t('action.attendantName') + '出发',
+					url: '/agent/pages/order/list?tab=3',
+					key: 4,
+					number: 0
+				}, {
+					icon: 'iconjishidaoda1',
+					text: this.$t('action.attendantName') + '到达',
+					url: '/agent/pages/order/list?tab=4',
+					key: 5,
+					number: 0
+				}, {
+					icon: 'iconanmo2',
+					text: '服务中',
+					url: '/agent/pages/order/list?tab=5',
+					key: 6,
+					number: 0
+				}, {
+					icon: 'iconyiwancheng',
+					text: '已完成',
+					url: '/agent/pages/order/list?tab=6'
+				}],
+				shopBellOrder: [{
+					icon: 'https://lbqny.migugu.com/admin/anmo/menu/daifuwu.png',
+					text: '待服务',
+					url: '/agent/pages/order/list?bell=1&tab=1',
+					key: 2,
+					number: 0
+				}, {
+					icon: 'https://lbqny.migugu.com/admin/anmo/menu/jiedan.png',
+					text: this.$t('action.attendantName') + '接单',
+					url: '/agent/pages/order/list?bell=1&tab=2',
+					key: 3,
+					number: 0
+				}, {
+					icon: 'https://lbqny.migugu.com/admin/anmo/menu/fuwuzhong.png',
+					text: '服务中',
+					url: '/agent/pages/order/list?bell=1&tab=3',
+					key: 6,
+					number: 0
+				}, {
+					icon: 'https://lbqny.migugu.com/admin/anmo/menu/wancheng.png',
+					text: '已完成',
+					url: '/agent/pages/order/list?bell=1&tab=4',
+				}],
+				shopRefuseOrder: [{
+					icon: 'icondaizhuandan',
+					text: '待转单',
+					url: '/agent/pages/order/list?tab=8',
+					key: 8,
+					number: 0
+				}],
+				shopRefund: [{
+					icon: 'iconshenqingzhong',
+					text: '申请中',
+					url: '/agent/pages/refund/list?tab=1',
+					key: 1,
+					number: 0
+				}, {
+					icon: 'icontongyituikuan',
+					text: '同意退款',
+					url: '/agent/pages/refund/list?tab=2',
+					key: 2,
+					number: 0
+				}, {
+					icon: 'iconjujuetuikuan',
+					text: '拒绝退款',
+					url: '/agent/pages/refund/list?tab=3',
+					key: 3,
+					number: 0
+				}],
+				shopBellRefund: [{
+					icon: 'https://lbqny.migugu.com/admin/anmo/menu/shenqingzhong.png',
+					text: '申请中',
+					url: '/agent/pages/refund/list?bell=1&tab=1',
+					key: 1,
+					number: 0
+				}, {
+					icon: 'https://lbqny.migugu.com/admin/anmo/menu/tongyi.png',
+					text: '同意退款',
+					url: '/agent/pages/refund/list?bell=1&tab=2',
+					key: 2,
+					number: 0
+				}, {
+					icon: 'https://lbqny.migugu.com/admin/anmo/menu/jujue.png',
+					text: '拒绝退款',
+					url: '/agent/pages/refund/list?bell=1&tab=3',
+					key: 3,
+					number: 0
+				}],
+				toolList: [{
+						icon: 'iconzhanghaoshezhi',
+						text: '账号设置',
+						url: '/agent/pages/account'
+					}, {
+						icon: 'iconshenqingjishi3',
+						text: this.$t('action.attendantName') + '管理',
+						url: '/agent/pages/technician/list'
+					},
+					{
+						icon: 'iconyongjinxinxi1',
+						text: '佣金信息',
+						url: '/agent/pages/income/commission'
+					},
+					{
+						icon: 'icontixianshenqing1',
+						text: '提现申请',
+						url: '/user/pages/distribution/record?type=5'
+					}
+				],
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			commonOptions: state => state.user.commonOptions,
+			userInfo: state => state.user.userInfo,
+			haveOperItem: state => state.technician.haveOperItem,
+		}),
+		onLoad(options) {
+			let {
+				agent = 0
+			} = options
+			options.agent = agent * 1
+			this.options = options
+			uni.setNavigationBarTitle({
+				title: agent == 1 ? '代理商端' : '管理员端'
+			})
+			this.initIndex()
+		},
+		onShow() {
+			if (!this.haveOperItem) return
+			this.initRefresh()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		methods: {
+			...mapMutations(['updateTechnicianItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				this.$util.showLoading()
+				this.updateTechnicianItem({
+					key: 'haveOperItem',
+					val: false
+				})
+				let {
+					agent
+				} = this.options
+				let methodKey = agent ? 'agent' : 'admin'
+				let data = await this.$api[methodKey].index()
+				if (agent) {
+					data.node = ['shopOrder', 'shopBellOrder', 'shopRefuseOrder', 'shopRefund', 'shopBellRefund']
+				}
+				let {
+					notice
+				} = data
+				let {
+					order_id,
+					refund_id,
+					refuse_id
+				} = notice
+				if (order_id && order_id.length == 0) {
+					order_id = {
+						type: 1
+					}
+				}
+				if (refund_id && refund_id.length == 0) {
+					refund_id = {
+						type: 2
+					}
+				}
+				if (refuse_id && refuse_id.length == 0) {
+					refuse_id = {
+						type: 3
+					}
+				}
+				let arr = []
+				if (data.node.includes('shopOrder') || data.node.includes('shopOrder')) {
+					arr.push(order_id)
+				}
+				if (data.node.includes('shopRefund') || data.node.includes('shopBellRefund')) {
+					arr.push(refund_id)
+				}
+				if (data.node.includes('shopRefuseOrder')) {
+					arr.push(refuse_id)
+				}
+				data.notice = arr
+				this.shopOrder.map(item => {
+					if (item.key) {
+						item.number = data.order_count[item.key]
+					}
+				})
+				this.shopBellOrder.map(item => {
+					if (item.key) {
+						item.number = data.add_count[item.key]
+					}
+				})
+				this.shopRefuseOrder.map(item => {
+					if (item.key) {
+						item.number = data.refuse_order[item.key]
+					}
+				})
+				this.shopRefund.map(item => {
+					if (item.key) {
+						item.number = data.refund_count[item.key]
+					}
+				})
+				this.shopBellRefund.map(item => {
+					if (item.key) {
+						item.number = data.add_refund_count[item.key]
+					}
+				})
+				this.detail = data
+				this.isLoad = true
+				this.$util.hideAll()
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			toJump(key, index) {
+				let {
+					url
+				} = this[key][index]
+				let {
+					agent
+				} = this.options
+				let joinKey = url.includes('?') ? '&' : '?'
+				url += `${joinKey}agent=${agent}`
+				this.$util.goUrl({
+					url
+				})
+			},
+			async goOrder(index) {
+				let {
+					id = 0,
+						order_id = 0,
+						type
+				} = this.detail.notice[index]
+				if (!order_id) return
+				let {
+					agent
+				} = this.options
+				let methodKey = agent ? 'agent' : 'admin'
+				await this.$api[methodKey].noticeUpdate({
+					id,
+					have_look: 1
+				})
+				this.initRefresh()
+				let page = type == 2 ? 'refund' : 'order'
+				let url = `/agent/pages/${page}/detail?id=${order_id}&agent=${agent}`
+				this.$util.goUrl({
+					url
+				})
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.agent-index {
+
+		.mine-count-list {
+			width: 710rpx;
+			height: 295rpx;
+			margin: 20rpx 20rpx 0 20rpx;
+
+			.text {
+				color: rgba(255, 255, 255, 0.6)
+			}
+
+			.cash-out-btn {
+				width: 180rpx;
+				height: 70rpx;
+			}
+
+			.count-data-list {
+				.list-item {
+					width: 50%;
+				}
+			}
+		}
+
+		.dot-unread-number {
+			top: 0;
+			right: 0;
+			width: 24rpx;
+			height: 24rpx;
+			line-height: 24rpx;
+			text-align: center;
+			color: #fff;
+			font-size: 18rpx;
+			border-radius: 24rpx;
+			background-color: #F1381F;
+		}
+
+		// 我的订单/其他
+		.mine-menu-list {
+			margin: 20rpx 20rpx 0 20rpx;
+
+			.menu-title {
+				height: 90rpx;
+				color: #434343;
+
+				.iconfont {
+					font-size: 24rpx;
+				}
+			}
+
+			.icon-info {
+				width: 80rpx;
+				height: 80rpx;
+				background: #FFFFFF;
+				box-shadow: 0 3rpx 31rpx -2rpx rgba(217, 224, 219, 0.5);
+				border-radius: 29rpx;
+				margin-right: 16rpx;
+
+				.iconfont {
+					font-size: 48rpx;
+				}
+			}
+
+			.share-btn {
+				width: 130rpx;
+				height: 52rpx;
+				border-radius: 8rpx;
+			}
+
+			.notice-info {
+				.title {
+					width: 100rpx;
+					height: 34rpx;
+					border-radius: 4rpx;
+				}
+
+				.iconfont {
+					font-size: 20rpx;
+				}
+			}
+
+			.item-child {
+				width: 25%;
+				margin: 10rpx 0;
+
+				.iconfont {
+					font-size: 52rpx;
+				}
+
+				.item-img {
+					width: 60rpx;
+					height: 60rpx;
+
+					.iconfont {
+						font-size: 36rpx;
+					}
+
+					.item-img {
+						top: 0;
+						left: 0;
+						opacity: 0.1;
+					}
+				}
+
+				.icon-img {
+					height: 32rpx;
+				}
+			}
+		}
+
+		.mine-menu-list.share {
+			padding: 30rpx 30rpx 30rpx 20rpx;
+		}
+
+	}
+</style>
\ No newline at end of file
diff --git a/agent/pages/order/change.vue b/agent/pages/order/change.vue
new file mode 100644
index 0000000..d50ce8b
--- /dev/null
+++ b/agent/pages/order/change.vue
@@ -0,0 +1,508 @@
+<template>
+	<view class="order-pages" v-if="isLoad">
+		<fixed @height="initFixHeight" :initHeight="transferForm.coach_type">
+			<view class="fill-base pd-lg">
+				<view class="flex-between">
+					<view class="f-title c-title text-bold">转派订单</view>
+					<view class="flex-center">
+						<view @tap.stop="toChangeItem('coach_type',item.id)"
+							class="flex-center service-type-item c-caption" :class="[{'ml-lg':index!=0}]"
+							:style="{background:transferForm.coach_type == item.id ? primaryColor:'',color:transferForm.coach_type == item.id ? '#fff':''}"
+							v-for="(item,index) in tabList" :key="index">
+							{{item.title}}
+						</view>
+					</view>
+				</view>
+				<view class="fill-base flex-center mt-lg pt-lg b-1px-t" v-if="transferForm.coach_type == 1">
+					<view class="flex-1">
+						<search @input="toSearch" type="input" :padding="0" :radius="30" height="70rpx"
+							:placeholder="placeholder">
+						</search>
+					</view>
+					<view @tap.stop="$refs.show_transfer_item.open()" class="flex-y-center pl-lg">筛选<i
+							class="iconfont iconshaixuanxia-1 c-caption"></i></view>
+				</view>
+			</view>
+		</fixed>
+
+
+		<block v-if="transferForm.coach_type == 1">
+
+			<view @tap.stop="toChangeItem('coach_id',index)"
+				class="list-item fill-base pt-lg pb-lg pl-md pr-lg flex-center mt-md ml-md mr-md radius-16"
+				v-for="(item,index) in list.data" :key="index">
+				<i class="iconfont mr-md"
+					:class="[{'icon-xuanze':transferForm.coach_id!=item.id},{'icon-radio-fill':transferForm.coach_id==item.id}]"
+					:style="{color:transferForm.coach_id==item.id?primaryColor:''}"></i>
+				<view class="flex-1 flex-warp">
+					<image class="avatar radius" :src="item.work_img"></image>
+					<view class="flex-1 ml-md">
+						<view class="flex-between">
+							<view class="f-title c-title text-bold max-200 ellipsis">{{item.coach_name}}</view>
+							<view class="can-service-btn flex-center f-icontext rel" :style="{color:primaryColor}">
+								<view class="bg abs" :style="{background:primaryColor}"></view>
+								最早可约：{{item.near_time}}
+							</view>
+						</view>
+						<view class="f-desc" style="color:#4D4D4D">
+							所属代理商：{{item.admin_info.username}}（{{cityType[item.admin_info.city_type]}}代理）</view>
+						<view class="flex-between f-caption c-caption mt-sm">
+							<view>电话：{{item.mobile}}</view>
+							<view class="flex-y-center"><i class="iconfont iconjuli1"></i>{{item.distance}}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading"
+				v-if="loading">
+			</load-more>
+			<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+
+		</block>
+		<block v-if="transferForm.coach_type == 2">
+
+			<view class="pd-lg f-mini-title c-title fill-base b-1px-t">
+				<view class="text-bold flex-y-center pb-lg"><i
+						class="iconfont icon-required c-warning"></i>线下{{$t('action.attendantName')}}</view>
+				<input v-model="transferForm.coach_name" type="text" class="item-input pl-lg pr-lg radius-16"
+					maxlength="15" :placeholder="rule[0].errorMsg" placeholder-class="color:#C7C7C7" />
+				<view class="text-bold flex-y-center pt-lg pb-lg"><i class="iconfont icon-required c-warning"></i>联系电话
+				</view>
+				<input v-model="transferForm.mobile" type="text" class="item-input pl-lg pr-lg radius-16" maxlength="11"
+					:placeholder="rule[1].errorMsg" placeholder-class="color:#C7C7C7" />
+				<view class="text-bold pt-lg pb-lg">转派备注 </view>
+				<textarea v-model="transferForm.text" class="item-textarea pd-lg radius-16"
+					placeholder-class="color:#C7C7C7" maxlength="400" placeholder="若订单有其他特殊情况可单独备注在此处" />
+				<view @tap.stop="toChooseAgent" class="flex-between pt-lg pb-lg">
+					<view class="text-bold">关联代理商</view>
+					<view class="flex-y-center" :class="[{'c-caption':!transferForm.admin_id}]">
+						<view class="max-400 ellipsis">{{transferForm.admin_id | handleAdminName(base_agent)}}</view>
+						<i class="iconfont icongengduo"></i>
+					</view>
+				</view>
+			</view>
+			<view class="flex-center f-caption c-caption pt-lg">
+				不关联代理商则默认是平台的{{$t('action.attendantName')}}</view>
+		</block>
+
+
+		<view class="space-max-footer"></view>
+
+		<fix-bottom-button @confirm="toConfirm" :text="[{text:'确定',type:'confirm'}]" bgColor="#fff">
+		</fix-bottom-button>
+
+
+		<uni-popup type="top" ref="show_transfer_item" :top="`${popupHeight+1}px`" :custom="true">
+			<view class="popup-transfer-type pd-lg fill-base">
+				<view @tap.stop="toChangeItem('type',item.id)" class="f-paragraph mb-lg" :class="[{'mt-lg':index==0}]"
+					:style="{color:param.type==item.id?primaryColor:''}" v-for="(item,index) in transfreTypeList"
+					:key="index">
+					{{item.title}}
+				</view>
+			</view>
+		</uni-popup>
+
+		<uni-popup ref="choose_item" type="bottom" :custom="true">
+			<view @touchmove.stop.prevent class="common-popup-content fill-base"
+				style="width: 100%;border-radius: 34rpx 34rpx 0 0;">
+				<view class="flex-center f-title c-title text-bold pb-lg">选择代理商</view>
+				<scroll-view scroll-y style="width: 100%;max-height:50vh">
+					<view @tap.stop="toChangeItem('chooseInd',index)" class="flex-center pt-sm pb-sm"
+						:style="{color:chooseInd == index ? primaryColor: ''}" v-for="(item,index) in base_agent"
+						:key="index">
+						<view class="f-title flex-1 pr-lg">
+							{{item.agent_name}}
+						</view>
+						<i class="iconfont c-caption"
+							:class="[{'icon-xuanze':chooseInd != index},{'icon-radio-fill':chooseInd == index}]"
+							style="font-size: 40rpx;" :style="{color:chooseInd == index ? primaryColor: ''}"></i>
+					</view>
+				</scroll-view>
+
+				<view class="button">
+					<view @tap.stop="$refs.choose_item.close()" class="item-child">
+						取消
+					</view>
+					<view @tap.stop="toConfirmCheck" class="item-child"
+						:style="{background: primaryColor,color:'#fff'}">
+						确定
+					</view>
+				</view>
+				<view class="space-safe"></view>
+				</block>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		data() {
+			return {
+				isLoad: false,
+				options: {},
+				placeholder: '请输入' + this.$t('action.attendantName') + '名称',
+				tabList: [{
+					id: 1,
+					title: '更换' + this.$t('action.attendantName')
+				}, {
+					id: 2,
+					title: '委派' + this.$t('action.attendantName')
+				}],
+				transfreTypeList: [{
+					id: 1,
+					title: '距离最近'
+				}, {
+					id: 2,
+					title: '最早可预约'
+				}],
+				cityType: ['', '城市', '区县', '省'],
+				param: {
+					page: 1,
+					coach_name: '',
+					type: 1
+				},
+				list: {
+					data: []
+				},
+				loading: true,
+				index: -1,
+				lockTap: false,
+				popupHeight: '',
+				popupInfo: {},
+				base_agent: [],
+				chooseInd: -1,
+				transferForm: {
+					order_id: '',
+					coach_type: 1,
+					coach_id: '',
+					coach_name: '',
+					near_time: '',
+					mobile: '',
+					text: '',
+					admin_id: ''
+				},
+				rule: [{
+						name: "coach_name",
+						checkType: "isNotNull",
+						errorMsg: "请输入" + this.$t('action.attendantName') + "姓名",
+						regType: 2
+					},
+					{
+						name: "mobile",
+						checkType: "isMobile",
+						errorMsg: "请输入联系电话"
+					}
+				]
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad(options) {
+			let {
+				id,
+				agent = 0
+			} = options
+			options.agent = agent * 1
+			this.options = options
+			this.transferForm.order_id = id
+			this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh()
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			...mapActions(['getConfigInfo']),
+			...mapMutations(['updateTechnicianItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				if (!this.configInfo.id || refresh) {
+					await this.getConfigInfo()
+				}
+				await Promise.all([this.getBaseInfo(), this.getList()])
+				this.isLoad = true
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			async getBaseInfo() {
+				let {
+					agent = 0
+				} = this.options
+				let methodKey = agent ? 'agent' : 'admin'
+				this.base_agent = await this.$api[methodKey].adminSelect()
+			},
+			toSearch(val) {
+				this.param.page = 1
+				this.param.coach_name = val
+				this.transferForm.coach_id = ''
+				this.getList()
+			},
+			async getList() {
+				let {
+					list: oldList,
+					param,
+				} = this
+				let {
+					id,
+					agent = 0
+				} = this.options
+				param.order_id = id
+				let methodKey = agent ? 'agent' : 'admin'
+				let newList = await this.$api[methodKey].orderChangeCoachList(param)
+
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+			},
+			initFixHeight(val) {
+				this.popupHeight = val
+			},
+			toChangeItem(key, val) {
+				switch (key) {
+					case 'type':
+						this.transferForm.coach_id = ''
+						this.param[key] = val
+						this.param.page = 1
+						this.getList()
+						this.$refs.show_transfer_item.close()
+						break
+					case 'coach_type':
+						let data = Object.assign({}, this.transferForm, {
+							coach_type: val,
+							coach_id: '',
+							coach_name: '',
+							near_time: '',
+							mobile: '',
+							text: '',
+							admin_id: ''
+						})
+						this.transferForm = data
+						break
+					case 'coach_id':
+						let {
+							id, near_time
+						} = this.list.data[val]
+						this.transferForm[key] = id
+						this.transferForm.near_time = near_time
+						break
+					case 'chooseInd':
+						this[key] = val
+						break
+				}
+			},
+			toChooseAgent() {
+				let {
+					admin_id = 0
+				} = this.transferForm
+				let ind = this.base_agent.findIndex(item => {
+					return item.id == admin_id
+				})
+				this.chooseInd = ind
+				this.$refs.choose_item.open()
+			},
+			toConfirmCheck() {
+				let {
+					id
+				} = this.base_agent[this.chooseInd]
+				this.transferForm.admin_id = id
+				this.$refs.choose_item.close()
+			},
+			//表单验证
+			validate(param) {
+				let validate = new this.$util.Validate();
+				this.rule.map(item => {
+					let {
+						name,
+					} = item
+					validate.add(param[name], item);
+				})
+				let message = validate.start();
+				return message;
+			},
+			async toConfirm() {
+				let param = this.$util.deepCopy(this.transferForm)
+				let {
+					coach_type: ctype = 1,
+					coach_id = 0
+				} = param
+				if (ctype === 1) {
+					if (!coach_id) {
+						this.$util.showToast({
+							title: `请选择` + this.$t('action.attendantName')
+						})
+						return
+					}
+					delete param.coach_name
+					delete param.mobile
+					delete param.text
+					delete param.admin_id
+				} else {
+					param.coach_id = 0
+					let msg = this.validate(param);
+					if (msg) {
+						this.$util.showToast({
+							title: msg
+						});
+						return;
+					}
+					delete param.near_time
+				}
+				delete param.coach_type
+				param.text = param.text ? param.text.substring(0, 400) : ''
+				if (this.lockTap) return
+				let {
+					agent
+				} = this.options
+				let methodKey = agent ? 'agent' : 'admin'
+				try {
+					await this.$api[methodKey].orderChangeCoach(param)
+					this.$util.showToast({
+						title: '操作成功'
+					})
+					this.lockTap = false;
+					this.$util.hideAll()
+					this.updateTechnicianItem({
+						key: 'haveOperItem',
+						val: true
+					})
+					this.$util.back()
+					this.$util.goUrl({
+						url: 1,
+						openType: `navigateBack`
+					})
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+					return
+				}
+			},
+			// 订单详情
+			goDetail(index) {
+				let {
+					id
+				} = this.list.data[index]
+				let {
+					agent
+				} = this.options
+				let url = `/agent/pages/order/detail?id=${id}&agent=${agent}`
+				this.$util.goUrl({
+					url
+				})
+			}
+		},
+		filters: {
+			handleAdminName(val, data) {
+				let text = '请选择代理商'
+				if (val) {
+					let arr = data.filter(item => {
+						return item.id == val
+					})
+					text = arr[0].agent_name
+				}
+				return text
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.order-pages {
+		.iconshaixuanxia-1 {
+			font-size: 20rpx;
+			transform: scale(0.6);
+		}
+
+		.popup-transfer-type {
+			width: 100%;
+			height: 234rpx;
+		}
+
+		.list-item {
+
+			.icon-xuanze,
+			.icon-radio-fill {
+				font-size: 38rpx;
+				color: '#BEC3CE'
+			}
+
+			.avatar {
+				width: 124rpx;
+				height: 124rpx;
+			}
+
+			.can-service-btn {
+				height: 32rpx;
+				padding: 0 6rpx 0 6rpx;
+
+				.bg {
+					opacity: 0.1;
+					border-radius: 5rpx;
+					top: 0;
+					left: 0;
+					right: 0;
+					bottom: 0;
+					z-index: 1;
+				}
+			}
+		}
+
+
+		.item-input {
+			height: 110rpx;
+			background: #F9FAF9;
+		}
+
+		.item-textarea {
+			width: 630rpx;
+			height: 300rpx;
+			background: #F9FAF9;
+		}
+
+		.icongengduo {
+			color: #5A677E;
+			font-size: 20rpx;
+		}
+
+	}
+</style>
\ No newline at end of file
diff --git a/agent/pages/order/detail.vue b/agent/pages/order/detail.vue
new file mode 100644
index 0000000..d541668
--- /dev/null
+++ b/agent/pages/order/detail.vue
@@ -0,0 +1,549 @@
+<template>
+	<view class="order-pages" v-if="detail.id">
+		<view class="item-child  pd-lg fill-base f-paragraph c-base" :style="{background:primaryColor}">
+			<view class="text-bold">{{statusType[detail.pay_type]}}</view>
+			<view class="f-caption mt-sm" v-if="detail.pay_type == 1 && detail.end_time > 0">请在<min-countdown
+					:targetTime="over_time_text" @callback="countEnd"></min-countdown>内完成支付，逾期未支付，订单将自动取消</view>
+			<view class="space-lg"></view>
+		</view>
+
+		<!-- // pay_type 1待支付，2待服务，3技-师接单，4技-师出发，5技-师到达，6服务中，7服务完成，8待评价 -->
+		<view
+			class="menu-list flex-warp rel ml-lg mr-lg pt-lg pb-lg pl-md pr-md fill-base f-paragraph c-caption radius-16"
+			:class="[{'add-bell':detail.is_add || detail.store_id}]">
+			<view class="menu-line abs b-1px-b"></view>
+			<block v-for="(item,index) in lineList" :key="index">
+				<view class="item-child flex-center flex-column f-icontext c-paragraph"
+					:style="{color:detail.pay_type > item.pay_type -1?primaryColor:''}" v-if="item.icon">
+					<view class="item-img fill-base flex-center mb-sm radius"
+						:style="{borderColor:detail.pay_type > item.pay_type -1?primaryColor:''}">
+						<i class="iconfont" :class="item.icon"></i>
+					</view>
+					<view class="ellipsis" style="max-width:100%">{{item.title}}</view>
+				</view>
+			</block>
+		</view>
+
+
+		<view class="item-child mt-md ml-lg mr-lg pd-lg fill-base radius-16">
+			<view class="flex-between pb-lg">
+				<view class="f-paragraph c-title max-380 ellipsis">服务内容</view>
+			</view>
+			<view class="flex-center" :class="[{'mb-lg':aindex != detail.order_goods.length -1}]"
+				v-for="(aitem,aindex) in detail.order_goods" :key="aindex">
+				<!-- #ifdef H5 -->
+				<view class="avatar lg radius-16">
+					<view class="h5-image avatar lg radius-16"
+						:style="{ backgroundImage : `url('${aitem.goods_cover}')`}">
+					</view>
+				</view>
+				<!-- #endif -->
+				<!-- #ifndef H5 -->
+				<image mode="aspectFill" class="avatar lg radius-16" :src="aitem.goods_cover"></image>
+				<!-- #endif -->
+				<view class="flex-1 ml-md">
+					<view class="flex-between">
+						<view class="f-mini-title c-title text-bold max-380 ellipsis">
+							{{aitem.goods_name}}
+						</view>
+						<view class="c-paragraph">x{{aitem.num}}</view>
+					</view>
+					<view class="f-caption c-caption" v-if="aitem.material_price*1>0">物料费：¥{{aitem.material_price}}
+					</view>
+					<view class="flex-between mt-md">
+						<view class="f-caption" style="color:#777">服务时长 {{aitem.time_long}}分钟</view>
+						<view class="f-caption c-warning" v-if="aitem.refund_num>0">已退x{{aitem.refund_num}}</view>
+					</view>
+					<view class="f-paragraph c-warning text-bold mt-sm">¥{{aitem.price}}
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="store-info mt-md ml-lg mr-lg pd-lg  fill-base radius-16" v-if="detail.store_id">
+			<view class="f-mini-title c-title text-bold pb-md">
+				{{detail.store_info.title}}
+			</view>
+			<view class="flex-between">
+				<view class="flex-y-center" style="color: #303030;">
+					<i class="iconfont icondizhi1 mr-sm"></i>
+					<view class="c-title flex-1 mr-md">
+						<span>{{detail.store_info.address || `暂未设置门店地址`}}</span>
+						<span @tap.stop="$util.goUrl({url:detail.store_info.address,openType:'copy'})"
+							class="copy-btn span f-icontext radius-5 ml-sm"
+							:style="{color:primaryColor,borderColor:primaryColor}"
+							v-if="detail.store_info.address">复制</span>
+					</view>
+				</view>
+				<view class="flex-center">
+					<view @tap.stop="$util.goUrl({url:detail.store_info.phone,openType:'call'})"
+						class="item-icon rel flex-center radius-16">
+						<view class="item-icon radius-16 abs" :style="{background:primaryColor}"></view>
+						<i class="iconfont icondadianhua_1" :style="{color:primaryColor}"></i>
+					</view>
+					<view @tap.stop="toMap('store_info')" class="item-icon rel flex-center radius-16 ml-md"
+						v-if="detail.store_info.address">
+						<view class="item-icon radius-16 abs" :style="{background:primaryColor}"></view>
+						<i class="iconfont icondizhi_1" :style="{color:primaryColor}"></i>
+					</view>
+				</view>
+			</view>
+		</view>
+
+
+		<view class="order-agent-info store-info mt-md ml-lg mr-lg pd-lg fill-base f-paragraph radius-16">
+			<view class="flex-center">
+				<image mode="aspectFill" class="coach-img radius" :src="detail.coach_info.work_img"></image>
+				<view class="flex-1 ml-lg f-title text-bold ellipsis" style="max-width: 506rpx;">
+					{{detail.coach_info ? detail.coach_info.coach_name : ''}}
+				</view>
+			</view>
+			<view class="flex-center mt-lg">
+				<view class="title">下单人</view>
+				<view class="text flex-1 ellipsis">{{detail.address_info.user_name}}</view>
+			</view>
+			<view class="flex-center mt-lg">
+				<view class="title">联系方式</view>
+				<view class="text flex-1 flex-between">
+					<view>
+						{{detail.address_info.mobile.substring(0,3)}}****{{detail.address_info.mobile.substring(7,11)}}
+					</view>
+					<view @tap.stop="toTel" class="item-icon rel flex-center radius-16">
+						<view class="item-icon radius-16 abs" :style="{background:primaryColor}"></view>
+						<i class="iconfont icondadianhua_1" :style="{color:primaryColor}"></i>
+					</view>
+				</view>
+			</view>
+			<view class="flex-warp mt-lg" v-if="!detail.store_id">
+				<view class="title">服务地址</view>
+				<view class="text flex-1 flex-between">
+					<view style="max-width: 350rpx;">
+						<span>{{`${detail.address_info.address}${detail.address_info.address_info}`}}</span>
+						<span @tap="toCopy" class="copy-btn fill radius-5 f-icontext ml-sm">复制</span>
+					</view>
+					<view @tap.stop="toMap('address_info')" class="item-icon rel flex-center radius-16">
+						<view class="item-icon radius-16 abs" :style="{background:primaryColor}"></view>
+						<i class="iconfont icondizhi_1" :style="{color:primaryColor}"></i>
+					</view>
+				</view>
+			</view>
+			<view class="mt-lg" v-if="detail.text">
+				<view class="title">订单备注</view>
+				<view class="text mt-sm">{{detail.text}}</view>
+			</view>
+			<view class="flex-center mt-lg pt-lg b-1px-t">
+				<view class="title">下单时间</view>
+				<view class="text flex-1">{{detail.create_time}}</view>
+			</view>
+			<view class="flex-center mt-lg">
+				<view class="title">服务时间</view>
+				<view class="text flex-1">{{detail.start_time}}</view>
+			</view>
+			<view class="flex-center mt-lg">
+				<view class="title">服务时长</view>
+				<view class="text flex-1">{{detail.time_long}}分钟</view>
+			</view>
+			<block v-if="!detail.is_add && !detail.store_id">
+				<view class="flex-center mt-lg">
+					<view class="title">车费详情</view>
+					<view class="text flex-1 flex-y-center">{{carType[detail.car_type]}}
+						<view class="ml-md" v-if="detail.car_type == 1">全程{{detail.distance}}</view>
+					</view>
+				</view>
+				<view class="flex-center mt-lg" v-if="detail.car_type == 1">
+					<view class="title">出行费用</view>
+					<view class="text flex-1">出租车 ¥{{detail.car_price}}</view>
+				</view>
+			</block>
+			<view class="flex-center mt-lg">
+				<view class="title">服务项目费用</view>
+				<view class="text flex-1">¥{{detail.init_service_price}}</view>
+			</view>
+			<view class="flex-center mt-lg" v-if="detail.discount*1 > 0">
+				<view class="title">卡券优惠</view>
+				<view class="text flex-1">-¥{{detail.discount}}</view>
+			</view>
+			<view class="flex-center mt-lg">
+				<view class="title">支付方式</view>
+				<view class="text flex-1">{{payType[detail.pay_model]}}</view>
+			</view>
+			<view class="flex-between mt-lg pt-lg b-1px-t">
+				<view class="title"></view>
+				<view class="flex-y-baseline f-paragraph c-black text-bold">总计：<view class="c-warning">
+						¥{{detail.pay_price}}</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="mt-md ml-lg mr-lg pd-lg fill-base radius-16">
+			<view class="flex-y-center pb-lg f-mini-title c-title flex-warp b-1px-b">
+				<view class="flex-between text-bold">订单编号：</view>
+				<view class="flex-between flex-1 ">
+					<view class="text-bold max-350 ellipsis">{{detail.order_code}}</view>
+					<view class="copy-btn flex-center radius-5 f-icontext"
+						@tap.stop="$util.goUrl({openType:'copy',url:detail.order_code})"
+						:style="{borderColor:primaryColor ,color:primaryColor}">复制</view>
+				</view>
+			</view>
+			<view class="space-lg"></view>
+			<timeline :list="lineList" :info="detail"></timeline>
+		</view>
+
+		<view class="space-max-footer"></view>
+
+
+
+
+		<fix-bottom-button
+			@cancel="$util.goUrl({url:`/agent/pages/order/change?id=${options.id}&agent=${options.agent}`})"
+			@confirm="toConfirm"
+			:text="detail.is_add && detail.pay_type != 8 ? [{text:$t( `action.${ technicianStatusOperType[ detail.pay_type === 3 && (detail.is_add || detail.store_id) ? 5 : detail.pay_type ] }` ),type:'confirm'}] : [{text:$t('action.transferOrder'),type:'cancel'},{text:$t( `action.${ technicianStatusOperType[ detail.pay_type === 3 && (detail.is_add || detail.store_id) ? 5  : detail.pay_type == 8 ? -1 : detail.pay_type ] }` ),type:'confirm'}]"
+			bgColor="#fff" :classType="2" v-if="[2, 3, 4, 5, 6, 8].includes(detail.pay_type)">
+		</fix-bottom-button>
+
+
+
+		<uni-popup ref="change_item" type="center" :custom="true">
+			<view class="common-popup-content fill-base pd-lg radius-34">
+				<view class="title">温馨提示</view>
+				<view class="desc">
+					你确认要操作{{$t(`action.${technicianStatusOperType[popupInfo.type]}`)}}吗?
+				</view>
+				<view class="f-caption c-warning" v-if="popupInfo.type == -1">退款金额：¥{{popupInfo.refund_price}}</view>
+				<view class="button">
+					<view @tap.stop="$refs.change_item.close()" class="item-child">取消</view>
+					<view @tap.stop="confirmChangeOrder" class="item-child c-base"
+						:style="{background: primaryColor,color:'#fff'}">确定</view>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	import timeline from '@/components/timeline.vue'
+	export default {
+		components: {
+			timeline
+		},
+		data() {
+			return {
+				options: {},
+				statusType: {
+					'-1': '已取消',
+					1: '待支付',
+					2: '待服务',
+					3: this.$t('action.attendantName') + '接单',
+					4: this.$t('action.attendantName') + '出发',
+					5: this.$t('action.attendantName') + '到达',
+					6: '服务中',
+					7: '已完成',
+					8: '待转单'
+				},
+				technicianStatusOperType: {
+					'-1': 'agreeRefund',
+					2: 'orderTaking',
+					3: 'setOut',
+					4: 'arrive',
+					5: 'startService',
+					6: 'serviceCompletion'
+				},
+				carType: {
+					0: '公交/地铁',
+					1: '出租车'
+				},
+				payType: {
+					1: '微信支付',
+					2: '余额支付',
+					3: '支付宝支付'
+				},
+				lineList: [],
+				base_service: [{
+					pay_type: 3,
+					title: this.$t('action.attendantName') + '接单',
+					time: 'receiving_time',
+					icon: 'iconjishijiedan'
+				}, {
+					pay_type: 4,
+					title: this.$t('action.attendantName') + '出发',
+					time: 'serout_time',
+					icon: 'iconjishichufa'
+				}, {
+					pay_type: 5,
+					title: this.$t('action.attendantName') + '到达',
+					time: 'arrive_time',
+					icon: 'iconjishidaoda'
+				}, {
+					pay_type: 6,
+					title: '开始服务',
+					time: 'start_service_time',
+					icon: 'iconjishifuwu'
+				}, {
+					pay_type: 7,
+					title: '服务完成',
+					time: 'order_end_time',
+					icon: 'iconjishiwancheng'
+				}, {
+					pay_type: 7,
+					title: '签字确认',
+					time: 'sign_time',
+					icon: ''
+				}],
+				base_bell: [{
+					pay_type: 3,
+					title: this.$t('action.attendantName') + '接单',
+					time: 'receiving_time',
+					icon: 'iconjishijiedan'
+				}, {
+					pay_type: 6,
+					title: '开始服务',
+					time: 'start_service_time',
+					icon: 'iconjishifuwu'
+				}, {
+					pay_type: 7,
+					title: '服务完成',
+					time: 'order_end_time',
+					icon: 'iconjishiwancheng'
+				}],
+				detail: {
+					pay_type: 0
+				},
+				check_label: [],
+				coach_refund_text: '',
+				lockTap: false,
+				popupInfo: {
+					title: '',
+					type: '',
+					param: {},
+					imgs: [],
+					location: {
+						lat: 0,
+						lng: 0,
+						address: ''
+					}
+				},
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+			haveOperItem: state => state.technician.haveOperItem,
+			over_time_text() {
+				return new Date().getTime() + this.detail.end_time * 1000
+			}
+		}),
+		onLoad(options) {
+			let {
+				agent = 0
+			} = options
+			options.agent = agent * 1
+			this.options = options
+			this.initIndex()
+		},
+		onShow() {
+			if (!this.haveOperItem) return
+			this.$util.back()
+			this.updateTechnicianItem({
+				key: 'haveOperItem',
+				val: false
+			})
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getCoachInfo']),
+			...mapMutations(['updateTechnicianItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				if (!this.configInfo.id || refresh) {
+					await this.getConfigInfo()
+				}
+				let {
+					id,
+					agent
+				} = this.options
+				let methodKey = agent ? 'agent' : 'admin'
+				let data = await this.$api[methodKey].orderInfo({
+					id
+				})
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				data.is_balance = data.balance * 1 > 0 ? 1 : 0
+				let {
+					pay_type,
+					time_long,
+					start_service_time,
+					is_add = 0,
+					store_id = 0
+				} = data
+				let lineList = this.$util.deepCopy(is_add || store_id ? this.base_bell : this.base_service)
+				if (store_id) {
+					lineList.push({
+						pay_type: 7,
+						title: '签字确认',
+						time: 'sign_time',
+						icon: ''
+					})
+				}
+				this.lineList = lineList
+				this.detail = data
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			countEnd() {
+				this.$util.log("倒计时完了")
+				setTimeout(() => {
+					this.initRefresh()
+					this.$util.back()
+				}, 1000)
+			},
+			// type: -1拒绝接单，3确定接单，4已出发，5已到达，6开始服务，7服务完成
+			async toConfirm() {
+				let {
+					id: order_id,
+					pay_type,
+					is_add = 0,
+					store_id = 0,
+					true_car_price,
+					true_service_price
+				} = this.detail
+				let type = pay_type === 3 && (is_add || store_id) ?
+					5 :
+					pay_type
+				let refund_price = (true_car_price * 1 + true_service_price * 1).toFixed(2)
+				this.popupInfo = {
+					order_id,
+					type: pay_type == 8 ? -1 : type,
+					refund_price
+				}
+				this.$refs.change_item.open()
+			},
+			async confirmChangeOrder() {
+				let param = this.$util.deepCopy(this.popupInfo)
+				param.type = param.type + 1
+				let {
+					type
+				} = param
+				delete param.index
+				let msg = {
+					'-1': '退款成功',
+					3: '接单成功',
+					4: '已成功出发',
+					5: '已成功到达',
+					6: '已开始服务',
+					7: '服务已完成'
+				}
+				let {
+					activeIndex
+				} = this
+				if (this.lockTap) return;
+				this.lockTap = true;
+				this.$util.showLoading()
+				let {
+					agent
+				} = this.options
+				let methodKey = agent ? 'agent' : 'admin'
+				try {
+					await this.$api[methodKey].adminUpdateOrder(param)
+					this.$refs.change_item.close()
+					this.$util.showToast({
+						title: msg[type]
+					})
+					this.lockTap = false;
+					this.updateTechnicianItem({
+						key: 'haveOperItem',
+						val: true
+					})
+					this.initRefresh()
+					this.$util.back()
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+					return
+				}
+			},
+			// 咨询
+			async toTel() {
+				let {
+					id: order_id,
+					pay_type
+				} = this.detail
+				let {
+					agent
+				} = this.options
+				let methodKey = agent ? 'agent' : 'admin'
+				if ([2, 3, 4, 5, 6].includes(pay_type)) {
+					let url = await this.$api[methodKey].getVirtualPhone({
+						order_id
+					})
+					this.$util.goUrl({
+						url,
+						openType: `call`
+					})
+				} else {
+					let msg = pay_type == 7 ? '服务结束' : '服务取消'
+					this.$util.showToast({
+						title: `${msg}不能联系客户哦`
+					})
+				}
+			},
+			// 复制定位
+			toCopy() {
+				let {
+					address,
+					address_info
+				} = this.detail.address_info
+				let url = `${address}${address_info}`
+				this.$util.goUrl({
+					url,
+					openType: 'copy'
+				})
+			},
+			// 查看定位
+			async toMap(key) {
+				let {
+					address,
+					address_info = '',
+					lat,
+					lng
+				} = this.detail[key]
+				await this.$util.checkAuth({
+					type: 'userLocation'
+				})
+				await uni.getLocation({
+					type: 'gcj02',
+				})
+				await uni.openLocation({
+					latitude: lat * 1,
+					longitude: lng * 1,
+					name: address_info ? `${address} ${address_info}` : address,
+					scale: 28
+				})
+			},
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.avatar.coath {
+		width: 94rpx;
+		height: 94rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/agent/pages/order/list.vue b/agent/pages/order/list.vue
new file mode 100644
index 0000000..cb05152
--- /dev/null
+++ b/agent/pages/order/list.vue
@@ -0,0 +1,401 @@
+<template>
+	<view class="order-pages" v-if="isLoad">
+		<fixed>
+			<view class="fill-base pt-lg pl-md pr-md pb-md">
+				<search @input="toSearch" type="input" :padding="0" :radius="30" height="70rpx"
+					placeholder="请输入系统订单号查询">
+				</search>
+			</view>
+			<tab @change="handerTabChange" :list="tabList" :activeIndex="activeIndex*1" :activeColor="primaryColor"
+				height="100rpx" v-if="options.tab != 8"></tab>
+			<view class="b-1px-b"></view>
+		</fixed>
+
+		<view @tap.stop="goDetail(index)" class="item-child mt-md ml-lg mr-lg pd-lg fill-base radius-16 rel"
+			v-for="(item,index) in list.data" :key="index">
+			<view v-if="item.is_add">
+				<view class="bell-tag flex-center f-icontext c-base abs" :style="{background:primaryColor}">加钟服务
+				</view>
+				<view class="space-md"></view>
+			</view>
+			<view class="flex-between pb-lg b-1px-b">
+				<view class="f-paragraph c-title max-450 ellipsis">订单号：{{item.order_code}}</view>
+				<view class="f-caption text-bold"
+					:style="{color:item.pay_type==2?primaryColor: [3,4,5].includes(item.pay_type)?subColor: item.pay_type == 6 ? '#11C95E' : '#333'}">
+					{{statusType[item.pay_type]}}
+				</view>
+			</view>
+			<view class="flex-center mb-lg" :class="[{'mt-lg':aindex==0}]" v-for="(aitem,aindex) in item.order_goods"
+				:key="aindex">
+				<!-- #ifdef H5 -->
+				<view class="avatar lg radius-16">
+					<view class="h5-image avatar lg radius-16"
+						:style="{ backgroundImage : `url('${aitem.goods_cover}')`}">
+					</view>
+				</view>
+				<!-- #endif -->
+				<!-- #ifndef H5 -->
+				<image mode="aspectFill" class="avatar lg radius-16" :src="aitem.goods_cover"></image>
+				<!-- #endif -->
+
+				<view class="flex-1 ml-md">
+					<view class="flex-between">
+						<view class="f-mini-title c-title text-bold max-380 ellipsis">
+							{{aitem.goods_name}}
+						</view>
+						<view class="c-paragraph">x{{aitem.num}}</view>
+					</view>
+					<view class="flex-between mt-md">
+						<view class="f-caption c-caption ellipsis"
+							:class="[{'max-300':aitem.refund_num>0},{'max-450':aitem.refund_num==0}]">
+							服务{{$t('action.attendantName')}}：{{item.coach_info?item.coach_info.coach_name:'-'}}</view>
+						<view class="f-caption c-warning" v-if="aitem.refund_num>0">已退x{{aitem.refund_num}}</view>
+					</view>
+					<view class="f-caption c-caption" style="margin-top: 5rpx;">服务时间：{{item.start_time}}</view>
+				</view>
+			</view>
+			<view class="flex-between pt-lg b-1px-t">
+				<view class="flex-y-center f-desc c-title">总计：
+					<view class="f-paragraph text-bold">¥{{item.pay_price}}</view>
+				</view>
+				<view class="flex-warp">
+					<!-- // pay_type 2待接单，3接单，4出发，5到达，6服务中，7服务完成 -->
+					<block v-if="[2, 3, 4, 5, 6, 8].includes(item.pay_type)">
+						<button
+							@tap.stop="$util.goUrl({url:`/agent/pages/order/change?id=${item.id}&agent=${options.agent}`})"
+							class="clear-btn order" style="margin-left: 0;" v-if="!options.bell">转单</button>
+						<button @tap.stop="toConfirm(index)" class="clear-btn order"
+							:style="{color:'#fff',background:primaryColor,borderColor:primaryColor}">{{ $t( `action.${ technicianStatusOperType[ item.pay_type === 3 && (item.is_add || item.store_id) ? 5 : item.pay_type == 8 ? -1 : item.pay_type ] }` ) }}</button>
+					</block>
+				</view>
+			</view>
+		</view>
+
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+
+		<view class="space-footer"></view>
+
+		<uni-popup ref="change_item" type="center" :custom="true">
+			<view class="common-popup-content fill-base pd-lg radius-34">
+				<view class="title">温馨提示</view>
+				<view class="desc">
+					你确认要操作{{$t(`action.${technicianStatusOperType[popupInfo.type]}`)}}吗?
+				</view>
+				<view class="f-caption c-warning" v-if="popupInfo.type == -1">退款金额：¥{{popupInfo.refund_price}}</view>
+				<view class="button">
+					<view @tap.stop="$refs.change_item.close()" class="item-child">取消</view>
+					<view @tap.stop="confirmChangeOrder" class="item-child c-base"
+						:style="{background: primaryColor,color:'#fff'}">确定</view>
+				</view>
+			</view>
+		</uni-popup>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		data() {
+			return {
+				isLoad: false,
+				options: {},
+				activeIndex: 0,
+				tabList: [],
+				tabOrderList: [{
+					title: '全部',
+					id: 0
+				}, {
+					title: '待服务',
+					id: 2,
+					number: 0
+				}, {
+					title: this.$t('action.attendantName') + '接单',
+					id: 3,
+					number: 0
+				}, {
+					title: this.$t('action.attendantName') + '出发',
+					id: 4,
+					number: 0
+				}, {
+					title: this.$t('action.attendantName') + '到达',
+					id: 5,
+					number: 0
+				}, {
+					title: '服务中',
+					id: 6,
+					number: 0
+				}, {
+					title: '已完成',
+					id: 7,
+					number: 0
+				}],
+				tabBellList: [{
+					title: '全部',
+					id: 0
+				}, {
+					title: '待服务',
+					id: 2,
+					number: 0
+				}, {
+					title: this.$t('action.attendantName') + '接单',
+					id: 3,
+					number: 0
+				}, {
+					title: '服务中',
+					id: 6,
+					number: 0
+				}, {
+					title: '已完成',
+					id: 7,
+					number: 0
+				}],
+				statusType: {
+					'-1': '已取消',
+					1: '待支付',
+					2: '待服务',
+					3: this.$t('action.attendantName') + '接单',
+					4: this.$t('action.attendantName') + '出发',
+					5: this.$t('action.attendantName') + '到达',
+					6: '服务中',
+					7: '已完成',
+					8: '待转单'
+				},
+				technicianStatusOperType: {
+					'-1': 'agreeRefund',
+					2: 'orderTaking',
+					3: 'setOut',
+					4: 'arrive',
+					5: 'startService',
+					6: 'serviceCompletion',
+					8: 'transferOrder'
+				},
+				param: {
+					page: 1,
+					pay_type: 0,
+					order_code: ''
+				},
+				list: {
+					data: []
+				},
+				loading: true,
+				index: -1,
+				lockTap: false,
+				popupInfo: {
+					title: '',
+					index: '',
+					type: '',
+					param: {},
+					imgs: [],
+					location: {
+						lat: 0,
+						lng: 0,
+						address: ''
+					}
+				},
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad(options) {
+			let {
+				agent = 0,
+				bell = 0,
+					tab = 0,
+			} = options
+			options.agent = agent * 1
+			options.bell = bell * 1
+			this.options = options
+			uni.setNavigationBarTitle({
+				title: tab == 8 ? '拒单管理' : bell == 1 ? '加钟管理' : '订单管理'
+			})
+			this.tabList = tab == 8 ? [] : bell == 1 ? this.tabBellList : this.tabOrderList
+			this.activeIndex = tab
+			this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			...mapActions(['getConfigInfo']),
+			...mapMutations(['updateTechnicianItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				if (!this.configInfo.id || refresh) {
+					await this.getConfigInfo()
+				}
+				await this.getList()
+				this.isLoad = true
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			toSearch(val) {
+				this.param.page = 1
+				this.param.order_code = val
+				this.getList()
+			},
+			async getList(flag = false) {
+				let {
+					list: oldList,
+					param,
+					tabList,
+					activeIndex,
+				} = this
+				let {
+					tab = 0,
+						bell = 0,
+						agent = 0
+				} = this.options
+				let methodKey = agent ? 'agent' : 'admin'
+				param.pay_type = tab == 8 ? 8 : tabList[activeIndex].id
+				if (tab != 8) {
+					param.is_add = bell
+				}
+				let newList = await this.$api[methodKey].orderList(param)
+
+				if (!flag) {
+					if (this.param.page == 1) {
+						this.list = newList
+					} else {
+						newList.data = oldList.data.concat(newList.data)
+						this.list = newList
+					}
+				}
+				this.loading = false
+				this.$util.hideAll()
+			},
+			handerTabChange(index) {
+				this.activeIndex = index;
+				this.$util.showLoading()
+				this.param.page = 1;
+				this.getList()
+			},
+			// type: -1拒绝接单，3确定接单，4已出发，5已到达，6开始服务，7服务完成
+			async toConfirm(index) {
+				let {
+					id: order_id,
+					pay_type,
+					true_car_price,
+					true_service_price,
+					is_add = 0,
+					store_id = 0
+				} = this.list.data[index]
+				let type = pay_type === 3 && (is_add || store_id) ?
+					5 :
+					pay_type
+				let refund_price = (true_car_price * 1 + true_service_price * 1).toFixed(2)
+				this.popupInfo = {
+					index,
+					order_id,
+					type: pay_type == 8 ? -1 : type,
+					refund_price
+				}
+				this.$refs.change_item.open()
+			},
+			async confirmChangeOrder() {
+				let param = this.$util.deepCopy(this.popupInfo)
+				param.type = param.type + 1
+				let {
+					index,
+					type
+				} = param
+				delete param.index
+				delete param.refund_price
+				let msg = {
+					'-1': '退款成功',
+					3: '接单成功',
+					4: '已成功出发',
+					5: '已成功到达',
+					6: '已开始服务',
+					7: '服务已完成'
+				}
+				let {
+					activeIndex
+				} = this
+				if (this.lockTap) return;
+				this.lockTap = true;
+				this.$util.showLoading()
+				let {
+					agent
+				} = this.options
+				let methodKey = agent ? 'agent' : 'admin'
+				try {
+					await this.$api[methodKey].adminUpdateOrder(param)
+					this.$refs.change_item.close()
+					this.$util.showToast({
+						title: msg[type]
+					})
+					if (activeIndex == 0) {
+						this.list.data[index].pay_type = type
+					} else {
+						this.list.data.splice(index, 1)
+					}
+					this.lockTap = false;
+					this.$util.hideAll()
+					this.updateTechnicianItem({
+						key: 'haveOperItem',
+						val: true
+					})
+					if (activeIndex == 0) return
+					await this.getList(true)
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+					return
+				}
+			},
+			// 订单详情
+			goDetail(index) {
+				let {
+					id
+				} = this.list.data[index]
+				let {
+					agent
+				} = this.options
+				let url = `/agent/pages/order/detail?id=${id}&agent=${agent}`
+				this.$util.goUrl({
+					url
+				})
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+</style>
diff --git a/agent/pages/poster/channel.vue b/agent/pages/poster/channel.vue
new file mode 100644
index 0000000..51339e7
--- /dev/null
+++ b/agent/pages/poster/channel.vue
@@ -0,0 +1,237 @@
+<template>
+	<view>
+		<view class="hideCanvasView">
+			<l-painter class="hideCanvas" ref="painter" useCORS />
+		</view>
+		<block v-if="src">
+			<image :src="src" class="code-img" @tap="previewImage"></image>
+			<view class="space-max-footer"></view>
+			<fix-bottom-button @confirm="toPreviewSave" :text="[{text: confirmText,type:'confirm'}]" bgColor="#fff"
+				:classType="2">
+			</fix-bottom-button>
+		</block>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions
+	} from 'vuex';
+	export default {
+		components: {},
+		props: {
+
+		},
+		data() {
+			return {
+				options: {},
+				// #ifdef H5
+				confirmText: '长按上图保存图片',
+				// #endif
+				// #ifndef H5
+				confirmText: '保存图片至相册',
+				// #endif
+				src: ''
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		async onLoad(options) {
+			this.options = options
+			// #ifdef H5
+			if (this.$jweixin.isWechat()) {
+				await this.$jweixin.initJssdk();
+				this.$jweixin.wxReady(() => {
+					this.$jweixin.hideOptionMenu()
+				})
+			}
+			// #endif
+			this.$util.showLoading()
+			await this.getConfigInfo()
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+			let that = this
+			setTimeout(() => {
+				that.renderToCanvas()
+			}, 1000)
+		},
+		methods: {
+			...mapActions(['getConfigInfo']),
+			async renderToCanvas() {
+				let that = this;
+				let {
+					type = 0
+				} = that.options
+
+				let qr_code = type == 1 ? await this.$api.salesman.salesmanQr() : await this.$api.agent.agentInviteQr({
+					type: 1
+				})
+
+				let {
+					channel_poster = ''
+				} = this.configInfo
+
+				let cover = channel_poster || 'https://lbqny.migugu.com/admin/anmo/mine/channel-share.png'
+
+				let {
+					nickName,
+					avatarUrl
+				} = this.userInfo
+				let qr_radius = '0rpx'
+				// #ifdef MP-WEIXIN
+				qr_radius = '97rpx'
+				// #endif
+
+				let poster = {
+					css: {
+						width: '750rpx',
+						height: '1280rpx',
+					},
+					views: [{
+							type: 'image',
+							src: cover,
+							css: {
+								width: '750rpx',
+								height: '1140rpx',
+								objectFit: "cover",
+								top: '0rpx',
+								left: '0rpx',
+								position: 'absolute'
+							}
+						},
+						{
+							type: 'view',
+							css: {
+								background: '#fff',
+								width: '750rpx',
+								height: '140rpx',
+								bottom: '0rpx',
+								left: '0rpx',
+								position: 'absolute'
+							},
+							views: [{
+									type: 'image',
+									src: avatarUrl,
+									css: {
+										position: 'absolute',
+										width: '94rpx',
+										height: '94rpx',
+										objectFit: 'cover',
+										borderRadius: '50rpx',
+										bottom: '23rpx',
+										left: '20rpx'
+									}
+								},
+								{
+									type: 'text',
+									text: nickName,
+									css: {
+										position: 'absolute',
+										bottom: '70rpx',
+										left: '130rpx',
+										width: '350rpx',
+										fontSize: '32rpx',
+										fontWeight: '400',
+										color: '#000'
+									}
+								},
+								{
+									type: 'text',
+									text: '邀请您成为TA的渠道商，扫描二维码立即加入吧!',
+									css: {
+										position: 'absolute',
+										bottom: '25rpx',
+										left: '130rpx',
+										width: '750rpx',
+										fontSize: '26rpx',
+										color: '#999999',
+									}
+								}
+							],
+						},
+						{
+							type: 'image',
+							src: qr_code,
+							css: {
+								position: 'absolute',
+								width: '200rpx',
+								height: '200rpx',
+								bottom: '337rpx',
+								left: '53rpx',
+								background: '#ffffff',
+								borderRadius: qr_radius
+							}
+						},
+						{
+							type: 'text',
+							text: '扫一扫',
+							css: {
+								position: 'absolute',
+								bottom: '290rpx',
+								left: '53rpx',
+								width: '200rpx',
+								fontSize: '26rpx',
+								color: '#999999',
+								textAlign: 'center'
+							}
+						}
+
+					]
+				}
+				// 渲染
+				this.$refs.painter.render(poster);
+				// 生成图片
+				this.$refs.painter.canvasToTempFilePathSync({
+					fileType: "jpg",
+					quality: 1,
+					success: (res) => {
+						that.$util.hideAll()
+						this.src = res.tempFilePath
+					},
+				});
+
+			},
+			previewImage() {
+				let finalPath = this.src;
+				uni.previewImage({
+					current: finalPath,
+					urls: [finalPath]
+				})
+			},
+			async saveImage() {
+				await this.$util.checkAuth({
+					type: "writePhotosAlbum"
+				});
+				let filePath = this.src;
+				let [err, success] = await uni.saveImageToPhotosAlbum({
+					filePath
+				})
+				if (err) return;
+				uni.showToast({
+					icon: 'none',
+					title: '保存成功'
+				})
+			},
+			toPreviewSave() {
+				// #ifdef H5
+				this.previewImage()
+				// #endif
+				// #ifndef H5
+				this.saveImage()
+				// #endif
+			}
+		}
+	}
+</script>
+
+<style>
+	.code-img {
+		width: 750rpx;
+		height: 1280rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/agent/pages/poster/salesman.vue b/agent/pages/poster/salesman.vue
new file mode 100644
index 0000000..6e8b48b
--- /dev/null
+++ b/agent/pages/poster/salesman.vue
@@ -0,0 +1,218 @@
+<template>
+	<view>
+		<view class="hideCanvasView">
+			<l-painter class="hideCanvas" ref="painter" useCORS />
+		</view>
+		<block v-if="src">
+			<image :src="src" class="code-img" @tap="previewImage"></image>
+			<view class="space-max-footer"></view>
+			<fix-bottom-button @confirm="toPreviewSave" :text="[{text: confirmText,type:'confirm'}]" bgColor="#fff"
+				:classType="2">
+			</fix-bottom-button>
+		</block>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions
+	} from 'vuex';
+	export default {
+		components: {},
+		props: {
+
+		},
+		data() {
+			return {
+				// #ifdef H5
+				confirmText: '长按上图保存图片',
+				// #endif
+				// #ifndef H5
+				confirmText: '保存图片至相册',
+				// #endif
+				src: ''
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		async onLoad(options) {
+			// #ifdef H5
+			if (this.$jweixin.isWechat()) {
+				await this.$jweixin.initJssdk();
+				this.$jweixin.wxReady(() => {
+					this.$jweixin.hideOptionMenu()
+				})
+			}
+			// #endif
+			this.$util.showLoading()
+			await this.getConfigInfo()
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+			let that = this
+			setTimeout(() => {
+				that.renderToCanvas()
+			}, 1000)
+		},
+		methods: {
+			...mapActions(['getConfigInfo']),
+			async renderToCanvas() {
+				let that = this;
+				let qr_code = await this.$api.agent.agentInviteQr({
+					type: 2
+				})
+
+				let {
+					salesman_poster = ''
+				} = this.configInfo
+
+				let cover = salesman_poster || 'https://lbqny.migugu.com/admin/anmo/mine/salesman-share.png'
+
+				let {
+					nickName,
+					avatarUrl
+				} = this.userInfo
+				let qr_radius = '0rpx'
+				// #ifdef MP-WEIXIN
+				qr_radius = '145rpx'
+				// #endif
+
+				let poster = {
+					css: {
+						width: '750rpx',
+						height: '1280rpx',
+					},
+					views: [{
+							type: 'image',
+							src: cover,
+							css: {
+								width: '750rpx',
+								height: '1140rpx',
+								objectFit: "cover",
+								top: '0rpx',
+								left: '0rpx',
+								position: 'absolute'
+							}
+						},
+						{
+							type: 'view',
+							css: {
+								background: '#fff',
+								width: '750rpx',
+								height: '140rpx',
+								bottom: '0rpx',
+								left: '0rpx',
+								position: 'absolute'
+							},
+							views: [{
+									type: 'image',
+									src: avatarUrl,
+									css: {
+										position: 'absolute',
+										width: '94rpx',
+										height: '94rpx',
+										objectFit: "cover",
+										borderRadius: '50rpx',
+										bottom: '23rpx',
+										left: '20rpx'
+									}
+								},
+								{
+									type: 'text',
+									text: nickName,
+									css: {
+										position: 'absolute',
+										bottom: '70rpx',
+										left: '130rpx',
+										width: '350rpx',
+										fontSize: '32rpx',
+										fontWeight: '400',
+										color: '#000'
+									}
+								},
+								{
+									type: 'text',
+									text: '邀请您成为TA的业务员，扫描二维码立即加入吧!',
+									css: {
+										position: 'absolute',
+										bottom: '25rpx',
+										left: '130rpx',
+										width: '750rpx',
+										fontSize: '26rpx',
+										color: '#999999',
+									}
+								}
+							],
+						},
+						{
+							type: 'image',
+							src: qr_code,
+							css: {
+								position: 'absolute',
+								width: '290rpx',
+								height: '290rpx',
+								bottom: '366rpx',
+								left: '228rpx',
+								background: '#ffffff',
+								borderRadius: qr_radius
+							}
+						},
+
+					]
+				}
+				// 渲染
+				this.$refs.painter.render(poster);
+				// 生成图片
+				this.$refs.painter.canvasToTempFilePathSync({
+					fileType: "jpg",
+					quality: 1,
+					success: (res) => {
+						that.$util.hideAll()
+						this.src = res.tempFilePath
+					},
+				});
+
+			},
+			previewImage() {
+				let finalPath = this.src;
+				uni.previewImage({
+					current: finalPath,
+					urls: [finalPath]
+				})
+			},
+			async saveImage() {
+				await this.$util.checkAuth({
+					type: "writePhotosAlbum"
+				});
+				let filePath = this.src;
+				let [err, success] = await uni.saveImageToPhotosAlbum({
+					filePath
+				})
+				if (err) return;
+				uni.showToast({
+					icon: 'none',
+					title: '保存成功'
+				})
+			},
+			toPreviewSave() {
+				// #ifdef H5
+				this.previewImage()
+				// #endif
+				// #ifndef H5
+				this.saveImage()
+				// #endif
+			}
+		}
+	}
+</script>
+
+<style>
+	.code-img {
+		width: 750rpx;
+		height: 1280rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/agent/pages/refund/detail.vue b/agent/pages/refund/detail.vue
new file mode 100644
index 0000000..b4d5472
--- /dev/null
+++ b/agent/pages/refund/detail.vue
@@ -0,0 +1,415 @@
+<template>
+	<view class="order-pages" v-if="detail.id">
+
+		<view class="item-child flex-center pd-lg fill-base f-paragraph c-base" style="height:200rpx"
+			:style="{background:primaryColor}">
+			<view class="flex-1 flex-y-baseline f-md-title">{{statusType[detail.status]}}
+				<view class="f-desc ml-md" v-if="detail.status == 2">退款金额¥{{detail.refund_price}}</view>
+			</view>
+		</view>
+
+		<view class="item-child mt-md ml-lg mr-lg pd-lg fill-base radius-16">
+			<view class="flex-between pb-lg">
+				<view class="f-paragraph c-title max-380 ellipsis">服务内容</view>
+			</view>
+			<view class="flex-center" :class="[{'mb-lg':aindex != detail.order_goods.length -1}]"
+				v-for="(aitem,aindex) in detail.order_goods" :key="aindex">
+				<!-- #ifdef H5 -->
+				<view class="avatar lg radius-16">
+					<view class="h5-image avatar lg radius-16"
+						:style="{ backgroundImage : `url('${aitem.goods_cover}')`}">
+					</view>
+				</view>
+				<!-- #endif -->
+				<!-- #ifndef H5 -->
+				<image mode="aspectFill" class="avatar lg radius-16" :src="aitem.goods_cover"></image>
+				<!-- #endif -->
+				<view class="flex-1 ml-md">
+					<view class="flex-between">
+						<view class="f-mini-title c-title text-bold max-380 ellipsis">
+							{{aitem.goods_name}}
+						</view>
+						<view class="c-paragraph">x{{aitem.num}}</view>
+					</view>
+					<view class="f-caption c-caption" v-if="aitem.material_price*1>0">物料费：¥{{aitem.material_price}}
+					</view>
+					<view class="f-caption mt-md" style="color:#777">服务时长 {{aitem.time_long}}分钟</view>
+					<view class="f-paragraph c-warning text-bold mt-sm">¥{{aitem.goods_price}}
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="store-info mt-md ml-lg mr-lg pd-lg  fill-base radius-16" v-if="detail.store_id">
+			<view class="f-mini-title c-title text-bold pb-md">
+				{{detail.store_info.title}}
+			</view>
+			<view class="flex-between">
+				<view class="flex-y-center" style="color: #303030;">
+					<i class="iconfont icondizhi1 mr-sm"></i>
+					<view class="c-title flex-1 mr-md">
+						<span>{{detail.store_info.address || `暂未设置门店地址`}}</span>
+						<span @tap.stop="$util.goUrl({url:detail.store_info.address,openType:'copy'})"
+							class="copy-btn span radius-5 f-icontext ml-sm"
+							:style="{color:primaryColor,borderColor:primaryColor}"
+							v-if="detail.store_info.address">复制</span>
+					</view>
+				</view>
+				<view class="flex-center">
+					<view @tap.stop="$util.goUrl({url:detail.store_info.phone,openType:'call'})"
+						class="item-icon rel flex-center radius-16">
+						<view class="item-icon radius-16 abs" :style="{background:primaryColor}"></view>
+						<i class="iconfont icondadianhua_1" :style="{color:primaryColor}"></i>
+					</view>
+					<view @tap.stop="toMap('store_info')" class="item-icon rel flex-center radius-16 ml-md"
+						v-if="detail.store_info.address">
+						<view class="item-icon radius-16 abs" :style="{background:primaryColor}"></view>
+						<i class="iconfont icondizhi_1" :style="{color:primaryColor}"></i>
+					</view>
+				</view>
+			</view>
+		</view>
+
+
+		<view class="order-agent-info store-info mt-md ml-lg mr-lg pd-lg fill-base f-paragraph radius-16">
+			<view class="flex-between">
+				<image mode="aspectFill" class="coach-img radius" :src="detail.coach_info.work_img"></image>
+				<view class="f-title text-bold max-450 ellipsis">
+					{{detail.coach_info ? detail.coach_info.coach_name : ''}}
+				</view>
+			</view>
+			<view class="flex-center mt-lg">
+				<view class="title">下单人</view>
+				<view class="text flex-1 ellipsis">{{detail.address_info.user_name}}</view>
+			</view>
+			<view class="flex-center mt-lg">
+				<view class="title">联系方式</view>
+				<view class="text flex-1 flex-between">
+					<view>
+						{{detail.address_info.mobile.substring(0,3)}}****{{detail.address_info.mobile.substring(7,11)}}
+					</view>
+					<view @tap.stop="toTel" class="item-icon rel flex-center radius-16">
+						<view class="item-icon radius-16 abs" :style="{background:primaryColor}"></view>
+						<i class="iconfont icondadianhua_1" :style="{color:primaryColor}"></i>
+					</view>
+				</view>
+			</view>
+			<view class="flex-warp mt-lg" v-if="!detail.store_id">
+				<view class="title">服务地址</view>
+				<view class="text flex-1 flex-between">
+					<view style="max-width: 350rpx;">
+						<span>{{`${detail.address_info.address}${detail.address_info.address_info}`}}</span>
+						<span @tap="toCopy" class="copy-btn fill radius-5 f-icontext ml-sm">复制</span>
+					</view>
+					<view @tap.stop="toMap('address_info')" class="item-icon rel flex-center radius-16">
+						<view class="item-icon radius-16 abs" :style="{background:primaryColor}"></view>
+						<i class="iconfont icondizhi_1" :style="{color:primaryColor}"></i>
+					</view>
+				</view>
+			</view>
+			<view class="flex-between mt-lg pt-lg b-1px-t">
+				<view class="title"></view>
+				<view class="flex-y-baseline f-paragraph c-black text-bold">总计：<view class="c-warning">
+						¥{{detail.apply_price}}</view>
+					<view class="flex-y-center ml-md" v-if="detail.car_price*1>0">含车费：
+						<view class="f-icontext">¥</view>{{detail.car_price}}
+					</view>
+				</view>
+			</view>
+		</view>
+
+
+		<view class="order-agent-info mt-md ml-lg mr-lg pd-lg fill-base radius-16">
+			<view class="flex-center">
+				<view class="title">退款单号</view>
+				<view class="text flex-1">
+					<view class="flex-between">
+						<view class="max-350 ellipsis">{{detail.order_code}}</view>
+						<view @tap="$util.goUrl( {url:`${detail.order_code}`,openType:'copy'})"
+							class="copy-btn flex-center radius-5 f-icontext"
+							:style="{color:primaryColor,borderColor:primaryColor}">
+							复制</view>
+					</view>
+				</view>
+			</view>
+			<view class="flex-center mt-lg" v-if="detail.out_refund_no">
+				<view class="title">微信退款单号</view>
+				<view class="text flex-1">
+					<view class="flex-between">
+						<view class="max-350 ellipsis">{{detail.out_refund_no}}</view>
+						<view @tap="$util.goUrl( {url:`${detail.out_refund_no}`,openType:'copy'})"
+							class="copy-btn flex-center radius-5 f-icontext"
+							:style="{color:primaryColor,borderColor:primaryColor}">复制</view>
+					</view>
+				</view>
+			</view>
+			<view class="flex-center mt-lg">
+				<view class="title">提交日期</view>
+				<view class="text flex-1 ellipsis">{{detail.create_time}}</view>
+			</view>
+			<view class="flex-center mt-lg" v-if="detail.status != 1">
+				<view class="title">审核日期</view>
+				<view class="text flex-1 ellipsis">{{detail.refund_time}}</view>
+			</view>
+			<view class="mt-lg">
+				<view class="title">退款原因</view>
+				<view class="text mt-sm">{{detail.text}}</view>
+			</view>
+			<view class="flex-column" v-if="detail.imgs && detail.imgs.length > 0">
+				<view class="title">上传图片</view>
+				<view class="flex-warp">
+					<block v-for="(item,index) in detail.imgs" :key="index">
+						<image @tap.top="previewImage(item,detail.imgs)" class="refund-img mt-md mr-md radius-10"
+							:src="item" />
+					</block>
+				</view>
+			</view>
+		</view>
+
+		<view class="space-max-footer"></view>
+
+
+
+
+		<fix-bottom-button @cancel="toConfirm(3)" @confirm="toConfirm(2)"
+			:text="[{text:'拒绝退款',type:'cancel'},{text:'同意退款',type:'confirm'}]" bgColor="#fff" :classType="2"
+			v-if="detail.status==1">
+		</fix-bottom-button>
+
+
+		<uni-popup ref="change_item" type="center" :custom="true">
+			<view class="common-popup-content fill-base pd-lg radius-34">
+				<view class="title">温馨提示</view>
+				<view class="desc">
+					你确认要操作{{statusType[popupInfo.type]}}吗?
+				</view>
+				<view class="mt-lg" v-if="popupInfo.type == 2">
+					<input v-model="popupInfo.price" type="digit"
+						class="input flex-y-center pl-lg pr-lg f-sm-title c-title radius-16"
+						placeholder-class="c-placeholder" placeholder="请输入退款金额" />
+					<view class="f-desc c-caption mt-md">
+						<view class="flex-y-center">实际可退款金额<view class="ml-sm c-warning">¥{{popupInfo.apply_price}}
+							</view>
+						</view>
+						<view>退款金额不能大于可退款金额</view>
+					</view>
+				</view>
+				<view class="button">
+					<view @tap.stop="$refs.change_item.close()" class="item-child">取消</view>
+					<view @tap.stop="confirmChangeOrder" class="item-child c-base"
+						:style="{background: primaryColor,color:'#fff'}">确定</view>
+				</view>
+			</view>
+		</uni-popup>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		data() {
+			return {
+				options: {},
+				carType: {
+					0: '公交/地铁',
+					1: '出租车'
+				},
+				payType: {
+					1: '微信支付',
+					2: '余额支付',
+					3: '支付宝支付'
+				},
+				statusType: {
+					1: '退款申请中',
+					2: '同意退款',
+					3: '拒绝退款',
+				},
+				detail: {
+					pay_type: 0
+				},
+				lockTap: false,
+				popupInfo: {}
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+			over_time_text() {
+				return new Date().getTime() + this.detail.end_time * 1000
+			}
+		}),
+		onLoad(options) {
+			let {
+				agent = 0
+			} = options
+			options.agent = agent * 1
+			this.options = options
+			this.initIndex()
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getCoachInfo']),
+			...mapMutations(['updateTechnicianItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				if (!this.configInfo.id || refresh) {
+					await this.getConfigInfo()
+				}
+				let {
+					id,
+					agent
+				} = this.options
+				let methodKey = agent ? 'agent' : 'admin'
+				let data = await this.$api[methodKey].refundOrderInfo({
+					id
+				})
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				data.is_balance = data.balance * 1 > 0 ? 1 : 0
+				this.detail = data
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			// type: 2同意退款；3拒绝退款
+			async toConfirm(type) {
+				let {
+					id,
+					apply_price
+				} = this.detail
+				this.popupInfo = {
+					id,
+					type,
+					apply_price,
+					price: type == 2 ? apply_price : '',
+					text: ''
+				}
+				this.$refs.change_item.open()
+			},
+			async confirmChangeOrder() {
+				let {
+					type,
+					price,
+					apply_price
+				} = this.popupInfo
+				let param = this.$util.pick(this.popupInfo, ['id', 'price', 'text'])
+				let reg = /^(([0-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/
+				if (type == 2 && (!price || !reg.test(price) || price * 1 > apply_price * 1)) {
+					this.$util.showToast({
+						title: !price ? '请输入退款金额' : !reg.test(price) ? '请输入正确的退款金额，最多保留2位小数' : '退款金额不能大于可退款金额'
+					})
+					return
+				}
+				if (this.lockTap) return;
+				this.lockTap = true;
+				this.$util.showLoading()
+				let {
+					agent
+				} = this.options
+				let methodKey = agent ? 'agent' : 'admin'
+				let methodModel = type == 2 ? 'passRefund' : 'noPassRefund'
+				try {
+					await this.$api[methodKey][methodModel](param)
+					this.$refs.change_item.close()
+					this.$util.showToast({
+						title: '操作成功'
+					})
+					this.lockTap = false;
+					this.updateTechnicianItem({
+						key: 'haveOperItem',
+						val: true
+					})
+					this.initRefresh()
+					this.$util.back()
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+					return
+				}
+			},
+			// 咨询
+			async toTel() {
+				let {
+					id: order_id,
+					pay_type
+				} = this.detail
+				let {
+					agent
+				} = this.options
+				let methodKey = agent ? 'agent' : 'admin'
+				if ([2, 3, 4, 5, 6].includes(pay_type)) {
+					let url = await this.$api[methodKey].getVirtualPhone({
+						order_id
+					})
+					this.$util.goUrl({
+						url,
+						openType: `call`
+					})
+				} else {
+					let msg = pay_type == 7 ? '服务结束' : '服务取消'
+					this.$util.showToast({
+						title: `${msg}不能联系客户哦`
+					})
+				}
+			},
+			// 复制定位
+			toCopy() {
+				let {
+					address,
+					address_info
+				} = this.detail.address_info
+				let url = `${address}${address_info}`
+				this.$util.goUrl({
+					url,
+					openType: 'copy'
+				})
+			},
+			// 查看定位
+			async toMap(key) {
+				let {
+					address,
+					address_info = '',
+					lat,
+					lng
+				} = this.detail[key]
+				await this.$util.checkAuth({
+					type: 'userLocation'
+				})
+				await uni.getLocation({
+					type: 'gcj02',
+				})
+				await uni.openLocation({
+					latitude: lat * 1,
+					longitude: lng * 1,
+					name: address_info ? `${address} ${address_info}` : address,
+					scale: 28
+				})
+			},
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.avatar.coath {
+		width: 94rpx;
+		height: 94rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/agent/pages/refund/list.vue b/agent/pages/refund/list.vue
new file mode 100644
index 0000000..9683f47
--- /dev/null
+++ b/agent/pages/refund/list.vue
@@ -0,0 +1,330 @@
+<template>
+	<view class="order-pages">
+		<fixed>
+			<view class="fill-base pt-lg pl-md pr-md pb-md">
+				<search @input="toSearch" type="input" :padding="0" :radius="30" height="70rpx"
+					placeholder="请输入系统订单号查询">
+				</search>
+			</view>
+			<tab @change="handerTabChange" :list="tabList" :activeIndex="activeIndex*1" :activeColor="primaryColor"
+				width="25%" height="100rpx"></tab>
+			<view class="b-1px-b"></view>
+		</fixed>
+
+		<view @tap.stop="goDetail(index)" class="item-child mt-md ml-lg mr-lg pd-lg fill-base radius-16"
+			v-for="(item,index) in list.data" :key="index">
+			<view class="flex-between pb-lg b-1px-b">
+				<view class="f-paragraph c-title max-450 ellipsis">订单号：{{item.order_code}}</view>
+				<view class="f-caption text-bold"
+					:style="{color:item.status==1?subColor: item.status == 2 ? '#11C95E' : '#333'}">
+					{{statusType[item.status]}}
+				</view>
+			</view>
+			<view class="flex-center mb-lg" :class="[{'mt-lg':aindex==0}]" v-for="(aitem,aindex) in item.order_goods"
+				:key="aindex">
+				<!-- #ifdef H5 -->
+				<view class="avatar lg radius-16">
+					<view class="h5-image avatar lg radius-16"
+						:style="{ backgroundImage : `url('${aitem.goods_cover}')`}">
+					</view>
+				</view>
+				<!-- #endif -->
+				<!-- #ifndef H5 -->
+				<image mode="aspectFill" class="avatar lg radius-16" :src="aitem.goods_cover"></image>
+				<!-- #endif -->
+
+				<view class="flex-1 ml-md">
+					<view class="flex-between">
+						<view class="f-mini-title c-title text-bold max-380 ellipsis">
+							{{aitem.goods_name}}
+						</view>
+						<view class="c-paragraph">x{{aitem.num}}</view>
+					</view>
+					<view class="mt-md f-caption c-caption max-450 ellipsis">
+						服务{{$t('action.attendantName')}}：{{item.coach_info?item.coach_info.coach_name:'-'}}</view>
+					<view class="f-caption c-caption" style="margin-top: 5rpx;">服务时间：{{item.start_time}}</view>
+				</view>
+			</view>
+			<view class="flex-between pt-lg b-1px-t">
+				<view class="flex-y-center f-desc c-title">总计：
+					<view class="f-paragraph text-bold">¥{{item.apply_price}}</view>
+				</view>
+				<view class="flex-warp">
+					<!-- 退款申请中 -->
+					<block v-if="item.status == 1">
+						<button @tap.stop="toConfirm(index,3)" class="clear-btn order"
+							style="margin-left: 0;">拒绝退款</button>
+						<button @tap.stop="toConfirm(index,2)" class="clear-btn order"
+							:style="{color:'#fff',background:primaryColor,border:`1rpx solid ${primaryColor}`}">同意退款</button>
+					</block>
+					<!-- 同意/拒绝退款 -->
+					<view v-else>
+						<button class="clear-btn order"
+							:style="{color:'#fff',background:primaryColor,border:`1rpx solid ${primaryColor}`}">查看详情</button>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+
+		<view class="space-footer"></view>
+
+		<uni-popup ref="change_item" type="center" :custom="true">
+			<view class="common-popup-content fill-base pd-lg radius-34">
+				<view class="title">温馨提示</view>
+				<view class="desc">
+					你确认要操作{{statusType[popupInfo.type]}}吗?
+				</view>
+				<view class="mt-lg" v-if="popupInfo.type == 2">
+					<input v-model="popupInfo.price" type="digit"
+						class="input flex-y-center pl-lg pr-lg f-sm-title c-title radius-16"
+						placeholder-class="c-placeholder" placeholder="请输入退款金额" />
+					<view class="f-desc c-caption mt-md">
+						<view class="flex-y-center">实际可退款金额<view class="ml-sm c-warning">¥{{popupInfo.apply_price}}
+							</view>
+						</view>
+						<view>退款金额不能大于可退款金额</view>
+					</view>
+				</view>
+				<view class="button">
+					<view @tap.stop="$refs.change_item.close()" class="item-child">取消</view>
+					<view @tap.stop="confirmChangeOrder" class="item-child c-base"
+						:style="{background: primaryColor,color:'#fff'}">确定</view>
+				</view>
+			</view>
+		</uni-popup>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		data() {
+			return {
+				options: {},
+				activeIndex: 0,
+				tabList: [{
+					title: '全部',
+					id: 0
+				}, {
+					title: '退款申请中',
+					id: 1,
+				}, {
+					title: '同意退款',
+					id: 2
+				}, {
+					title: '拒绝退款',
+					id: 3
+				}],
+				statusType: {
+					1: '退款申请中',
+					2: '同意退款',
+					3: '拒绝退款',
+				},
+				param: {
+					page: 1,
+				},
+				list: {
+					data: []
+				},
+				loading: true,
+				popupInfo: {},
+				lockTap: false
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad(options) {
+			let {
+				agent = 0,
+					bell = 0,
+					tab = 0
+			} = options
+			options.agent = agent * 1
+			this.options = options
+			this.activeIndex = tab
+			uni.setNavigationBarTitle({
+				title: bell == 1 ? '加钟退款' : '服务退款'
+			})
+			this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			...mapMutations(['updateTechnicianItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				await this.getList()
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			toSearch(val) {
+				this.param.page = 1
+				this.param.order_code = val
+				this.getList()
+			},
+			async getList() {
+				let {
+					list: oldList,
+					param,
+					tabList,
+					activeIndex
+				} = this
+				param.status = tabList[activeIndex].id
+				let {
+					bell = 0,
+						agent
+				} = this.options
+				param.is_add = bell
+				let methodKey = agent ? 'agent' : 'admin'
+				let newList = await this.$api[methodKey].refundOrderList(param);
+
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+			},
+			handerTabChange(index) {
+				this.activeIndex = index;
+				this.$util.showLoading()
+				this.param.page = 1;
+				this.getList()
+			},
+			// type: 2同意退款；3拒绝退款
+			async toConfirm(index, type) {
+				let {
+					id,
+					apply_price
+				} = this.list.data[index]
+				this.popupInfo = {
+					index,
+					id,
+					type,
+					apply_price,
+					price: type == 2 ? apply_price : '',
+					text: ''
+				}
+				this.$refs.change_item.open()
+			},
+			async confirmChangeOrder() {
+				let {
+					type,
+					index,
+					price,
+					apply_price
+				} = this.popupInfo
+				let param = this.$util.pick(this.popupInfo, ['id', 'price', 'text'])
+				let reg = /^(([0-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/
+				if (type == 2 && (!price || !reg.test(price) || price * 1 > apply_price * 1)) {
+					this.$util.showToast({
+						title: !price ? '请输入退款金额' : !reg.test(price) ? '请输入正确的退款金额，最多保留2位小数' : '退款金额不能大于可退款金额'
+					})
+					return
+				}
+				let {
+					activeIndex
+				} = this
+				if (this.lockTap) return;
+				this.lockTap = true;
+				this.$util.showLoading()
+				let {
+					agent
+				} = this.options
+				let methodKey = agent ? 'agent' : 'admin'
+				let methodModel = type == 2 ? 'passRefund' : 'noPassRefund'
+				try {
+					await this.$api[methodKey][methodModel](param)
+					this.$refs.change_item.close()
+					this.$util.showToast({
+						title: '操作成功'
+					})
+					if (activeIndex == 0) {
+						this.list.data[index].status = type
+					} else {
+						this.list.data.splice(index, 1)
+					}
+					this.lockTap = false;
+					this.$util.hideAll()
+					this.updateTechnicianItem({
+						key: 'haveOperItem',
+						val: true
+					})
+					if (activeIndex == 0) return
+					await this.getList(true)
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+					return
+				}
+			},
+			// 订单详情
+			goDetail(index) {
+				let {
+					id
+				} = this.list.data[index]
+				let {
+					agent
+				} = this.options
+				let url = `/agent/pages/refund/detail?id=${id}&agent=${agent}`
+				this.$util.goUrl({
+					url
+				})
+			},
+			// 平台
+			toTel() {
+				let {
+					mobile: url
+				} = this.configInfo
+				this.$util.goUrl({
+					url,
+					openType: `call`
+				})
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+</style>
\ No newline at end of file
diff --git a/agent/pages/technician/apply.vue b/agent/pages/technician/apply.vue
new file mode 100644
index 0000000..71af8e4
--- /dev/null
+++ b/agent/pages/technician/apply.vue
@@ -0,0 +1,775 @@
+<template>
+	<view class="apply-pages" v-if="isLoad">
+		<view class="apply-form">
+			<view class="fill-base radius-16">
+				<view @tap.stop="toChooseUser" class="flex-between pl-lg pr-lg b-1px-b">
+					<view class="item-text">关联用户</view>
+					<view class="item-input text">
+						<view class="flex-between">
+							{{form.user_id ? form.nickName :'请选择'}}
+							<i class="iconfont icon-right ml-sm" style="font-size: 28rpx;"></i>
+						</view>
+					</view>
+				</view>
+				<view class="flex-between pl-lg pr-lg b-1px-b">
+					<view class="item-text flex-y-center"><i class="iconfont icon-required c-warning"></i>姓名</view>
+					<input v-model="form.coach_name" type="text" class="item-input flex-1" maxlength="20"
+						:placeholder="rule[0].errorMsg" />
+				</view>
+				<view class="flex-between pl-lg pr-lg b-1px-b">
+					<view class="item-text flex-y-center"><i class="iconfont icon-required c-warning"></i>性别</view>
+					<view class="item-input flex-1 flex-y-center">
+						<view @tap.stop="form.sex = index" class="flex-y-center" :class="[{'mr-lg':index==0}]"
+							:style="{color:form.sex == index ? primaryColor:''}" v-for="(item,index) in ['男','女']"
+							:key="index"><i class="iconfont icon-xuanze mr-sm"
+								:class="[{'icon-xuanze-fill':form.sex == index}]"></i>{{item}}
+						</view>
+					</view>
+				</view>
+				<view class="flex-between ml-lg mr-lg b-1px-b">
+					<view class="item-text flex-y-center"><i class="iconfont icon-required c-warning"></i>生日</view>
+					<view class="item-input text flex-1">
+						<picker @change="pickerChange($event,'birthday')" mode="date" :end="endYear"
+							:value="form.birthday">
+							<view class="flex-between">
+								{{form.birthday||'请选择'}}
+								<i class="iconfont icon-right ml-sm" style="font-size: 28rpx;"></i>
+							</view>
+						</picker>
+					</view>
+				</view>
+				<view class="flex-between pl-lg pr-lg b-1px-b">
+					<view class="item-text flex-y-center"><i class="iconfont icon-required c-warning"></i>手机号</view>
+					<input v-model="form.mobile" type="text" class="item-input flex-1"
+						:placeholder="rule[2].errorMsg" />
+				</view>
+				<view class="flex-between pl-lg pr-lg b-1px-b">
+					<view class="item-text flex-y-center"><i class="iconfont icon-required c-warning"></i>从业年份</view>
+					<input v-model="form.work_time" type="number" class="item-input flex-1"
+						:placeholder="rule[3].errorMsg" />
+				</view>
+				<view class="flex-between pl-lg pr-lg b-1px-b">
+					<view class="item-text flex-y-center" style="width:230rpx"><i
+							class="iconfont icon-required c-warning"></i>意向工作城市</view>
+					<view class="item-input text">
+						<picker @change="pickerChange($event,'city')" :value="cityIndex" :range="cityList"
+							range-key="title">
+							<view class="flex-between">
+								{{cityIndex!=-1?cityList[cityIndex].title:'请选择'}}
+								<i class="iconfont icon-right ml-sm" style="font-size: 28rpx;"></i>
+							</view>
+						</picker>
+					</view>
+				</view>
+				<view class="flex-between pl-lg pr-lg b-1px-b" v-if="configInfo.plugAuth.store && storeList.length>0">
+					<view class="item-text">挂靠门店</view>
+					<view class="item-input text">
+						<picker @change="pickerChange($event,'store')" :value="storeIndex" :range="storeList"
+							range-key="title">
+							<view class="flex-between">
+								<view class="max-400 ellipsis">{{storeIndex!=-1?storeList[storeIndex].title:'请选择'}}
+								</view>
+								<i class="iconfont icon-right ml-sm" style="font-size: 28rpx;"></i>
+							</view>
+						</picker>
+					</view>
+				</view>
+				<view class="flex-between pl-lg pr-lg">
+					<view class="item-text flex-y-center"><i class="iconfont icon-required c-warning"></i>所在地址</view>
+					<view class="item-input text flex-1">
+						<view @tap.stop="toChooseLocation" class="flex-between">
+							<view>{{form.address || `点击右边图标设置`}}</view>
+							<i class="iconfont iconjuli ml-sm" :style="{color: primaryColor}"></i>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="fill-base mt-md radius-16">
+				<view class="flex-between pl-lg pr-lg">
+					<view class="item-text flex-y-center" style="width:auto"><i
+							class="iconfont icon-required c-warning"></i>{{$t('action.attendantName')}}简介</view>
+					<input :disabled="true" type="text" class="item-input flex-1" />
+				</view>
+				<textarea v-model="form.text" class="item-textarea pd-lg" maxlength="300"
+					:placeholder="'输入'+$t('action.attendantName')+'简介'" />
+				<view class="text-right pb-lg pr-lg">
+					{{form.text.length>300?300:form.text.length}}/300
+				</view>
+			</view>
+			<view class="fill-base mt-md radius-16">
+				<view class="flex-between pl-lg pr-lg">
+					<view class="item-text flex-y-center"><i class="iconfont icon-required c-warning"></i>身份证号</view>
+					<input v-model="form.id_code" type="text" class="item-input flex-1"
+						:placeholder="rule[7].errorMsg" />
+				</view>
+			</view>
+			<view class="fill-base mt-md radius-16">
+				<view class="flex-between pl-lg pr-lg">
+					<view class="item-text flex-y-center"><i class="iconfont icon-required c-warning"></i>身份证照片</view>
+					<view class="item-input flex-1">图片大小不超过10M</view>
+				</view>
+				<view class="flex-between pl-lg pr-lg pb-md">
+					<upload @upload="imgUpload" :imagelist="form.id_card" imgtype="id_card" imgclass="md" text="身份证人像面"
+						:imgsize="1"></upload>
+					<upload @upload="imgUpload" :imagelist="form.id_card_fan" imgtype="id_card_fan" imgclass="md"
+						text="身份证国徽面" :imgsize="1"></upload>
+				</view>
+				<view class="flex-between pl-lg pr-lg pb-md">
+					<upload @upload="imgUpload" :imagelist="form.id_card_people" imgtype="id_card_people" imgclass="md"
+						text="手持身份证照片" :imgsize="1"></upload>
+				</view>
+			</view>
+			<view class="fill-base mt-md radius-16">
+				<view class="flex-between pl-lg pr-lg">
+					<view class="item-text flex-y-center"><i class="iconfont icon-required c-warning"></i>资格证书</view>
+					<view class="item-input flex-1">图片大小不超过10M</view>
+				</view>
+				<view class="flex-between pl-lg pr-lg pb-md">
+					<upload @upload="imgUpload" @del="imgUpload" :imagelist="form.license" imgtype="license" text="上传图片"
+						:imgsize="15">
+					</upload>
+				</view>
+			</view>
+			<view class="fill-base mt-md radius-16">
+				<view class="flex-between pl-lg pr-lg">
+					<view class="item-text flex-y-center"><i class="iconfont icon-required c-warning"></i>工作形象照</view>
+					<view class="item-input flex-1">图片建议尺寸: 750 * 750，大小不超过10M</view>
+				</view>
+				<view class="flex-between pl-lg pr-lg pb-md">
+					<upload @upload="imgUpload" :imagelist="form.work_img" imgtype="work_img" text="上传图片" :imgsize="1">
+					</upload>
+				</view>
+			</view>
+			<view class="fill-base mt-md radius-16">
+				<view class="flex-between pl-lg pr-lg">
+					<view class="item-text flex-y-center"><i class="iconfont icon-required c-warning"></i>个人生活照</view>
+					<view class="item-input flex-1">图片建议尺寸: 750 * n，大小不超过10M</view>
+				</view>
+				<view class="flex-between pl-lg pr-lg pb-md">
+					<upload @upload="imgUpload" @del="imgUpload" :imagelist="form.self_img" filetype="picture"
+						imgtype="self_img" text="上传图片" :imgsize="9">
+					</upload>
+				</view>
+			</view>
+			<view class="fill-base mt-md radius-16">
+				<view class="flex-between pl-lg pr-lg">
+					<view class="item-text">个人视频介绍</view>
+					<view class="item-input flex-1">视频大小不超过50M</view>
+				</view>
+				<view class="flex-between pl-lg pr-lg pb-md">
+					<upload @upload="imgUpload" @del="imgUpload" :imagelist="form.video" filetype="video"
+						imgtype="video" text="上传视频" :imgsize="1">
+					</upload>
+				</view>
+			</view>
+			<view class="fill-base mt-md radius-16">
+				<view class="flex-between pl-lg pr-lg b-1px-b">
+					<view class="item-text flex-y-center"><i class="iconfont icon-required c-warning"></i>虚拟订单</view>
+					<input v-model="form.order_num" type="number" class="item-input flex-1"
+						:placeholder="rule[14].errorMsg" />
+				</view>
+				<view class="flex-between pl-lg pr-lg b-1px-b">
+					<view class="item-text flex-y-center"><i class="iconfont icon-required c-warning"></i>是否接单</view>
+					<view class="item-input flex-1 flex-y-center">
+						<view @tap.stop="toSetItem(index)" class="flex-y-center" :class="[{'mr-lg':item.id==1}]"
+							:style="{color:form.is_work == item.id ? primaryColor:''}" v-for="(item,index) in workList"
+							:key="index"><i class="iconfont mr-sm"
+								:class="[{'icon-xuanze':form.is_work != item.id},{'icon-radio-fill':form.is_work == item.id}]"></i>{{item.title}}
+						</view>
+					</view>
+				</view>
+				<view class="flex-between pd-lg" v-if="form.is_work===1">
+					<view @tap.stop="toShowTime('start_time')" class="item-time flex-center flex-column">
+						<view>开始时间</view>
+						<view class="mt-sm" :style="{color:form.start_time ? primaryColor : '#999'}">
+							{{form.start_time || '选择时间'}}
+						</view>
+					</view>
+					<view @tap.stop="toShowTime('end_time')" class="item-time flex-center flex-column  b-1px-l">
+						<view>结束时间</view>
+						<view class="mt-sm" :style="{color:form.end_time ? primaryColor : '#999'}">
+							{{form | handleStartEndTime(toDay)}}{{form.end_time || '选择时间'}}
+						</view>
+					</view>
+				</view>
+			</view>
+			
+			
+			<!-- TODO 合同 -->
+			<view @tap.stop="toFddSign" class="fill-base mt-md radius-16"
+				v-if="fdd_agreement && fdd_agreement.hasOwnProperty('viewpdf_url')">
+				<view class="flex-between pl-lg pr-lg b-1px-b">
+					<view class="item-text">电子签约</view>
+					<view class="item-input flex-1" :style="{color:primaryColor}">
+						查看签约合同
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="space-max-footer"></view>
+
+		<fix-bottom-button @confirm="submit" :text="[{text:'确定提交',type:'confirm',isAuth:true}]" bgColor="#fff">
+		</fix-bottom-button>
+
+
+		<w-picker :visible.sync="showTime" mode="time" :value="toDayTime" :current="false" :second="false"
+			:themeColor="primaryColor" @confirm="onConfirm" ref="time"></w-picker>
+	</view>
+</template>
+
+<script>
+	import $util from "@/utils/index.js"
+	import wPicker from "@/components/w-picker/w-picker.vue";
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {
+			wPicker
+		},
+		data() {
+			return {
+				isLoad: false,
+				options: {},
+				cityList: [],
+				cityIndex: -1,
+				storeList: [],
+				storeIndex: -1,
+				toDay: '',
+				toDayTime: '',
+				showKey: '',
+				showTime: false,
+				workList: [{
+					id: 1,
+					title: '接单'
+				}, {
+					id: 0,
+					title: '休息'
+				}],
+				fdd_agreement: {},
+				form: {
+					id: 0,
+					user_id: '',
+					nickName: '',
+					coach_name: '', //姓名 
+					mobile: '', //手机号 
+					sex: 0, //性别 
+					birthday: '',
+					work_time: '', //从业年份 
+					city_id: '', // 城市id
+					store_id: '', // 门店id
+					lng: '',
+					lat: '',
+					address: '', //详细地址 
+					text: '', //备注 
+					id_code: '', //身份证号
+					id_card: [], //身份证
+					id_card_fan: [], // 身份证反面
+					id_card_people: [], //手持身份证
+					license: [], //资格证书
+					work_img: [], // 工作照
+					self_img: [], // 生活照
+					city_id: '', // 城市 id
+					video: [],
+					order_num: 0,
+					is_work: 1,
+					start_time: '00:00',
+					end_time: '23:59'
+				},
+				rule: [{
+						name: "coach_name",
+						checkType: "isNotNull",
+						errorMsg: "输入您的姓名",
+						regType: 2
+					}, {
+						name: "birthday",
+						checkType: "isNotNull",
+						errorMsg: "请选择您的生日",
+						regType: 2
+					},
+					{
+						name: "mobile",
+						checkType: "isMobile",
+						errorMsg: "输入手机号"
+					}, {
+						name: "work_time",
+						checkType: "isNotNull",
+						errorMsg: "请输入从业年份，例如：5"
+					}, {
+						name: "city_id",
+						checkType: "isNotNull",
+						errorMsg: "请选择意向工作城市"
+					},
+					{
+						name: "address",
+						checkType: "isNotNull",
+						errorMsg: "请选择所在地址"
+					}, {
+						name: "text",
+						checkType: "isNotNull",
+						errorMsg: "请输入" + this.$t('action.attendantName') + "简介",
+						regType: 2
+					}, {
+						name: "id_code",
+						checkType: "isIdCard",
+						errorMsg: "输入您的身份证号码"
+					},
+					{
+						name: "id_card",
+						checkType: "isNotNull",
+						errorMsg: "请上传身份证人像面"
+					},
+					{
+						name: "id_card_fan",
+						checkType: "isNotNull",
+						errorMsg: "请上传身份证国徽面"
+					},
+					{
+						name: "id_card_people",
+						checkType: "isNotNull",
+						errorMsg: "请上传手持身份证照片"
+					},
+					{
+						name: "license",
+						checkType: "isNotNull",
+						errorMsg: "请上传资格证书"
+					},
+					{
+						name: "work_img",
+						checkType: "isNotNull",
+						errorMsg: "请上传工作形象照"
+					},
+					{
+						name: "self_img",
+						checkType: "isNotNull",
+						errorMsg: "请上传个人生活照"
+					},
+					{
+						name: "order_num",
+						checkType: "isNumber",
+						errorMsg: "请输入虚拟订单量",
+						regType: 2
+					},
+				],
+				have_user_id: false,
+				lockTap: false
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+			location: state => state.user.location,
+		}),
+		async onLoad(options) {
+			let {
+				id = 0
+			} = options
+			this.options = options
+			this.$util.showLoading()
+			await this.initIndex()
+			let {
+				coach_status
+			} = this
+			
+			uni.setNavigationBarTitle({
+				title: id ? '编辑' : '新增' + this.$t(
+					'action.attendantName')
+			})
+			this.isLoad = true
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getUserInfo']),
+			...mapMutations(['updateUserItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				if (!this.configInfo.id || !this.configInfo.hasOwnProperty(
+						'plugAuth') || (this.configInfo.hasOwnProperty(
+						'plugAuth') && !this.configInfo.plugAuth.hasOwnProperty(
+						'store')) || refresh) {
+					await this.getConfigInfo()
+				}
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				let cur_time = new Date(Math.ceil(new Date().getTime()))
+				this.toDay = this.$util.formatTime(cur_time, 'YY-M-D')
+				this.toDayTime = this.$util.formatTime(cur_time, 'h:m')
+				await Promise.all([this.getCityList(), this.getStoreList()])
+				let {
+					id = 0
+				} = this.options
+				if (!id) {
+					this.$util.hideAll()
+					return
+				}
+
+				let data = await this.$api.agent.coachInfo({
+					id
+				})
+				data.id_card = data.id_card.map(item => {
+					return {
+						path: item
+					}
+				})
+				data.id_card_fan = [data.id_card[1]]
+				data.id_card_people = [data.id_card[2]]
+				data.id_card.splice(1, 3)
+				data.license = data.license.map(item => {
+					return {
+						path: item
+					}
+				})
+				data.work_img = [{
+					path: data.work_img
+				}]
+				data.self_img = data.self_img.map(item => {
+					return {
+						path: item
+					}
+				})
+				data.video = data.video && data.video.length > 0 ? [{
+					path: data.video
+				}] : []
+				this.cityIndex = this.cityList.findIndex(item => {
+					return item.id == data.city_id
+				})
+				this.storeIndex = this.storeList.findIndex(item => {
+					return item.id == data.store_id
+				})
+				data.birthday = data.birthday ? this.$util.formatTime(data.birthday * 1000, 'YY-M-D') : ''
+				for (let key in this.form) {
+					this.form[key] = data[key]
+				}
+				this.have_user_id = data.id && data.user_id
+				this.fdd_agreement = data.fdd_agreement
+				this.$util.hideAll()
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			async getStoreList() {
+				let {
+					store = false
+				} = this.configInfo.plugAuth
+				if (store) {
+					let data = await this.$api.agent.storeSelect()
+					data.unshift({
+						id: 0,
+						title: '不挂靠门店'
+					})
+					this.storeList = data
+				}
+			},
+			async getCityList() {
+				let {
+					location
+				} = this
+				if (!location.lat) {
+					// #ifdef H5
+					if (this.$jweixin.isWechat()) {
+						this.$util.showLoading()
+						// await this.$jweixin.initJssdk();
+						await this.$jweixin.wxReady2();
+						let {
+							latitude: lat = 0,
+							longitude: lng = 0
+						} = await this.$jweixin.getWxLocation()
+						location = {
+							lng,
+							lat,
+							address: '定位失败',
+							province: '',
+							city: '',
+							district: ''
+						}
+						if (lat && lng) {
+							let key = `${lat},${lng}`
+							let data = await this.$api.base.getMapInfo({
+								location: key
+							})
+							let {
+								status,
+								result
+							} = JSON.parse(data)
+							if (status == 0) {
+								let {
+									address,
+									address_component
+								} = result
+								let {
+									province,
+									city,
+									district
+								} = address_component
+								location = {
+									lng,
+									lat,
+									address,
+									province,
+									city,
+									district
+								}
+							}
+						}
+					}
+					// #endif
+					// #ifndef H5
+					location = await this.$util.getBmapLocation()
+					// #endif
+
+					this.updateUserItem({
+						key: 'location',
+						val: location
+					})
+				}
+
+				let {
+					lng = 0,
+						lat = 0
+				} = location
+				if (lat && lng) {
+					let city = await this.$api.base.getCity({
+						lng,
+						lat
+					})
+					this.$util.hideAll()
+					this.cityList = city
+					this.cityIndex = city.length > 0 ? 0 : -1
+					this.form.city_id = city.length > 0 ? city[0].id : ''
+				}
+			},
+			async toFddSign() {
+				this.updateUserItem({
+					key: 'fddExtsign',
+					val: ''
+				})
+				let {
+					viewpdf_url = ''
+				} = this.fdd_agreement
+				this.updateUserItem({
+					key: 'fddExtsign',
+					val: viewpdf_url
+				})
+				this.$util.goUrl({
+					url: `/user/pages/common/web?url=fddExtsign`
+				})
+			},
+			pickerChange(e, key) {
+				let ind = e.target.value
+				if (key === 'birthday') {
+					let unix = this.$util.DateToUnix(ind)
+					if (unix > new Date(Math.ceil(new Date().getTime())) / 1000) {
+						this.$util.showToast({
+							title: `不能选择未来时间哦`
+						})
+						return
+					}
+					this.form[key] = ind
+					return
+				}
+				this[`${key}Index`] = ind
+				this.form[`${key}_id`] = this[`${key}List`][ind].id
+			},
+			imgUpload(e) {
+				let {
+					imagelist,
+					imgtype
+				} = e;
+				this.form[imgtype] = imagelist;
+			},
+			toSetItem(index) {
+				let {
+					id
+				} = this.workList[index]
+				this.form.is_work = id
+			},
+			toShowTime(key) {
+				this.showKey = key
+				this.showTime = true
+			},
+			onConfirm(val) {
+				this.form[this.showKey] = val.result;
+			},
+			// 选择地区
+			async toChooseLocation(e) {
+				await this.$util.checkAuth({
+					type: 'userLocation'
+				})
+				let {
+					lat: locaLat = '',
+					lng: locaLng = ''
+				} = this.location
+				let {
+					id = 0,
+						lat: addrLat,
+						lng: addrLng
+				} = this.form
+
+				if (id) {
+					locaLat = addrLat
+					locaLng = addrLng
+				}
+
+				let param = {}
+				if (!locaLat && !locaLng) {
+					// #ifdef H5
+					if (this.$jweixin.isWechat()) {
+						this.$util.showLoading()
+						await this.$jweixin.wxReady2();
+						let {
+							latitude,
+							longitude
+						} = await this.$jweixin.getWxLocation()
+						locaLat = latitude
+						locaLng = longitude
+					}
+					// #endif
+					// #ifdef APP-PLUS
+					let location = await this.$util.getBmapLocation()
+					locaLat = location.lat
+					locaLng = location.lng
+					// #endif
+				}
+
+				// #ifndef MP-WEIXIN
+				param = {
+					latitude: locaLat,
+					longitude: locaLng
+				}
+				// #endif
+				let [, {
+					address = '',
+					longitude,
+					latitude
+				}] = await uni.chooseLocation(param);
+				if (!address) return
+				this.form.address = address
+				this.form.lng = longitude
+				this.form.lat = latitude
+			},
+			toChooseUser() {
+				let {
+					have_user_id
+				} = this
+				if (have_user_id) return
+				this.$util.goUrl({
+					url: `/agent/pages/technician/user`
+				})
+			},
+			//表单验证
+			validate(param) {
+				let validate = new this.$util.Validate();
+				this.rule.map(item => {
+					let {
+						name,
+					} = item
+					validate.add(param[name], item);
+				})
+				let message = validate.start();
+				return message;
+			},
+			async submit() {
+				let param = this.$util.deepCopy(this.form)
+				let arr = ['id_card', 'id_card_fan', 'id_card_people', 'work_img', 'video']
+				arr.map(item => {
+					param[item] = param[item].length > 0 ? param[item][0].path : ''
+				})
+				param.license = param.license.map(item => {
+					return item.path
+				})
+				param.self_img = param.self_img.map(item => {
+					return item.path
+				})
+				let msg = this.validate(param);
+				if (msg) {
+					this.$util.showToast({
+						title: msg
+					});
+					return;
+				}
+
+				let {
+					is_work: work = 0,
+					start_time: start,
+					end_time: end
+				} = param
+				if (work && (!start || !end)) {
+					this.$util.showToast({
+						title: !start ? '请选择开始时间' : '请选择结束时间'
+					})
+					return
+				}
+
+				param.birthday = this.$util.DateToUnix(param.birthday)
+				param.id_card = [param.id_card, param.id_card_fan, param.id_card_people]
+				delete param.id_card_fan
+				delete param.id_card_people
+				delete param.nickName
+				if (param.id) {
+					delete param.admin_id
+				}
+				if (this.lockTap) return
+				this.lockTap = true
+				this.$util.showLoading()
+				try {
+					let {
+						is_edit = 0
+					} = this.options
+					let methodModel = param.id ? 'coachDataUpdate' : 'coachApply'
+					await this.$api.agent[methodModel](param)
+					this.$util.hideAll()
+					this.$util.showToast({
+						title: `提交成功`
+					})
+					setTimeout(() => {
+						this.$util.back()
+						this.$util.goUrl({
+							url: 1,
+							openType: `navigateBack`
+						})
+					}, 2000)
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+
+			}
+		},
+		filters: {
+			handleStartEndTime(val, toDay) {
+				let text = ''
+				let {
+					start_time,
+					end_time
+				} = val
+				let start = `${toDay} ${start_time}`
+				let end = `${toDay} ${end_time}`
+				if (start_time && end_time && $util.DateToUnix(start) >= $util.DateToUnix(end)) {
+					text = '次日'
+				}
+				return text
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.item-time {
+		width: 50%;
+	}
+</style>
\ No newline at end of file
diff --git a/agent/pages/technician/list.vue b/agent/pages/technician/list.vue
new file mode 100644
index 0000000..65dac96
--- /dev/null
+++ b/agent/pages/technician/list.vue
@@ -0,0 +1,284 @@
+<template>
+	<view class="agent-technician-list" v-if="isLoad">
+		<fixed>
+			<view class="search-info fill-base pt-lg pb-md">
+				<view class="flex-center pl-lg pr-lg pb-md">
+					<view @tap.stop="$util.goUrl({url:`/agent/pages/technician/apply`})"
+						class="dynamic-btn flex-center f-caption mr-lg radius"
+						:style="{color:primaryColor,border:`1rpx solid ${primaryColor}`}">
+						<i class="iconfont icon-jia-bold"></i>
+						添加
+					</view>
+					<view class="flex-1">
+						<search @input="toSearch" type="input" :padding="0" :radius="30" backgroundColor="#F0F0F0"
+							:placeholder="placeholder">
+						</search>
+					</view>
+				</view>
+				<view style="padding-right:30rpx">
+					<tab @change="handerTabChange" :isLine="true" :list="tabList" :activeIndex="activeIndex*1"
+						color="#9D9D9D" :activeColor="primaryColor" :width="100/tabList.length + '%'" height="100rpx"
+						:numberType="2"></tab>
+				</view>
+			</view>
+
+		</fixed>
+		<view @tap.stop="goDetail(index)" class="list-item fill-base flex-warp mt-md ml-md mr-md pd-lg radius-16"
+			v-for="(item,index) in list.data" :key="index">
+			<view>
+				<view class="avatar rel">
+					<!-- #ifdef H5 -->
+					<view class="avatar radius">
+						<view class="h5-image avatar radius" :style="{ backgroundImage : `url('${item.work_img}')`}">
+						</view>
+					</view>
+					<!-- #endif -->
+					<!-- #ifndef H5 -->
+					<image mode="aspectFill" class="avatar radius" :src="item.work_img">
+					</image>
+					<!-- #endif -->
+				</view>
+				<view class="flex-center">
+					<view class="item-tag flex-center f-icontext c-base radius-20"
+						:class="[{'have-user':item.auth_status}]">
+						{{authStatusType[item.auth_status]}}
+					</view>
+				</view>
+			</view>
+
+			<view class="flex-1 ml-md">
+				<view class="flex-between">
+					<view class="f-icontext c-paragraph">ID：{{item.id}}</view>
+					<view class="f-paragraph"
+						:style="{color:item.is_update==1?primaryColor:item.status==4?subColor:item.status==3?'#E82F21':'#999999'}">
+						{{statusType[item.status]}}
+					</view>
+				</view>
+				<view class="flex-y-center pb-lg b-1px-b">
+					<view class="f-paragraph c-black text-bold max-400 ellipsis">{{item.coach_name}}</view>
+					<view class="status-btn flex-center f-icontext ml-md"
+						:style="{color:item.admin_add==1?primaryColor:subColor,border:`1rpx solid ${item.admin_add==1?primaryColor:subColor}`}">
+						{{item.admin_add==1?'平台':'用户'}}
+					</view>
+				</view>
+				<view class="f-icontext c-paragraph mt-md">{{item.mobile}}</view>
+				<view class="f-icontext c-paragraph mt-sm">
+					所属代理商：{{item.admin_name || '-'}}{{item.admin_id?` (${cityType[item.city_type]})`:''}}</view>
+				<view class="f-icontext c-paragraph mt-sm">申请时间：{{item.create_time}}</view>
+				<view class="flex-between mt-md" v-if="!item.is_update">
+					<view></view>
+					<view class="edit-btn flex-center f-desc radius"
+						:style="{color:primaryColor,border:`1rpx solid ${primaryColor}`}">编辑</view>
+				</view>
+			</view>
+		</view>
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+		<view class="space-footer"></view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		data() {
+			return {
+				options: {},
+				placeholder: '请输入' + this.$t('action.attendantName') + '姓名/手机号',
+				tabList: [{
+					id: 0,
+					title: '全部',
+					number: 0
+				}, {
+					id: 1,
+					title: '申请中',
+					number: 0
+				}, {
+					id: 2,
+					title: '已授权',
+					number: 0
+				}, {
+					id: 3,
+					title: '已驳回',
+					number: 0
+				}, {
+					id: 4,
+					title: '重新审核',
+					number: 0
+				}],
+				activeIndex: 0,
+				authStatusType: {
+					0: '未认证',
+					1: '认证中',
+					2: '已认证',
+					3: '认证失败'
+				},
+				statusType: {
+					1: '申请中',
+					2: '已授权',
+					3: '取消授权',
+					4: '已驳回'
+				},
+				cityType: {
+					1: '城市',
+					2: '区县',
+					3: '省'
+				},
+				loading: true,
+				isLoad: false,
+				param: {
+					page: 1,
+					limit: 10,
+					status: 0
+				},
+				list: {
+					data: []
+				}
+
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad(options) {
+			this.options = options
+			uni.setNavigationBarTitle({
+				title: this.$t('action.attendantName') + '管理'
+			})
+			this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				this.getList();
+			},
+			handerTabChange(index) {
+				this.activeIndex = index
+				this.param.status = index
+				this.getList();
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			toSearch(val) {
+				this.param.page = 1
+				this.param.name = val
+				this.getList()
+			},
+			async getList() {
+				this.$util.showLoading()
+				let {
+					list: oldList,
+					param
+				} = this
+				let newList = await this.$api.agent.coachList(param)
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.tabList[1].number = newList.ing
+				this.isLoad = true
+				this.loading = false
+				this.$util.hideAll()
+			},
+			goDetail(index) {
+				let {
+					id,
+					is_update
+				} = this.list.data[index]
+				if (is_update) return
+				this.$util.goUrl({
+					url: `/agent/pages/technician/apply?id=${id}`
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.agent-technician-list {
+		.search-info {
+			width: 100%;
+
+			.dynamic-btn {
+				width: 134rpx;
+				height: 56rpx;
+				transform: rotateZ(360deg);
+
+				.iconfont {
+					font-size: 24rpx;
+					margin-right: 6rpx;
+				}
+			}
+		}
+
+		.list-item {
+			.avatar {
+				width: 124rpx;
+				height: 124rpx;
+			}
+
+			.item-tag {
+				width: 100rpx;
+				height: 32rpx;
+				color: #4A4A4A;
+				background: #D8D8D8;
+				margin-top: 19rpx;
+				margin-bottom: 6rpx;
+			}
+
+			.have-user {
+				color: #EBDDB1;
+				background: linear-gradient(270deg, #4C545A 0%, #282B34 100%);
+			}
+
+			.status-btn {
+				width: 60rpx;
+				height: 32rpx;
+				border-radius: 5rpx;
+				transform: rotateZ(360deg);
+			}
+
+			.edit-btn {
+				width: 120rpx;
+				height: 50rpx;
+				transform: rotateZ(360deg);
+			}
+
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/agent/pages/technician/user.vue b/agent/pages/technician/user.vue
new file mode 100644
index 0000000..38acb75
--- /dev/null
+++ b/agent/pages/technician/user.vue
@@ -0,0 +1,167 @@
+<template>
+	<view>
+		<fixed>
+			<search @input="toSearch" type="input" :padding="30" :radius="0" placeholder="请输入用户昵称/手机号查找">
+			</search>
+		</fixed>
+		<view @tap.stop="toChangeItem(index)"
+			class="list-item fill-base pt-lg pb-lg pl-md pr-lg flex-center mt-md ml-md mr-md radius-16"
+			v-for="(item,index) in list.data" :key="index">
+			<i class="iconfont mr-md"
+				:class="[{'icon-xuanze':check_user.id!=item.id},{'icon-radio-fill':check_user.id==item.id}]"
+				:style="{color:check_user.id==item.id?primaryColor:''}"></i>
+			<view class="flex-1 flex-center">
+				<image mode="aspectFill" class="avatar radius" :src="item.avatarUrl"></image>
+				<view class="flex-1 ml-md">
+					<view class="f-paragraph c-title text-bold ellipsis">{{item.nickName}}</view>
+					<view class="phone" v-if="item.phone">{{item.phone}}</view>
+				</view>
+			</view>
+		</view>
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+		<view class="space-max-footer"></view>
+		<fix-bottom-button @confirm="toConfirm" :text="[{text:'确定',type:'confirm'}]" bgColor="#fff">
+		</fix-bottom-button>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		data() {
+			return {
+				loading: true,
+				isLoad: false,
+				param: {
+					page: 1,
+					limit: 10,
+					status: 0
+				},
+				list: {
+					data: []
+				},
+				check_user: {}
+
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad() {
+			let {
+				user_id,
+				nickName
+			} = this.$util.getPage(-1).form
+			this.check_user = {
+				id: user_id,
+				nickName
+			}
+			this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				this.getList();
+			},
+			handerTabChange(index) {
+				this.activeIndex = index
+				this.param.status = index
+				this.getList();
+			},
+			toSearch(val) {
+				this.param.page = 1
+				this.param.nickName = val
+				this.check_user = {}
+				this.getList()
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			async getList() {
+				this.$util.showLoading()
+				let {
+					list: oldList,
+					param
+				} = this
+				let newList = await this.$api.agent.coachUserList(param)
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.isLoad = true
+				this.loading = false
+				this.$util.hideAll()
+			},
+			toChangeItem(index) {
+				this.check_user = this.list.data[index]
+			},
+			toConfirm() {
+				let {
+					id,
+					nickName
+				} = this.check_user
+				if (!id) {
+					this.$util.showToast({
+						title: `请选择用户`
+					})
+					return
+				}
+				this.$util.getPage(-1).form.user_id = id
+				this.$util.getPage(-1).form.nickName = nickName || `用户${id}`
+				this.$util.goUrl({
+					url: 1,
+					openType: `navigateBack`
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.list-item {
+		.avatar {
+			width: 72rpx;
+			height: 72rpx;
+		}
+
+		.phone {
+			font-size: 25rpx;
+			color: #ADADAD;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/androidPrivacy.json b/androidPrivacy.json
new file mode 100644
index 0000000..7277798
--- /dev/null
+++ b/androidPrivacy.json
@@ -0,0 +1,38 @@
+{
+    "version" : "1.1.2",
+    "prompt" : "template",
+    "title" : "服务协议和隐私政策",
+    "message" : "　　请你务必审慎阅读、充分理解“服务协议”和“隐私政策”各条款，包括但不限于：为了更好的向你提供服务，我们需要收集你的设备标识、操作日志等信息用于分析、优化应用性能。<br/><br/>　　因本产品首页需根据用户定位信息来推荐附近的热门店铺，因此进入APP首页将会弹出获取定位授权。<br/><br/>　　你可阅读<a href=\"https://tianjin.tianjinhualong.cn/information.html\">《服务协议》</a>和<a href=\"https://tianjin.tianjinhualong.cn/protocol.html\">《隐私政策》</a>了解详细信息。如果你同意，请点击下面按钮开始接受我们的服务。",
+    "buttonAccept" : "同意并接受",
+    "buttonRefuse" : "暂不同意",
+    "hrefLoader" : "system|default",
+    "backToExit" : "true",
+    "second" : {
+        "title" : "确认提示",
+        "message" : "　　进入应用前，你需先同意<a href=\"https://tianjin.tianjinhualong.cn/information.html\">《服务协议》</a>和<a href=\"https://tianjin.tianjinhualong.cn/protocol.html\">《隐私政策》</a>，否则将退出应用。",
+        "buttonAccept" : "同意并继续",
+        "buttonRefuse" : "退出应用"
+    },
+    "disagreeMode" : {
+        "support" : false,
+        "loadNativePlugins" : false,
+        "visitorEntry" : false,
+        "showAlways" : false
+    },
+    "styles" : {
+        "backgroundColor" : "#ffffff",
+        "borderRadius" : "15px",
+        "title" : {
+            "color" : "#000000"
+        },
+        "buttonAccept" : {
+            "color" : "#F3A664"
+        },
+        "buttonRefuse" : {
+            "color" : "#009254"
+        },
+        "buttonVisitor" : {
+            "color" : "#6A5ACD"
+        }
+    }
+}
diff --git a/api/index.js b/api/index.js
new file mode 100644
index 0000000..fa700f2
--- /dev/null
+++ b/api/index.js
@@ -0,0 +1,9 @@
+const files = require.context('./modules', false, /\.js$/)
+const modules = {}
+files.keys().forEach(key => {
+  modules[key.replace(/(\.\/|\.js)/g, '')] = files(key).default
+})
+
+export default{
+	...modules
+}
\ No newline at end of file
diff --git a/api/modules/admin.js b/api/modules/admin.js
new file mode 100644
index 0000000..71449e6
--- /dev/null
+++ b/api/modules/admin.js
@@ -0,0 +1,57 @@
+import {
+	req
+} from '../../utils/req.js';
+export default {
+	// 首页
+	index(param) {
+		return req.get("mobilenode/app/IndexAdminOrder/index", param)
+	}, 
+	// 拨打客户电话
+	getVirtualPhone(param) {
+		return req.post("mobilenode/app/IndexAdminOrder/getVirtualPhone", param)
+	},
+	// 编辑通知状态
+	noticeUpdate(param) {
+		return req.post("mobilenode/app/IndexAdminOrder/noticeUpdate", param)
+	},
+	// 订单列表
+	orderList(param) {
+		return req.get("mobilenode/app/IndexAdminOrder/orderList", param)
+	}, 
+	// 订单详情
+	orderInfo(param) {
+		return req.get("mobilenode/app/IndexAdminOrder/orderInfo", param)
+	}, 
+	// 修改订单状态
+	adminUpdateOrder(param) {
+		return req.post("mobilenode/app/IndexAdminOrder/adminUpdateOrder", param)
+	}, 
+	// 退款列表
+	refundOrderList(param) {
+		return req.get("mobilenode/app/IndexAdminOrder/refundOrderList", param)
+	}, 
+	// 退款详情
+	refundOrderInfo(param) {
+		return req.get("mobilenode/app/IndexAdminOrder/refundOrderInfo", param)
+	}, 
+	// 同意退款
+	passRefund(param) {
+		return req.post("mobilenode/app/IndexAdminOrder/passRefund", param)
+	}, 
+	// 拒绝退款
+	noPassRefund(param) {
+		return req.post("mobilenode/app/IndexAdminOrder/noPassRefund", param)
+	}, 
+	// 代理商列表
+	adminSelect(param) {
+		return req.get("mobilenode/app/IndexAdminOrder/adminSelect", param)
+	}, 
+	// 更换技-师
+	orderChangeCoach(param) {
+		return req.post("mobilenode/app/IndexAdminOrder/orderChangeCoach", param)
+	}, 
+	// 转派技-师列表
+	orderChangeCoachList(param) {
+		return req.get("mobilenode/app/IndexAdminOrder/orderChangeCoachList", param)
+	}, 
+}
diff --git a/api/modules/agent.js b/api/modules/agent.js
new file mode 100644
index 0000000..2ff929e
--- /dev/null
+++ b/api/modules/agent.js
@@ -0,0 +1,109 @@
+import {
+	req
+} from '../../utils/req.js';
+export default {
+	// 合作加盟
+	agentApply(param) {
+		return req.post("massage/app/IndexUser/agentApply", param)
+	}, 
+	//代理商详情
+	agentInfo(param) {
+		return req.get("massage/app/Index/agentInfo", param)
+	},
+	// 首页
+	index(param) {
+		return req.get("mobilenode/app/IndexAgentOrder/index", param)
+	}, 
+	// 邀请海报
+	agentInviteQr(param) {
+		return req.get("mobilenode/app/IndexAgentOrder/agentInviteQr", param)
+	}, 
+	//申请提现
+	applyWallet(param) {
+		return req.post("mobilenode/app/IndexAgentOrder/applyWallet", param)
+	},
+	//提现记录
+	walletList(param) {
+		return req.get("mobilenode/app/IndexAgentOrder/walletList", param)
+	},
+	//账号设置
+	adminInfoData(param) {
+		return req.get("mobilenode/app/IndexAgentOrder/adminInfoData", param)
+	},
+	// 门店下拉列表
+	storeSelect(param) {
+		return req.get("mobilenode/app/IndexAgentOrder/storeSelect", param)
+	},
+	//技-师列表
+	coachList(param) {
+		return req.get("mobilenode/app/IndexAgentOrder/coachList", param)
+	},
+	//技-师详情
+	coachInfo(param) {
+		return req.get("mobilenode/app/IndexAgentOrder/coachInfo", param)
+	},
+	//新增技-师
+	coachApply(param) {
+		return req.post("mobilenode/app/IndexAgentOrder/coachApply", param)
+	},
+	//编辑技-师
+	coachDataUpdate(param) {
+		return req.post("mobilenode/app/IndexAgentOrder/coachDataUpdate", param)
+	},
+	//技-师关联用户
+	coachUserList(param) {
+		return req.get("mobilenode/app/IndexAgentOrder/coachUserList", param)
+	},
+	//佣金列表
+	commList(param) {
+		return req.get("mobilenode/app/IndexAgentOrder/commList", param)
+	},
+	// 拨打客户电话
+	getVirtualPhone(param) {
+		return req.post("mobilenode/app/IndexAgentOrder/getVirtualPhone", param)
+	},
+	// 编辑通知状态
+	noticeUpdate(param) {
+		return req.post("mobilenode/app/IndexAgentOrder/noticeUpdate", param)
+	},
+	// 订单列表
+	orderList(param) {
+		return req.get("mobilenode/app/IndexAgentOrder/orderList", param)
+	}, 
+	// 订单详情
+	orderInfo(param) {
+		return req.get("mobilenode/app/IndexAgentOrder/orderInfo", param)
+	}, 
+	// 修改订单状态
+	adminUpdateOrder(param) {
+		return req.post("mobilenode/app/IndexAgentOrder/adminUpdateOrder", param)
+	}, 
+	// 退款列表
+	refundOrderList(param) {
+		return req.get("mobilenode/app/IndexAgentOrder/refundOrderList", param)
+	}, 
+	// 退款详情
+	refundOrderInfo(param) {
+		return req.get("mobilenode/app/IndexAgentOrder/refundOrderInfo", param)
+	}, 
+	// 同意退款
+	passRefund(param) {
+		return req.post("mobilenode/app/IndexAgentOrder/passRefund", param)
+	}, 
+	// 拒绝退款
+	noPassRefund(param) {
+		return req.post("mobilenode/app/IndexAgentOrder/noPassRefund", param)
+	}, 
+	// 代理商下拉列表
+	adminSelect(param) {
+		return req.get("mobilenode/app/IndexAgentOrder/adminSelect", param)
+	},
+	// 更换技-师
+	orderChangeCoach(param) {
+		return req.post("mobilenode/app/IndexAgentOrder/orderChangeCoach", param)
+	}, 
+	// 转派技-师列表
+	orderChangeCoachList(param) {
+		return req.get("mobilenode/app/IndexAgentOrder/orderChangeCoachList", param)
+	}, 
+}
diff --git a/api/modules/base.js b/api/modules/base.js
new file mode 100644
index 0000000..0a87613
--- /dev/null
+++ b/api/modules/base.js
@@ -0,0 +1,65 @@
+import {
+	req,
+	uploadFile
+} from '../../utils/req.js';
+export default {
+	// 小程序登录
+	login(param) {
+		return req.post("index/login", param)
+	},
+	// 公众号登录
+	webLogin(param) {
+		return req.post("index/webLogin", param)
+	},
+	// app微信登录
+	appLogin(param) {
+		return req.post("index/appLogin", param)
+	},
+	// app苹果登录
+	iosLogin(param) {
+		return req.post("index/iosLogin", param)
+	},
+	// app登录配置
+	getConfig(param) {
+		return req.get("index/getConfig", param)
+	},
+	// 获取配置
+	getWebConfig(param) {
+		return req.get("index/getWebConfig", param)
+	},
+	// 系统配置
+	configInfo(param) {
+		return req.get("massage/app/Index/configInfo", param)
+	},
+	// 获取地图定位
+	getMapInfo(param) {
+		return req.get("massage/app/Index/getMapInfo", param)
+	},
+	// 解析二维码
+	getWxCodeData(param) {
+		return req.get("card/app/getWxCodeData", param)
+	},
+	// base64ToImg
+	base64ToImg(param) {
+		return req.get("massage/app/IndexUser/base64ToImg", param)
+	},
+	// 上传文件
+	uploadFile(param) {
+		return uploadFile("admin/app/wx/uploadFile", param)
+	},
+	uploadFiles(querys, fn) {
+		return req.post('admin/admin/file/uploadFiles', querys, fn)
+	},
+	// 上传视频
+	uploadVideo(param) {
+		return uploadFile("admin/app/wx/uploadVideo", param)
+	},
+	// 获取城市
+	getCity(param) {
+		return req.get("massage/app/Index/getCity", param)
+	},
+	// 获取插件授权
+	plugAuth(param) {
+		return req.get("massage/app/Index/plugAuth", param)
+	},
+}
\ No newline at end of file
diff --git a/api/modules/channel.js b/api/modules/channel.js
new file mode 100644
index 0000000..1e3e5ee
--- /dev/null
+++ b/api/modules/channel.js
@@ -0,0 +1,37 @@
+import {
+	req
+} from '../../utils/req.js';
+export default {
+	// 渠道商下拉
+	channelCateSelect(param) {
+		return req.get("massage/app/IndexUser/channelCateSelect", param)
+	},
+	// 申请渠道商
+	applyChannel(param) {
+		return req.post("massage/app/IndexUser/applyChannel", param)
+	},
+	// 渠道商信息
+	channelInfo(param) {
+		return req.get("massage/app/IndexUser/channelInfo", param)
+	},
+	// 渠道商首页
+	index(param) {
+		return req.get("massage/app/IndexChannel/index", param)
+	},
+	// 渠道商二维码
+	channelQr(param) {
+		return req.get("massage/app/IndexChannel/channelQr", param)
+	},
+	// 订单列表
+	orderList(param) {
+		return req.get("massage/app/IndexChannel/orderList", param)
+	},
+	//申请提现
+	applyWallet(param) {
+		return req.post("massage/app/IndexChannel/applyWallet", param)
+	},
+	//提现记录
+	walletList(param) {
+		return req.get("massage/app/IndexChannel/walletList", param)
+	},
+}
diff --git a/api/modules/dynamic.js b/api/modules/dynamic.js
new file mode 100644
index 0000000..c53335c
--- /dev/null
+++ b/api/modules/dynamic.js
@@ -0,0 +1,82 @@
+import {
+	req
+} from '../../utils/req.js';
+export default {
+	// 动态列表
+	dynamicList(param) {
+		return req.get("dynamic/app/IndexDynamicList/dynamicList", param)
+	},
+	// 获取关注技-师的最新动态数量
+	getFollowData(param) {
+		return req.get("dynamic/app/IndexDynamicList/getFollowData", param)
+	},
+	// 关注技-师动态列表
+	followDynamicList(param) {
+		return req.get("dynamic/app/IndexDynamicList/followDynamicList", param)
+	},
+	// 动态详情
+	dynamicInfo(param) {
+		return req.get("dynamic/app/IndexDynamicList/dynamicInfo", param)
+	},
+	// 点赞或者取消点赞
+	thumbsAddOrCancek(param) {
+		return req.post("dynamic/app/IndexDynamicList/thumbsAddOrCancek", param)
+	},
+	// 我的关注
+	followCoachList(param) {
+		return req.get("dynamic/app/IndexDynamicList/followCoachList", param)
+	},
+	// 关注或者取消关注
+	followAddOrCancek(param) {
+		return req.post("dynamic/app/IndexDynamicList/followAddOrCancek", param)
+	},
+	// 评论列表
+	commentList(param) {
+		return req.get("dynamic/app/IndexDynamicList/commentList", param)
+	},
+	// 新增评论
+	commentAdd(param) {
+		return req.post("dynamic/app/IndexDynamicList/commentAdd", param)
+	},
+	// 删除评论
+	commentDel(param) {
+		return req.post("dynamic/app/IndexDynamicList/commentDel", param)
+	},
+	// --------- 技-师端
+	// 动态列表
+	coachDynamicList(param) {
+		return req.get("dynamic/app/IndexDynamicCoach/dynamicList", param)
+	},
+	// 动态详情
+	coachDynamicInfo(param) {
+		return req.get("dynamic/app/IndexDynamicCoach/dynamicInfo", param)
+	},
+	// 关注点赞消息详情
+	dynamicData(param) {
+		return req.get("dynamic/app/IndexDynamicCoach/dynamicData", param)
+	},
+	// 发布动态
+	dynamicAdd(param) {
+		return req.post("dynamic/app/IndexDynamicCoach/dynamicAdd", param)
+	},
+	// 编辑动态
+	dynamicUpdate(param) {
+		return req.post("dynamic/app/IndexDynamicCoach/dynamicUpdate", param)
+	},
+	// 删除动态
+	dynamicDel(param) {
+		return req.post("dynamic/app/IndexDynamicCoach/dynamicDel", param)
+	},
+	// 收获的赞
+	thumbsList(param) {
+		return req.get("dynamic/app/IndexDynamicCoach/thumbsList", param)
+	},
+	// 新增关注
+	followList(param) {
+		return req.get("dynamic/app/IndexDynamicCoach/followList", param)
+	},
+	// 收获的评论
+	coachCommentList(param) {
+		return req.get("dynamic/app/IndexDynamicCoach/commentList", param)
+	},
+}
diff --git a/api/modules/mine.js b/api/modules/mine.js
new file mode 100644
index 0000000..2ea7fcf
--- /dev/null
+++ b/api/modules/mine.js
@@ -0,0 +1,177 @@
+import {
+    req
+} from '../../utils/req.js';
+export default {
+    // 个人中心页面
+    index(param) {
+        return req.get("massage/app/IndexUser/index", param)
+    },
+    //技师端显示隐藏
+    isShowwx(param) {
+        return req.get("massage/CallBack/is_showwx", param)
+    },
+    // 认证技-师
+    attestationCoach(param) {
+        return req.post("massage/app/IndexUser/attestationCoach", param)
+    },
+    //申请分销商
+    applyReseller(param) {
+        return req.post("massage/app/IndexUser/applyReseller", param)
+    },
+    //分销商详情
+    resellerInfo(param) {
+        return req.get("massage/app/IndexUser/resellerInfo", param)
+    },
+    //我的收益
+    capCashInfo(param) {
+        return req.get("massage/app/IndexUser/userCashInfo", param)
+    },
+    //申请提现
+    applyWallet(param) {
+        return req.post("massage/app/IndexUser/applyWallet", param)
+    },
+    //提现记录
+    walletList(param) {
+        return req.get("massage/app/IndexUser/walletList", param)
+    },
+    //合伙人首页
+    partnerIndex(param) {
+        return req.get("massage/app/IndexReseller/partnerIndex", param)
+    },
+    //邀请的技-师
+    partnerCoachList(param) {
+        return req.get("massage/app/IndexReseller/partnerCoachList", param)
+    },
+    //我的团队
+    myTeam(param) {
+        return req.get("massage/app/IndexUser/myTeam", param)
+    },
+    //邀请用户
+    userCommQr(param) {
+        return req.get("massage/app/IndexUser/userCommQr", param)
+    },
+    //代理商绑定技-师
+    adminCoachQr(param) {
+        return req.get("massage/app/IndexUser/adminCoachQr", param)
+    },
+    //邀请技-师
+    resellerInvCoachQr(param) {
+        return req.get("massage/app/IndexReseller/resellerInvCoachQr", param)
+    },
+    //选择代理商
+    adminList(param) {
+        return req.get("massage/app/IndexReseller/adminList", param)
+    },
+    // 获取默认地址
+    getDefultAddress(param) {
+        return req.get("massage/app/IndexUser/getDefultAddress", param)
+    },
+    // 地址列表
+    addressList(param) {
+        return req.get("massage/app/IndexUser/addressList", param)
+    },
+    // 地址详情
+    addressInfo(param) {
+        return req.get("massage/app/IndexUser/addressInfo", param)
+    },
+    // 新增地址
+    addressAdd(param) {
+        return req.post("massage/app/IndexUser/addressAdd", param)
+    },
+    // 修改地址
+    addressUpdate(param) {
+        return req.post("massage/app/IndexUser/addressUpdate", param)
+    },
+    // 删除地址
+    addressDel(param) {
+        return req.post("massage/app/IndexUser/addressDel", param)
+    },
+    // 收藏技-师
+    coachCollectList(param) {
+        return req.get("massage/app/IndexUser/coachCollectList", param)
+    },
+    // 新增收藏
+    addCollect(param) {
+        return req.post("massage/app/IndexUser/addCollect", param)
+    },
+    // 删除收藏
+    delCollect(param) {
+        return req.post("massage/app/IndexUser/delCollect", param)
+    },
+    //卡券列表
+    userCouponList(param) {
+        return req.get("massage/app/IndexUser/userCouponList", param)
+    },
+    //删除卡券
+    couponDel(param) {
+        return req.post("massage/app/IndexUser/couponDel", param)
+    },
+    //卡券活动
+    couponAtvInfo(param) {
+        return req.post("massage/app/IndexUser/couponAtvInfo", param)
+    },
+    //卡券二维码
+    atvQr(param) {
+        return req.post("massage/app/IndexUser/atvQr", param)
+    },
+    //技-师分享储值套餐
+    coachBalanceQr(param) {
+        return req.get("massage/app/IndexCoach/coachBalanceQr", param)
+    },
+    //选择技-师
+    coachList(param) {
+        return req.get("massage/app/IndexBalance/coachList", param)
+    },
+    //储值充值卡列表
+    cardList(param) {
+        return req.get("massage/app/IndexBalance/cardList", param)
+    },
+    //充值余额(card_id)
+    payBalanceOrder(param) {
+        return req.post("massage/app/IndexBalance/payBalanceOrder", param)
+    },
+    //充值订单列表(时间筛选 start_time,end_time)
+    balaceOrder(param) {
+        return req.get("massage/app/IndexBalance/balaceOrder", param)
+    },
+    //消费明细
+    payWater(param) {
+        return req.get("massage/app/IndexBalance/payWater", param)
+    },
+    //佣金明细
+    commList(param) {
+        return req.get("massage/app/IndexUser/commList", param)
+    },
+    // 提交反馈
+    addFeedback(param) {
+        return req.post("massage/app/IndexCoach/addFeedback", param)
+    },
+    // 反馈记录
+    listFeedback(param) {
+        return req.get("massage/app/IndexCoach/listFeedback", param)
+    },
+    // 反馈详情 
+    feedbackInfo(param) {
+        return req.get("massage/app/IndexCoach/feedbackInfo", param)
+    },
+    // 屏蔽列表
+    shieldCoachList(param) {
+        return req.get("massage/app/IndexUser/shieldCoachList", param)
+    },
+    // 新增屏蔽
+    shieldCoachAdd(param) {
+        return req.post("massage/app/IndexUser/shieldCoachAdd", param)
+    },
+    // 删除屏蔽
+    shieldCoachDel(param) {
+        return req.post("massage/app/IndexUser/shieldCoachDel", param)
+    },
+    // 绑定支付宝账号
+    bindAlipayNumber(param) {
+        return req.post("massage/app/IndexUser/bindAlipayNumber", param)
+    },
+    // 获取门店数据
+    getStoreSelect(param) {
+        return req.get("massage/app/IndexUser/getStoreSelect", param)
+    },
+}
\ No newline at end of file
diff --git a/api/modules/order.js b/api/modules/order.js
new file mode 100644
index 0000000..ea0aa39
--- /dev/null
+++ b/api/modules/order.js
@@ -0,0 +1,133 @@
+import {
+    req
+} from '../../utils/req.js';
+export default {
+    // 购物车
+    carInfo(param) {
+        return req.get("massage/app/Index/carInfo", param)
+    },
+    // 加入购物车
+    addCar(param) {
+        return req.post("massage/app/Index/addCar", param)
+    },
+    // 删除购物车数量
+    delCar(param) {
+        return req.post("massage/app/Index/delCar", param)
+    },
+    //清空购物车
+    delSomeCar(param) {
+        return req.post("massage/app/IndexGoods/delSomeCar", param)
+    },
+    //选择购物车商品
+    carUpdate(param) {
+        return req.post("massage/app/IndexGoods/carUpdate", param)
+    },
+    //获取是否能选择 公交/地铁
+    getIsBus(param) {
+        return req.get("massage/app/IndexOrder/getIsBus", param)
+    },
+    //下单选择时间
+    dayText(param) {
+        return req.get("massage/app/IndexOrder/dayText", param)
+    },
+    //下单选择时间(coach_id,day)
+    timeText(param) {
+        return req.get("massage/app/IndexOrder/timeText", param)
+    },
+    //获取升级订单信息
+    upOrderInfo(param) {
+        return req.post("massage/app/IndexOrder/upOrderInfo", param)
+    },
+    //升级服务下单
+    upOrderGoods(param) {
+        return req.post("massage/app/IndexOrder/upOrderGoods", param)
+    },
+    //校验加钟订单是否可下单
+    checkAddOrder(param) {
+        return req.post("massage/app/IndexOrder/checkAddOrder", param)
+    },
+    //获取下单信息(coach_id，有卡券就传 coupon_id)
+    payOrderInfo(param) {
+        return req.get("massage/app/IndexOrder/payOrderInfo", param)
+    },
+    //下单
+    payOrder(param) {
+        return req.post("massage/app/IndexOrder/payOrder", param)
+    },
+    //可用卡券
+    couponList(param) {
+        return req.get("massage/app/IndexOrder/couponList", param)
+    },
+    //订单列表
+    orderList(param) {
+        return req.get("massage/app/IndexOrder/orderList", param)
+    },
+    //根据主订单查询加钟订单列表
+    getAddClockOrder(param) {
+        return req.get("massage/app/IndexOrder/getAddClockOrder", param)
+    },
+    //订单详情
+    orderInfo(param) {
+        return req.get("massage/app/IndexOrder/orderInfo", param)
+    },
+    // 技师已到达
+    userSureArrivalOrder(param) {
+        return req.post("massage/app/IndexOrder/userSureArrival", param)
+    },
+    // 升级订单记录
+    orderUpRecord(param) {
+        return req.get("massage/app/IndexOrder/orderUpRecord", param)
+    },
+    // 拨打技-师电话
+    getVirtualPhone(param) {
+        return req.get("massage/app/IndexUser/getVirtualPhone", param)
+    },
+    //刷新二维码
+    refreshQr(param) {
+        return req.post("massage/app/IndexOrder/refreshQr", param)
+    },
+    //取消订单
+    cancelOrder(param) {
+        return req.post("massage/app/IndexOrder/cancelOrder", param)
+    },
+    //删除订单
+    delOrder(param) {
+        return req.post("massage/app/IndexOrder/delOrder", param)
+    },
+    //确认完成订单
+    userSignOrder(param) {
+        return req.post("massage/app/IndexOrder/userSignOrder", param)
+    },
+    //重新支付
+    rePayOrder(param) {
+        return req.post("massage/app/IndexOrder/rePayOrder", param)
+    },
+    //申请退款
+    applyOrder(param) {
+        return req.post("massage/app/IndexOrder/applyOrder", param)
+    },
+    //再来一单
+    onceMoreOrder(param) {
+        return req.post("massage/app/Index/onceMoreOrder", param)
+    },
+    //添加评价(order_id,text，star)
+    addComment(param) {
+        return req.post("massage/app/IndexOrder/addComment", param)
+    },
+    //标签列表
+    lableList(param) {
+        return req.get("massage/app/IndexOrder/lableList", param)
+    },
+    //我的售后
+    refundOrderList(param) {
+        return req.get("massage/app/IndexOrder/refundOrderList", param)
+    },
+    //售后详情
+    refundOrderInfo(param) {
+        return req.get("massage/app/IndexOrder/refundOrderInfo", param)
+    },
+    //取消退款
+    cancelRefundOrder(param) {
+        return req.post("massage/app/IndexOrder/cancelRefundOrder", param)
+    },
+}
\ No newline at end of file
diff --git a/api/modules/salesman.js b/api/modules/salesman.js
new file mode 100644
index 0000000..98c06e9
--- /dev/null
+++ b/api/modules/salesman.js
@@ -0,0 +1,37 @@
+import {
+	req
+} from '../../utils/req.js';
+export default {
+	// 申请业务员
+	applySalesman(param) {
+		return req.post("massage/app/IndexUser/applySalesman", param)
+	},
+	// 业务员信息
+	salesmanInfo(param) {
+		return req.get("massage/app/IndexUser/salesmanInfo", param)
+	},
+	// 业务员首页
+	index(param) {
+		return req.get("massage/app/IndexSalesman/index", param)
+	},
+	// 业务员二维码
+	salesmanQr(param) {
+		return req.get("massage/app/IndexSalesman/salesmanQr", param)
+	},
+	// 申请提现
+	applyWallet(param) {
+		return req.post("massage/app/IndexSalesman/applyWallet", param)
+	},
+	// 提现记录
+	walletList(param) {
+		return req.get("massage/app/IndexSalesman/walletList", param)
+	},
+	// 渠道明细
+	salesmanChannelCash(param) {
+		return req.get("massage/app/IndexSalesman/salesmanChannelCash", param)
+	},
+	// 业务员渠道商明细详情
+	salesmanChannelOrderList(param) {
+		return req.get("massage/app/IndexSalesman/salesmanChannelOrderList", param)
+	}
+}
\ No newline at end of file
diff --git a/api/modules/service.js b/api/modules/service.js
new file mode 100644
index 0000000..90468e0
--- /dev/null
+++ b/api/modules/service.js
@@ -0,0 +1,65 @@
+import {
+	req
+} from '../../utils/req.js';
+export default {
+	// 首页轮播图
+	index(param) {
+		return req.get("massage/app/Index/index", param)
+	},
+	//文章详情
+	articleInfo(param) {
+		return req.get("massage/app/IndexArticle/articleInfo", param)
+	},
+	//文章详情-提交表单
+	subArticleForm(param) {
+		return req.post("massage/app/IndexArticle/subArticleForm", param)
+	},
+	// 服务分类列表
+	serviceCateList(param) {
+		return req.get("massage/app/Index/serviceCateList", param)
+	},
+	// 服务列表
+	serviceList(param) {
+		return req.get("massage/app/Index/serviceList", param)
+	},
+	// 服务详情
+	serviceInfo(param) {
+		return req.get("massage/app/Index/serviceInfo", param)
+	},
+	// 地图找人
+	mapCoachList(param) {
+		return req.get("map/app/Index/coachList", param)
+	},
+	// 服务技-师列表无筛选项(ser_id，服务id,lat,lng)
+	typeServiceCoachList(param) {
+		return req.get("massage/app/Index/typeServiceCoachList", param)
+	},
+	// 服务技-师列表(ser_id，服务id,lat,lng,type)
+	serviceCoachList(param) {
+		return req.get("massage/app/Index/serviceCoachList", param)
+	},
+	// 技-师服务列表(coach_id)
+	coachServiceList(param) {
+		return req.get("massage/app/Index/coachServiceList", param)
+	},
+	// 技-师评价
+	commentList(param) {
+		return req.get("massage/app/Index/commentList", param)
+	},
+	// 技-师信息
+	coachInfo(param) {
+		return req.get("massage/app/Index/coachInfo", param)
+	},
+	//优惠券列表
+	couponList(param) {
+		return req.get("massage/app/Index/couponList", param)
+	},
+	//领取优惠券
+	userGetCoupon(param) {
+		return req.post("massage/app/Index/userGetCoupon", param)
+	},
+	//获取可升级的服务
+	getUpOrderGoods(param) {
+		return req.get("massage/app/IndexOrder/getUpOrderGoods", param)
+	},
+}
diff --git a/api/modules/shopstore.js b/api/modules/shopstore.js
new file mode 100644
index 0000000..cbc0ef6
--- /dev/null
+++ b/api/modules/shopstore.js
@@ -0,0 +1,21 @@
+import {
+	req
+} from '../../utils/req.js';
+export default {
+	// 门店列表
+	storeList(param) {
+		return req.get("store/app/IndexStore/storeList", param)
+	},
+	// 门店详情
+	storeInfo(param) {
+		return req.get("store/app/IndexStore/storeInfo", param)
+	},
+	// 门店服务列表
+	storeServiceList(param) {
+		return req.get("store/app/IndexStore/storeServiceList", param)
+	},
+	// 门店评价列表
+	commentList(param) {
+		return req.get("store/app/IndexStore/commentList", param)
+	}
+}
diff --git a/api/modules/technician.js b/api/modules/technician.js
new file mode 100644
index 0000000..b46d7e7
--- /dev/null
+++ b/api/modules/technician.js
@@ -0,0 +1,185 @@
+import {
+    req
+} from '../../utils/req.js';
+export default {
+    // 申请技-师
+    coachApply(param) {
+        return req.post("massage/app/IndexUser/coachApply", param)
+    },
+    // 获取是否开启合同
+    getFddStatus(param) {
+        return req.get("massage/app/IndexCoach/getFddStatus", param)
+    },
+    // 获取是否已签合同
+    getFddRecord(param) {
+        return req.get("massage/app/IndexCoach/getFddRecord", param)
+    },
+    // 获取发大大实名认证地址
+    getPersonVerifyUrl(param) {
+        return req.get("massage/app/IndexCoach/getPersonVerifyUrl", param)
+    },
+    // 获取用户实名注册信息
+    getAttestationInfo(param) {
+        return req.get("massage/app/IndexCoach/getAttestationInfo", param)
+    },
+    // 签署合同
+    Extsign(param) {
+        return req.post("massage/app/IndexCoach/Extsign", param)
+    },
+    // 技-师信息
+    coachInfo(param) {
+        return req.get("massage/app/IndexUser/coachInfo", param)
+    },
+    // 编辑技-师
+    coachUpdate(param) {
+        return req.post("massage/app/IndexCoach/coachUpdate", param)
+    },
+    // 编辑技-师
+    coachUpdateV2(param) {
+        return req.post("massage/app/IndexCoach/coachUpdateV2", param)
+    },
+    // 技-师等级
+    coachLevel(param) {
+        return req.get("massage/app/IndexCoach/coachLevel", param)
+    },
+    // 技-师首页
+    coachIndex(param) {
+        return req.get("massage/app/IndexCoach/coachIndex", param)
+    },
+    // 技-师报警
+    police(param) {
+        return req.post("massage/app/IndexCoach/police", param)
+    },
+    // 订单列表
+    orderList(param) {
+        return req.get("massage/app/IndexCoach/orderList", param)
+    },
+    // 订单详情
+    orderInfo(param) {
+        return req.get("massage/app/IndexCoach/orderInfo", param)
+    },
+    // 修改订单状态(type,order_id)
+    updateOrder(param) {
+        return req.post("massage/app/IndexCoach/updateOrder", param)
+    },
+    // 客户爽约
+    breakThePromiseOrder(param) {
+        return req.post("massage/app/IndexCoach/breakThePromise", param)
+    },
+    // 拨打客户电话
+    getVirtualPhone(param) {
+        return req.post("massage/app/IndexCoach/getVirtualPhone", param)
+    },
+    //佣金信息
+    capCashInfo(param) {
+        return req.get("massage/app/IndexCoach/capCashInfo", param)
+    },
+    //佣金信息（车费）
+    capCashInfoCar(param) {
+        return req.get("massage/app/IndexCoach/capCashInfoCar", param)
+    },
+    //申请提现 (apply_price,text,type：1服务费提现，2车费提现)
+    applyWallet(param) {
+        return req.post("massage/app/IndexCoach/applyWallet", param)
+    },
+    //提现记录
+    capCashList(param) {
+        return req.get("massage/app/IndexCoach/capCashList", param)
+    },
+    //时间管理回显
+    timeConfig(param) {
+        return req.get("massage/app/IndexCoach/timeConfig", param)
+    },
+    //时间管理设置
+    setTimeConfig(param) {
+        return req.post("massage/app/IndexCoach/timeConfig", param)
+    },
+    //根据接单时间获取时间节点
+    getTime(param) {
+        return req.get("massage/app/IndexCoach/getTime", param)
+    },
+    //根据接单时间获取时间节点
+    getOrderNum(param) {
+        return req.get("massage/app/IndexCoach/getOrderNum", param)
+    },
+    //物料商城-商品列表
+    goodsList(param) {
+        return req.get("massage/app/IndexCoach/goodsList", param)
+    },
+    //物料商城-分类列表
+    carteList(param) {
+        return req.get("massage/app/IndexCoach/carteList", param)
+    },
+    //物料商城-商品详情
+    goodsInfo(param) {
+        return req.get("massage/app/IndexCoach/goodsInfo", param)
+    },
+    //车费明细列表
+    carMoneyList(param) {
+        return req.get("massage/app/IndexCoach/carMoneyList", param)
+    },
+    //差评申诉 订单列表
+    appealOrder(param) {
+        return req.get("massage/app/IndexCoach/appealOrder", param)
+    },
+    //差评申诉 提交申诉
+    addAppeal(param) {
+        return req.post("massage/app/IndexCoach/addAppeal", param)
+    },
+    //差评申诉 申诉记录列表
+    appealList(param) {
+        return req.get("massage/app/IndexCoach/appealList", param)
+    },
+    //标签列表
+    labelList(param) {
+        return req.get("massage/app/IndexCoach/labelList", param)
+    },
+    //添加用户评价
+    userLabelAdd(param) {
+        return req.post("massage/app/IndexCoach/userLabelAdd", param)
+    },
+    //获取用户当前标签
+    userLabelList(param) {
+        return req.get("massage/app/IndexCoach/userLabelList", param)
+    },
+    //储值返佣列表
+    balanceCommissionList(param) {
+        return req.get("massage/app/IndexCoach/balanceCommissionList", param)
+    },
+    //储值返佣金额统计
+    balanceCommissionData(param) {
+        return req.get("massage/app/IndexCoach/balanceCommissionData", param)
+    },
+    //分成明细
+    coachCommissionList(param) {
+        return req.get("massage/app/IndexCoach/coachCommissionList", param)
+    },
+    //分成明细金额统计
+    coachCommissionData(param) {
+        return req.get("massage/app/IndexCoach/coachCommissionData", param)
+    },
+    //收益详情
+    coachCommissionInfo(param) {
+        return req.get("massage/app/IndexCoach/coachCommissionInfo", param)
+    },
+    //拉黑用户
+    shieldUserAdd(param) {
+        return req.post("massage/app/IndexCoach/shieldUserAdd", param)
+    },
+    //移除拉黑用户
+    shieldUserDel(param) {
+        return req.post("massage/app/IndexCoach/shieldUserDel", param)
+    },
+    //拉黑用户列表
+    shieldCoachList(param) {
+        return req.get("massage/app/IndexCoach/shieldCoachList", param)
+    },
+    // 订单服务录音
+    recordingAdd(param) {
+        return req.post("recording/app/Recording/recordingAdd", param)
+    },
+	// 修改技师白天夜间免费出行距离
+	updateCoachRidingForfree(param) {
+	    return req.post("massage/app/IndexCoach/updateCoachRidingForfree", param)
+	},
+}
\ No newline at end of file
diff --git a/api/modules/user.js b/api/modules/user.js
new file mode 100644
index 0000000..a6d93c8
--- /dev/null
+++ b/api/modules/user.js
@@ -0,0 +1,33 @@
+import {
+	req
+} from '../../utils/req.js';
+export default {
+	// 用户信息
+	userInfo(param) {
+		return req.get("massage/app/IndexUser/userInfo", param)
+	},
+	// 更新用户信息
+	userUpdate(param) {
+		return req.post("massage/app/IndexUser/userUpdate", param)
+	},
+	// 绑定渠道商
+	bindChannel(param) {
+		return req.post("massage/app/IndexUser/bindChannel", param)
+	},
+	// 注销用户
+	delUserInfo(param) {
+		return req.post("/massage/app/IndexUser/delUserInfo", param)
+	},
+	// 获取手机号
+	reportPhone(param) {
+		return req.post("massage/app/IndexUser/reportPhone", param)
+	},
+	// 验证码
+	sendShortMsg(param) {
+		return req.post("massage/app/IndexUser/sendShortMsg", param)
+	},
+	// 绑定手机号
+	bindUserPhone(param) {
+		return req.post("massage/app/IndexUser/bindUserPhone", param)
+	}
+}
diff --git a/components/abnor.vue b/components/abnor.vue
new file mode 100644
index 0000000..23675fd
--- /dev/null
+++ b/components/abnor.vue
@@ -0,0 +1,322 @@
+<template>
+	<view class="abnor" :style="{paddingBottom: percent}">
+		<view class="abnor-box">
+			<image mode="aspectFit" class="abnor-image" v-if="pimage" :src="pimage"></image>
+			<view class="abnor-text" v-if="ptitle">{{ptitle}}</view>
+			<view @tap.stop="emitAbnorTipTap" class="abnor-tip" :class="[{'tip-flex':!tipMax}]"
+				:style="{maxWidth:tipMax,textAlign:tipMax?'left':''}" v-if="ptip">
+				<text v-for="(item,index) in ptip" :key="index"
+					:style="{color:item.color == 1 ? primaryColor:''}">{{item.text}}</text>
+			</view>
+			<block v-if="pbutton">
+				<block v-for="(item,index) in pbutton" :key="index">
+					<view class="abnor-btn" :class="btnSize"
+						:style="{background:item.type == 'confirm' ? primaryColor : '',color:item.type == 'confirm'?'white':''}"
+						@tap.stop="emitAbnorTap(index)">{{item.text}}</view>
+				</block>
+			</block>
+		</view>
+	</view>
+</template>
+
+
+<script>
+	const Types = {
+		'REQUEST_ERROR': {
+			image: 'https://lbqny.migugu.com/admin/public/request-error.png',
+			title: '网络加载失败',
+			button: [{
+				text: '点击刷新',
+				type: 'confirm'
+			}],
+			tip: []
+		},
+		'NOT_FOUND': {
+			image: 'https://lbqny.migugu.com/admin/public/not-found.png',
+			title: '很抱歉，找不到你要访问的页面',
+			button: [{
+				text: '返回',
+				type: 'confirm'
+			}],
+			tip: []
+		},
+		'DATA': {
+			image: '/static/img/qs_dingdan.png',
+			title: '',
+			button: [],
+			tip: [{
+				text: '没有相关数据哦',
+				color: 0
+			}]
+		},
+		'FOLLOW': {
+			image: 'https://lbqny.migugu.com/admin/public/no-follow.png',
+			title: '关注有趣的人',
+			button: [],
+			tip: [{
+				text: '不再错过他们每一条动态',
+				color: 0
+			}]
+		},
+		'FEED': {
+			image: 'https://lbqny.migugu.com/admin/public/no-feed.png',
+			title: '还没有任何反馈哦',
+			button: [],
+			tip: []
+		},
+		'SHOP': {
+			image: 'https://lbqny.migugu.com/admin/public/no-shop.png',
+			title: '稍后再来试试吧~',
+			button: [],
+			tip: []
+		},
+		'WEIBO': {
+			image: 'https://lbqny.migugu.com/admin/public/no-weibo.png',
+			title: '',
+			button: [],
+			tip: []
+		},
+		'SEARCH': {
+			image: 'https://lbqny.migugu.com/admin/public/no-search.png',
+			title: '抱歉！没找到相关商品~',
+			button: [],
+			tip: []
+		},
+		'TAG': {
+			image: 'https://lbqny.migugu.com/admin/public/no-tag.png',
+			title: '',
+			button: [],
+			tip: []
+		},
+		'MESSAGE': {
+			image: 'https://lbqny.migugu.com/admin/public/no-message.png',
+			title: '消息通知空空如也',
+			button: [],
+			tip: []
+		},
+		'LIVE': {
+			image: 'https://lbqny.migugu.com/admin/public/no-live.png',
+			title: '',
+			button: [],
+			tip: []
+		},
+		'ORDER': {
+			image: 'https://lbqny.migugu.com/admin/public/no-order.png',
+			title: "还没有相关订单哦",
+			button: [],
+			tip: []
+		},
+		'CART': {
+			image: 'https://lbqny.migugu.com/admin/public/no-car.png',
+			title: '购物车还是空的哦~',
+			button: [{
+				text: '去逛逛',
+				type: 'confirm'
+			}],
+			button: [],
+			tip: []
+		},
+		'FOOTPRINT': {
+			image: 'https://lbqny.migugu.com/admin/public/no-footprint.png',
+			title: '你还没有足迹~',
+			button: [],
+			tip: []
+		},
+		'COUPON': {
+			image: 'https://lbqny.migugu.com/admin/public/no-coupon.png',
+			title: '你还没有可用的卡券哦',
+			button: [],
+			tip: []
+		},
+		'REDUCTION': {
+			image: 'https://lbqny.migugu.com/admin/reduction/nodata.png',
+			title: '您当前没有满减券，请向工作人员索取',
+			button: [],
+			tip: []
+		},
+		'MYTEAM': {
+			image: 'https://lbqny.migugu.com/admin/public/no-coupon.png',
+			title: '没有更多了',
+			button: [],
+			tip: []
+		}
+	}
+	import {
+		mapState,
+		mapActions,
+	} from 'vuex';
+	export default {
+		name: 'abnor',
+		props: {
+			type: {
+				type: String,
+				default () {
+					return 'DATA'
+				}
+			},
+			image: {
+				type: String,
+				default () {
+					return ''
+				}
+			},
+			title: {
+				type: String,
+				default () {
+					return ''
+				}
+			},
+			tip: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			button: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			tipTap: {
+				type: String,
+				default () {
+					return ''
+				}
+			},
+			tipMax: {
+				type: String,
+				default () {
+					return '100%'
+				}
+			},
+			btnSize: {
+				type: String,
+				default () {
+					return 'big'
+				}
+			},
+			percent: {
+				type: String,
+				default () {
+					return '100%'
+				}
+			},
+		},
+		created() {
+			this.init();
+		},
+		data() {
+			return {
+				pimage: '',
+				ptitle: '',
+				ptip: '',
+				pbutton: ''
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+		}),
+		methods: {
+			emitAbnorTipTap() {
+				let {
+					tipTap = ''
+				} = this
+				if (!tipTap) return
+				this.$emit(tipTap);
+			},
+			emitAbnorTap(index) {
+				let {
+					type
+				} = this.pbutton[index]
+				this.$emit(type);
+			},
+			init() {
+				let type = this.type;
+				if (Types[type]) {
+					this.pimage = this.image || Types[type].image;
+					this.ptitle = this.title || Types[type].title;
+					this.pbutton = this.button && this.button.length > 0 ? this.button : Types[type].button;
+					this.ptip = this.tip && this.tip.length > 0 ? this.tip : Types[type].tip;
+				}
+			}
+		},
+	}
+</script>
+
+<style lang="scss">
+	.abnor {
+		position: relative;
+		display: block;
+		width: 100%;
+		height: 0;
+		padding-bottom: 100%;
+		overflow: hidden;
+
+		.abnor-box {
+			position: absolute;
+			display: flex;
+			top: 0;
+			bottom: 0;
+			left: 0;
+			right: 0;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+
+			.abnor-image {
+				width: 520rpx;
+				height: 400rpx;
+				background: transparent;
+			}
+
+			.abnor-text {
+				margin-top: 30rpx;
+				color: #333;
+				font-size: 32rpx;
+				font-weight: 400;
+			}
+
+			.abnor-tip {
+				margin: 15rpx 0 10rpx 0;
+				color: #999;
+				font-size: 26rpx;
+				text-align: center;
+				max-height: 30vh;
+				overflow: auto;
+			}
+
+			.tip-flex {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				flex-direction: column;
+			}
+
+			.abnor-btn {
+				min-width: 228rpx;
+				height: 66rpx;
+				margin-top: 30rpx;
+				padding: 0 30rpx;
+				background-color: #eee;
+				border: 0 none;
+				border-radius: 10rpx;
+				color: #333;
+				font-size: 28rpx;
+				text-align: center;
+				// overflow: hidden;
+				line-height: 66rpx;
+			}
+
+			.abnor-btn.big {
+				width: 690rpx;
+				height: 100rpx;
+				line-height: 100rpx;
+				font-size: 32rpx;
+				margin-top: 40rpx;
+				border-radius: 50rpx;
+			}
+		}
+	}
+</style>
diff --git a/components/auth.vue b/components/auth.vue
new file mode 100644
index 0000000..852e96b
--- /dev/null
+++ b/components/auth.vue
@@ -0,0 +1,542 @@
+<template>
+	<view style="width:100%">
+		<block v-if="needAuth">
+			<view @tap.stop="toShowAuth">
+				<slot></slot>
+			</view>
+		</block>
+		<block v-else>
+			<view @tap.stop="go(1)">
+				<slot></slot>
+			</view>
+		</block>
+
+		<uni-popup ref="show_auth_item" :maskClick="false">
+			<view @tap.stop.prevent class="auth-box fill-base flex-column flex-center text-center radius-26">
+				<view class="space-md"></view>
+				<block v-if="pType == 'phone'">
+					<image mode="aspectFill" class="auth-img" :src="`https://lbqny.migugu.com/admin/public/auth.png`">
+					</image>
+				</block>
+				<view class="space-sm"></view>
+				<view class="f-caption" :style="{color:primaryColor}">{{contentList[pType][0]}}</view>
+				<view class="space-lg"></view>
+				<view class="space-lg"></view>
+				<block v-if="pType === 'phone'">
+					<button open-type="getPhoneNumber" hover-class="btn-hover" @getphonenumber="authPhone"
+						class="clear-btn flex-center auth-btn" :style="{background: `linear-gradient(68deg, ${primaryColor}, ${subColor})`,color:'white'}">
+						{{btn_text||contentList[pType][1]}}
+					</button>
+				</block>
+				<block v-if="pType === 'setting'">
+					<button open-type="openSetting" hover-class="btn-hover" @opensetting="openSetting"
+						class="clear-btn flex-center auth-btn" :style="{background: `linear-gradient(68deg, ${primaryColor}, ${subColor})`,color:'white'}">
+						{{btn_text||contentList[pType][1]}}
+					</button>
+				</block>
+				<view @tap.stop="go(pType == 'phone' &&  !userInfo.phone ? 2 :  1)" class="f-caption c-caption mt-md"
+					v-if="!pMust">{{pType=='userInfo'?'暂不授权':'暂不登录'}}</view>
+				<view class="space-md"></view>
+			</view>
+		</uni-popup>
+
+
+		<uni-popup ref="show_info_item" :maskClick="false">
+			<view @tap.stop.prevent class="common-popup-content popup-phone pd-lg flex-center flex-column fill-base">
+				<view class="f-md-title c-black">请填写用户信息</view>
+				<view class="space-lg pb-lg"></view>
+				<view class="space-lg pb-lg"></view>
+				<view class="flex-between" style="width:100%">
+					<view class="flex-y-center c-title">
+						<view class="c-warning">*</view>昵称
+					</view>
+					<!-- #ifdef MP-WEIXIN -->
+					<input v-model="infoForm.nickName" type="nickname" maxlength="15"
+						class="f-mini-title c-title text-right" style="width:80%" placeholder-class="c-placeholder"
+						:placeholder="infoRule[0].errorMsg" />
+					<!-- #endif -->
+					<!-- #ifndef MP-WEIXIN -->
+					<input v-model="infoForm.nickName" type="text" maxlength="15"
+						class="f-mini-title c-title text-right" style="width:80%" placeholder-class="c-placeholder"
+						:placeholder="infoRule[0].errorMsg" />
+					<!-- #endif -->
+				</view>
+				<view class="flex-between mt-md pt-md b-1px-t" style="width:100%">
+					<view class="flex-y-center c-title">
+						<view class="c-warning">*</view>头像
+					</view>
+					<!-- #ifdef MP-WEIXIN -->
+					<button open-type="chooseAvatar" @chooseavatar="onChooseAvatar">
+						<image mode="aspectFill" class="avatar radius" :src="infoForm.avatarUrl || '/static/mine/default_user.png'"></image>																
+					</button>
+					<!-- #endif -->
+					<!-- #ifndef MP-WEIXIN -->
+					<image @tap.stop="toChooseImg" mode="aspectFill" class="avatar radius" :src="infoForm.avatarUrl">
+					</image>
+					<!-- #endif -->
+				</view>
+				<view class="button">
+					<view @tap.stop="$refs.show_info_item.close()" class="item-child">
+						取消
+					</view>
+					<view @tap.stop="submit('info')" class="item-child"
+						:style="{background: primaryColor,color:'#fff'}">
+						确定
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+
+		<uni-popup ref="show_phone_item" :maskClick="false">
+			<view @tap.stop.prevent class="common-popup-content popup-phone pd-lg flex-center flex-column fill-base">
+				<view class="f-md-title c-black">请输入手机号</view>
+				<view class="space-lg pb-lg"></view>
+				<view class="space-lg pb-lg"></view>
+				<view class="flex-center mb-lg">
+					<view class="input-info sm mr-md radius-16">
+						<input v-model="subForm.phone" type="number"
+							class="item-input flex-y-center pl-lg pr-lg f-sm-title c-title"
+							placeholder-class="c-placeholder" :placeholder="subRule[0].errorMsg" />
+					</view>
+					<view @tap="toSend" class="send-btn flex-center c-base radius-16"
+						:style="{background:primaryColor}">
+						{{authTime>0?`(${authTime}s)`:'发送'}}
+					</view>
+				</view>
+				<view class="input-info radius-16">
+					<input v-model="subForm.short_code" type="number"
+						class="item-input flex-y-center pl-lg pr-lg f-sm-title c-title" maxlength="6"
+						placeholder-class="c-placeholder" :placeholder="subRule[1].errorMsg" />
+				</view>
+				<view class="button">
+					<view @tap.stop="go(3)" class="item-child">
+						取消
+					</view>
+					<view @tap.stop="submit('sub')" class="item-child" :style="{background: primaryColor,color:'#fff'}">
+						确定
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+
+
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations,
+	} from "vuex"
+	export default {
+		components: {},
+		name: 'auth',
+		props: {
+			needAuth: {
+				type: Boolean,
+				default () {
+					return false
+				}
+			},
+			must: {
+				type: Boolean,
+				default () {
+					return false
+				}
+			},
+			userMust: {
+				type: Boolean,
+				default () {
+					return true
+				}
+			},
+			showAuth: {
+				type: Boolean,
+				default () {
+					return false
+				}
+			},
+			type: {
+				type: String,
+				default () {
+					return 'phone'
+				}
+			},
+			btn_text: {
+				type: String,
+				default () {
+					return ''
+				}
+			},
+			haveGo: {
+				type: Boolean,
+				default () {
+					return true
+				}
+			},
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			commonOptions: state => state.user.commonOptions,
+			userInfo: state => state.user.userInfo,
+		}),
+		created() {
+			this.init();
+		},
+		data() {
+			return {
+				contentList: {
+					userInfo: ['尊贵的用户，获取授权是为了能更好的为你服务', '立即授权'],
+					phone: ['尊贵的用户，登录后我们才能更好的为你服务', '立即登录'],
+					setting: ['为了功能正常使用，你需要打开设置并开启获取相应权限', '打开设置'],
+				},
+				pType: '',
+				pMust: '',
+				authTime: 0,
+				timer: null,
+				subForm: {
+					phone: '',
+					short_code: ''
+				},
+				subRule: [{
+					name: "phone",
+					checkType: "isMobile",
+					errorMsg: "请输入手机号",
+					regText: "手机号"
+				}, {
+					name: "short_code",
+					checkType: "isNotNull",
+					errorMsg: "请输入短信验证码"
+				}],
+				infoForm: {
+					nickName: '',
+					avatarUrl: ''
+				},
+				infoRule: [{
+					name: "nickName",
+					checkType: "isNotNull",
+					errorMsg: "请输入用户昵称",
+					regType: 2
+				}, {
+					name: "avatarUrl",
+					checkType: "isNotNull",
+					errorMsg: "请上传用户头像"
+				}],
+				lockTap: false
+			}
+		},
+		methods: {
+			...mapActions(['getUserInfo', 'getMineInfo', 'getAuthUserProfile', 'getAuthPhone', ]),
+			...mapMutations(['updateConfigItem', 'updateUserItem']),
+			init() {
+				let {
+					type,
+					must,
+					showAuth
+				} = this
+				this.$set(this, 'pType', type)
+				this.$set(this, 'pMust', must)
+				if (!showAuth) return
+				let refs_key = type === 'userInfo' ? 'show_info_item' : 'show_auth_item'
+				this.$refs[refs_key].open()
+			},
+			toShowAuth() {
+				let {
+					id: uid = 0,
+					phone = '',
+				} = this.userInfo
+				if (!uid) {
+					this.updateUserItem({
+						key: 'loginPage',
+						val: `/pages/mine?type=1`
+					})
+					this.$util.goUrl({
+						url: `/pages/login`
+					})
+					return
+				}
+				this.infoForm = this.$util.pick(this.userInfo, ['nickName',
+					'avatarUrl'
+				])
+				let type = !phone ? 'phone' : 'userInfo'
+				this.$set(this, 'pType', type)
+				let refs_key = 'show_info_item'
+				if (!phone) {
+					// #ifdef MP-WEIXIN
+					refs_key = 'show_auth_item'
+					// #endif
+					// #ifndef MP-WEIXIN
+					if (this.haveGo) {
+						refs_key = 'show_phone_item'
+						let {
+							short_code_status = 0
+						} = this.configInfo
+						if (!short_code_status) {
+							this.go(1)
+							return
+						}
+					}
+					// #endif
+				}
+				this.$refs[refs_key].open()
+			},
+			// 授权手机号
+			async authPhone(e) {
+				let {
+					pMust
+				} = this
+				let phone = await this.getAuthPhone({
+					e,
+				})
+				if (!phone) {
+					this.go(pMust ? 2 : 1)
+					return false
+				} else {
+					let {
+						nickName = '',
+					} = this.userInfo
+					if (nickName) {
+						this.go(1)
+						return
+					}
+					this.$set(this, 'pType', 'userInfo')
+					this.$set(this, 'pMust', this.userMust)
+					if (!this.pMust) return
+					this.$refs.show_info_item.open()
+				}
+			},
+			go(type = 1) {
+				this.lockTap = false
+				this.$emit(type == 1 ? 'go' : 'hide')
+				let refs_key = type == 3 ? 'show_phone_item' : type == 4 ? 'show_info_item' : 'show_auth_item'
+				let {
+					id: uid = 0
+				} = this.userInfo
+				if (uid) {
+					this.$refs[refs_key].close();
+				}
+				if (type != 3) return
+				this.toResetItem('sub')
+			},
+			// 重置数据
+			toResetItem(type) {
+				if (type == 'sub') {
+					this.timer && clearTimeout(this.timer)
+					this.authTime = 0
+					this.subForm = {
+						phone: '',
+						short_code: ''
+					}
+					return
+				}
+				this.infoForm = this.$util.pick(this.userInfo, ['nickName',
+					'avatarUrl'
+				])
+			},
+			//表单验证
+			validate(param, ruleType, is_send = false) {
+				let validate = new this.$util.Validate();
+				this[`${ruleType}Rule`].map(item => {
+					let {
+						name,
+					} = item
+					if (ruleType == 'sub' && name == 'short_code' && is_send) return
+					validate.add(param[name], item);
+				})
+				let message = validate.start();
+				return message;
+			},
+			// 发送验证码
+			async toSend() {
+				let {
+					authTime
+				} = this
+				if (authTime) return
+				let {
+					phone = ''
+				} = this.subForm
+				let msg = this.validate({
+					phone
+				}, 'sub', true);
+				if (msg) {
+					this.$util.showToast({
+						title: msg
+					});
+					return;
+				}
+				if (this.lockTap) return
+				this.lockTap = true
+				this.$util.showLoading()
+				try {
+					await this.$api.user.sendShortMsg({
+						phone
+					})
+					this.$util.hideAll()
+					this.lockTap = false
+					let time = 60
+					this.timer = setInterval(() => {
+						if (time === 0) {
+							clearInterval(this.timer)
+							return
+						}
+						time--
+						this.authTime = time
+					}, 1000)
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+			},
+			// 获取头像
+			onChooseAvatar(e) {
+				let {
+					avatarUrl
+				} = e.detail
+				this.infoForm.avatarUrl = avatarUrl
+			},
+			async toChooseImg() {
+				let param = {
+					count: 1,
+					sizeType: ['compressed'],
+					sourceType: ['album'],
+				}
+				let [res_upload, res_info] = await uni.chooseImage(param)
+				if (res_upload) return
+				let {
+					size = 0,
+						tempFiles,
+						tempFilePath = ''
+				} = res_info
+				// 格式化图片参数
+				this.$util.showLoading({
+					title: "上传中"
+				})
+				let {
+					attachment_path: path
+				} = await this.$api.base.uploadFile({
+					filePath: tempFiles[0].path,
+					formData: {
+						type: 'picture'
+					}
+				})
+				this.infoForm.avatarUrl = path
+				this.$util.hideAll()
+			},
+			// sub 授权手机号，info 用户信息
+			async submit(formType) {
+				let param = this.$util.deepCopy(this[`${formType}Form`])
+				let msg = this.validate(param, formType);
+				if (msg) {
+					this.$util.showToast({
+						title: msg
+					});
+					return;
+				}
+
+				if (formType == 'sub' && param.short_code.length != 6) {
+					this.$util.showToast({
+						title: `请输入6位数短信验证码`
+					})
+					return
+				}
+
+				if (formType == 'info' && (param.avatarUrl.includes('wxfile://') || param.avatarUrl.includes(
+						'//tmp/'))) {
+					let {
+						attachment_path: path
+					} = await this.$api.base.uploadFile({
+						filePath: param.avatarUrl,
+						formData: {
+							type: 'picture'
+						}
+					})
+					param.avatarUrl = path
+				}
+
+				if (this.lockTap) return
+				this.lockTap = true
+				this.$util.showLoading()
+				let methodModel = formType == 'sub' ? 'bindUserPhone' : 'userUpdate'
+				let refs_key = formType == 'sub' ? 'show_phone_item' : 'show_info_item'
+				try {
+					await this.$api.user[methodModel](param)
+					this.$util.hideAll()
+					this.lockTap = false
+					this.$refs[refs_key].close()
+					this.toResetItem(formType)
+					await this.getUserInfo()
+					setTimeout(() => {
+						this.$emit('go')
+					}, 500)
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+			}
+		},
+	}
+</script>
+
+
+
+<style lang="scss">
+	.auth-box {
+		width: 630rpx;
+		height: auto;
+		padding: 30rpx;
+
+		.auth-img {
+			width: 322rpx;
+			height: 341rpx;
+			/* background: #f4f6f8; */
+		}
+
+		.auth-btn {
+			width: 367rpx;
+			height: 90rpx;
+			border-radius: 90rpx;
+		}
+
+		.auth-info {
+			width: 80rpx;
+			height: 80rpx;
+			background: #f4f6f8;
+			border-radius: 50%;
+		}
+
+	}
+
+
+	.popup-phone {
+		width: 630rpx;
+
+		.input-info {
+			width: 570rpx;
+			height: 90rpx;
+			background: #F7F7F7;
+
+			.item-input {
+				height: 90rpx;
+				font-size: 32rpx;
+				text-align: left;
+			}
+		}
+
+		.input-info.sm {
+			width: 400rpx;
+		}
+
+		.send-btn {
+			width: 150rpx;
+			height: 90rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/banner.vue b/components/banner.vue
new file mode 100644
index 0000000..7a3df2f
--- /dev/null
+++ b/components/banner.vue
@@ -0,0 +1,285 @@
+<template>
+	<!-- 轮播图广告 -->
+	<!-- :current="activeIndex" -->
+	<view class='swiper-box' :style='{margin:`0 ${margin}rpx`}' v-if="showSwiper">
+		<swiper class="swiper-ad fill-base" :indicator-dots="false" :autoplay="playVideo ? false : autoplay"
+			:indicator-color="indicatorColor" :indicator-active-color="indicatorActiveColor" :circular="circular"
+			:previous-margin="list.length>1?previousMargin:0" :next-margin="list.length>1?nextMargin:0"
+			@change="handerChange" :style="{height:height+'rpx'}" easing-function="linear">
+			<swiper-item v-for="(item,index) in list" :key="index" :style="{borderRadius:borderRadius+'rpx'}">
+				<view class='img-box' @tap.stop='changeItem(item)'>
+					<block v-if="item.jump_type == 'video'">
+						<block v-if="!playVideo">
+							<view @tap.stop="playCurrent" class="play-video-info flex-center c-base abs">
+								<view class="play-video flex-center c-base radius">
+									<i class="iconfont icon-play-video"></i>
+								</view>
+							</view>
+							<image mode="aspectFill" :src='item.img' class="swiper-ad__img radius-16"
+								:style="{borderRadius:borderRadius+'rpx'}" />
+						</block>
+						<view class="video-box" v-if="playVideo">
+							<video :id="`video_id`" class="my-video" object-fit="contain" :loop="false"
+								enable-play-gesture :enable-progress-gesture="false" :src="item.jump_url"
+								:autoplay="playVideo" @play="onPlay" @pause="onPause" @ended="onEnded"
+								@timeupdate="onTimeUpdate" @waiting="onWaiting" @progress="onProgress"
+								@loadedmetadata="onLoadedMetaData"></video>
+						</view>
+					</block>
+					<image mode="aspectFill" :src='item.img || item' class="swiper-ad__img"
+						:style="{borderRadius:borderRadius+'rpx'}" v-else />
+				</view>
+			</swiper-item>
+		</swiper>
+		<view class='numbers' v-if="list.length>1&&indicatorType=='number' && !playVideo"
+			:style="{textAlign:indicatorStyle}">
+			<view class="number">{{activeIndex+1}}/{{list.length}}</view>
+		</view>
+		<view class='dots' v-if="list.length>1&&indicatorType=='dot'"
+			:style="{textAlign:indicatorStyle,bottom:`${dotBottom}rpx`}">
+			<view class='dot' v-for="(item,index) in list" :key="index"
+				:style='{backgroundColor:index==activeIndex?indicatorActiveColor:indicatorColor,width:index==activeIndex? `${dotWidth}rpx` :"12rpx"}'>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState
+	} from 'vuex';
+	export default {
+		name: 'banner',
+		props: {
+			list: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			height: {
+				type: Number,
+				default () {
+					return 400
+				}
+			},
+			indicatorType: {
+				type: String,
+				default () {
+					return "dot"
+				}
+			},
+			indicatorColor: {
+				type: String,
+				default () {
+					return "#FEFFFE"
+				}
+			},
+			indicatorActiveColor: {
+				type: String,
+				default () {
+					return "#fff"
+				}
+			},
+			indicatorStyle: {
+				type: String,
+				default () {
+					return 'center'
+				}
+			},
+			circular: {
+				type: Boolean,
+				default () {
+					return true
+				}
+			},
+			autoplay: {
+				type: Boolean,
+				default () {
+					return false
+				}
+			},
+			previousMargin: {
+				type: Number,
+				default () {
+					return 0
+				}
+			},
+			nextMargin: {
+				type: Number,
+				default () {
+					return 0
+				}
+			},
+			dotWidth: {
+				type: Number,
+				default () {
+					return 12
+				}
+			},
+			dotBottom: {
+				type: Number,
+				default () {
+					return 20
+				}
+			},
+			margin: {
+				type: Number,
+				default () {
+					return 0
+				}
+			},
+			borderRadius: {
+				type: Number,
+				default () {
+					return 0
+				}
+			}
+		},
+		created() {
+			this.videoContexts = uni.createVideoContext(`video_id`, this)
+		},
+		data() {
+			return {
+				showSwiper: true,
+				activeIndex: 0,
+				videoContexts: {},
+				playVideo: false,
+			}
+		},
+		watch: {
+			list(newlist, oldlist) {
+				this.activeIndex = 0
+				this.showSwiper = false;
+				setTimeout(() => {
+					this.$nextTick(() => {
+						this.showSwiper = true
+					});
+				})
+			}
+		},
+		computed: mapState({
+			configInfo: state => state.config.configInfo,
+			commonOptions: state => state.user.commonOptions,
+		}),
+		methods: {
+			handerChange: function(e) {
+				let {
+					current
+				} = e.detail
+				this.activeIndex = current
+				let ind = this.list.findIndex(item => {
+					return item.jump_type == 'video'
+				})
+				if (ind == -1) return
+				if (current == ind + 1 || current == this.list.length - 1) {
+					this.videoContexts.pause()
+					this.playVideo = false
+				}
+			},
+			changeItem(item) {
+				let {
+					jump_type = ''
+				} = item
+				if (jump_type == 'video') return
+				this.$emit("change", item)
+			},
+			playCurrent() {
+				this.videoContexts.play()
+				this.playVideo = true
+			},
+			onPlay(e) {},
+			onPause(e) {},
+			onEnded(e) {},
+			onError(e) {},
+			onTimeUpdate(e) {},
+			onWaiting(e) {},
+			onProgress(e) {},
+			onLoadedMetaData(e) {}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.swiper-box {
+		position: relative;
+
+		.img-box {
+			width: 100%;
+			height: 100%;
+
+			.swiper-ad__img {
+				width: 100%;
+				height: 100%;
+				background: #fff;
+			}
+
+			.play-video-info {
+				top: 0rpx;
+				width: 100%;
+				height: 100%;
+				z-index: 9;
+
+				.play-video {
+					width: 66rpx;
+					height: 66rpx;
+					background: rgba(2, 2, 2, 0.5);
+
+					.iconfont {
+						font-size: 28rpx;
+					}
+				}
+			}
+
+			.video-box {
+				width: 100%;
+				height: 100%;
+
+				.my-video {
+					width: 100%;
+					height: 100%;
+				}
+			}
+
+		}
+
+		.dots {
+			position: absolute;
+			z-index: 20rpx;
+			text-align: right;
+			width: 100%;
+			padding: 0 20rpx;
+
+			.dot {
+				display: inline-block;
+				height: 12rpx;
+				width: 12rpx;
+				background-color: #FEFFFE;
+				border-radius: 6rpx;
+				margin: 0 8rpx;
+
+			}
+		}
+
+
+		.numbers {
+			position: absolute;
+			z-index: 20rpx;
+			text-align: right;
+			width: 100%;
+			transform: translateY(-70rpx);
+			padding: 0 15rpx;
+
+			.number {
+				display: inline-block;
+				width: 66rpx;
+				line-height: 40rpx;
+				font-size: 24rpx;
+				color: #fff;
+				text-align: center;
+				border-radius: 33rpx;
+				background: rgba(0, 0, 0, 0.4);
+			}
+		}
+	}
+</style>
diff --git a/components/column.vue b/components/column.vue
new file mode 100644
index 0000000..22e210f
--- /dev/null
+++ b/components/column.vue
@@ -0,0 +1,337 @@
+<template>
+	<view>
+		<!-- 轮播图 -->
+		<view v-if="type=='swiper'" class='column-box'
+			:style='{paddingTop:whiteSpace+"rpx",paddingBottom:whiteSpace+"rpx",paddingLeft:wingBlank+"rpx",paddingRight:wingBlank+"rpx"}'>
+			<swiper class="swiper-category" @change="handerChange"
+				:style="{height:(146*formatRowNum+20*(formatRowNum-1))+'rpx'}">
+				<swiper-item class="swiper-category-item" v-for="(pitem,pindex) in formatList" :key="pindex">
+					<view v-for="(item,index) in pitem" :key="index" class="column-item"
+						:style="{width:100/colNum + '%',marginTop:index<colNum? '0' : '20rpx'}" @tap='change(item)'>
+						<image mode="aspectFill" class="column-img radius" :src="item.cover" v-if="item.cover"></image>
+						<view v-else class="column-no-img"
+							:style="{background:item.icon?primaryColor:colorList[index%4],borderRadius:'50%',margin:'0rpx auto'}">
+							<i class="iconfont" :class="item.icon" v-if="item.icon"></i>
+							<view v-else>{{getFirstText(item.title)}}</view>
+						</view>
+						<view class='column-text'>{{item.title}}</view>
+					</view>
+				</swiper-item>
+			</swiper>
+			<view class='dots' v-if="formatList.length>1">
+				<view class='dot' v-for="(item,index) in formatList.length" :key="index"
+					:style="{background:index==current?indicatorActiveColor:indicatorColor,width:index==current?'20rpx':'8rpx'}">
+				</view>
+			</view>
+		</view>
+
+		<!-- 滑动 -->
+		<view v-if="type=='scroll'" class='column-box'
+			:style='{paddingTop:whiteSpace+"rpx",paddingBottom:whiteSpace+"rpx",paddingLeft:wingBlank+"rpx",paddingRight:wingBlank+"rpx"}'>
+			<scroll-view scroll-x class='scroll-x' @scroll="handerScroll">
+				<view class='scroll-x-item' v-for="(pItem,pindex) in formatList" :key="pindex">
+					<view class='column-item' v-for="(item,index) in pItem" :key="index"
+						:style='{width:(750/colNum)+"rpx"}' @tap='change(item)'>
+						<image mode="aspectFill" class='column-img' :src='item.icon'></image>
+						<view class='column-text'>{{item.cate_name}}</view>
+					</view>
+				</view>
+			</scroll-view>
+			<view class='ink-bar-box' v-if="list.length>formatRowNum*colNum">
+				<view class="ui-tabs-ink-bar-wrapper">
+					<view class="ui-tabs-ink-bar" :style='{left:left+"rpx",background:indicatorActiveColor}'></view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		name: 'column',
+		props: {
+			type: {
+				type: String,
+				default () {
+					return "swiper"
+				}
+			},
+			list: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			colNum: {
+				type: Number,
+				default () {
+					return 4
+				}
+			},
+			rowNum: {
+				type: Number,
+				default () {
+					return 2
+				}
+			},
+			indicatorActiveColor: {
+				type: String,
+				default () {
+					return '#f6f5fa'
+				}
+			},
+			indicatorColor: {
+				type: String,
+				default () {
+					return '#f6f5fa'
+				}
+			},
+			wingBlank: {
+				type: Number,
+				default () {
+					return 0
+				}
+			},
+			whiteSpace: {
+				type: Number,
+				default () {
+					return 30
+				}
+			},
+			borderRadius: {
+				type: Number,
+				default () {
+					return 0
+				}
+			}
+		},
+		created() {
+
+		},
+		data() {
+			return {
+				activeIndex: 0,
+				newList: [],
+				left: 0,
+				current: 0,
+				colorList: ["#fc7f87", "#56b4fc", "#f8ae41", "#11dd9e"]
+			}
+		},
+		computed: {
+			...mapState({
+				primaryColor: state => state.config.configInfo.primaryColor,
+				subColor: state => state.config.configInfo.subColor,
+			}),
+			formatRowNum() {
+				let {
+					colNum,
+					rowNum,
+					list
+				} = this;
+				let length = list.length;
+				let newRowNum = length <= colNum ? 1 : rowNum;
+				return newRowNum
+			},
+			formatList() {
+				let {
+					colNum,
+					rowNum,
+					type,
+					list,
+					formatRowNum
+				} = this;
+
+
+				let index = 0;
+				let length = list.length;
+				let newList = [];
+
+				let count = formatRowNum * colNum
+				// let count = type == 'scroll' ? colNum : formatRowNum * colNum
+				while (index < length) {
+					newList.push(list.slice(index, index += count));
+				}
+				return newList
+			},
+		},
+		methods: {
+			handerScroll: function(e) {
+				let {
+					scrollLeft,
+					scrollWidth
+				} = e.detail;
+				let windowWidth = uni.getSystemInfoSync().windowWidth;
+				let left = scrollLeft * 30 / (scrollWidth - windowWidth);
+				this.left = left
+			},
+			handerChange: function(e) {
+				this.current = e.detail.current;
+			},
+			change(item) {
+				this.$emit("change", item)
+			},
+			getFirstText(d) {
+				d = d || '名称'
+				return d.slice(0, 1)
+			},
+		},
+	}
+</script>
+
+
+<style lang="scss">
+	/* 轮播图 */
+	.column-box {
+		background: #fff;
+		font-size: 24rpx;
+		color: #888;
+
+		.swiper-category {
+			width: 100%;
+			background: #fff;
+			font-size: 24rpx;
+			color: #666;
+			border-radius: 10rpx;
+
+			.swiper-category-item {
+				box-sizing: border-box;
+				display: flex;
+				align-items: flex-start;
+				flex-wrap: wrap;
+				background: #fff;
+
+
+				.column-item {
+					margin-top: 20rpx;
+					float: left;
+
+
+					.column-img {
+						width: 94rpx;
+						height: 94rpx;
+						margin: 0 auto;
+					}
+
+					.column-no-img {
+						width: 94rpx;
+						height: 94rpx;
+						border-radius: 50%;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						font-size: 36rpx;
+						color: #fff;
+
+						.iconfont {
+							font-size: 58rpx;
+						}
+					}
+
+					.column-text {
+						margin-top: 10rpx;
+						text-align: center;
+						color: #484848;
+						width: 100%;
+						display: block;
+						overflow: hidden;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+					}
+
+				}
+			}
+		}
+
+		.scroll-x {
+			white-space: nowrap;
+			background: #fff;
+			padding: 20rpx 0;
+
+			.scroll-x-item {
+				position: relative;
+				display: inline-block;
+				vertical-align: text-top;
+				display: flex;
+				flex-direction: column;
+			}
+
+			.column-item {
+				margin-top: 20rpx;
+				float: left;
+
+
+				.column-img {
+					width: 94rpx;
+					height: 94rpx;
+					margin: 0 auto;
+				}
+
+				.column-text {
+					margin-top: 10rpx;
+					text-align: center;
+					color: #484848;
+					width: 100%;
+					padding: 0 10%;
+					display: block;
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+				}
+
+			}
+		}
+
+
+		.dots {
+			background: white;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			width: 100%;
+			padding-top: 20rpx;
+
+			.dot {
+				height: 8rpx;
+				width: 8rpx;
+				background: #E5E5E5;
+				border-radius: 8rpx;
+				margin: 0 8rpx;
+			}
+		}
+
+		.ink-bar-box {
+			background: #fff;
+			padding-bottom: 20rpx;
+
+			.ui-tabs-ink-bar-wrapper {
+				width: 60rpx;
+				background: #ddd;
+				position: relative;
+				left: 345rpx;
+				bottom: 0;
+				height: 8rpx;
+				transform-origin: 50% 50%;
+				transition: width 250ms ease-out, left 250ms ease-out;
+				overflow: hidden;
+				border-radius: 4rpx;
+
+				.ui-tabs-ink-bar {
+					position: absolute;
+					width: 30rpx;
+					background: #e74d45;
+					height: 8rpx;
+					border-radius: 4rpx;
+				}
+
+			}
+		}
+
+
+
+	}
+</style>
\ No newline at end of file
diff --git a/components/common-popup.vue b/components/common-popup.vue
new file mode 100644
index 0000000..737f867
--- /dev/null
+++ b/components/common-popup.vue
@@ -0,0 +1,161 @@
+<template>
+	<uni-popup type="center" :maskClick="maskClick" ref="common_popup">
+		<view class="common-popup-content fill-base">
+			<view class="title" v-if="ptitle">{{ptitle}}</view>
+			<view class="desc" v-if="pdesc">{{pdesc}}</view>
+			<image mode="aspectFill" class="image" :class="imgSize" :src="info.image" v-if="info.image"></image>
+			<view class="name" v-if="info.name">{{info.name}}</view>
+			<view class="button">
+				<block v-for="(item,index) in pbutton" :key="index">
+					<view @tap.stop="toEmit(index)" class="item-child"
+						:style="{background: item.type == 'confirm' ? primaryColor : '',color:item.type == 'confirm' ?'white':''}">
+						{{item.title}}
+					</view>
+				</block>
+			</view>
+		</view>
+	</uni-popup>
+</template>
+
+<script>
+	const Types = {
+		'REFUSE_ORDER': {
+			title: '拒绝接单',
+			desc: '请确认是否拒绝接单',
+			text: '确认拒绝'
+		},
+		'CANCEL_ORDER': {
+			title: '取消订单',
+			desc: '请确认是否取消订单，取消后将无法恢复',
+			text: '确认取消'
+		},
+		'DELETE_ORDER': {
+			title: '删除订单',
+			desc: '请确认是否删除订单，删除后将无法恢复',
+			text: '确认删除'
+		},
+		'CANCEL_REFUND_ORDER': {
+			title: '取消退款',
+			desc: '请确认是否取消退款',
+			text: '确认取消'
+		},
+		'NO_PASS_REFUND': {
+			title: '拒绝退款',
+			desc: '请确认是否拒绝退款',
+			text: '确认拒绝'
+		},
+		'HX_CODE': {
+			title: '核销码',
+			desc: '请出示二维码给核销人员',
+		},
+		'HX_ORDER': {
+			title: '核销订单',
+			desc: '请确认是否核销订单',
+			text: '确认核销'
+		},
+	}
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		props: {
+			maskClick: {
+				type: Boolean,
+				default () {
+					return false
+				}
+			},
+			type: {
+				type: String,
+				default () {
+					return 'CANCEL_ORDER'
+				}
+			},
+			title: {
+				type: String,
+				default () {
+					return ''
+				}
+			},
+			desc: {
+				type: String,
+				default () {
+					return ''
+				}
+			},
+			info: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			button: {
+				type: Array,
+				default () {
+					return [{
+						title: '取消',
+						type: 'cancel'
+					}, {
+						title: '确定取消',
+						type: 'confirm'
+					}]
+				}
+			},
+			imgSize: {
+				type: String,
+				default () {
+					return ''
+				}
+			}
+		},
+		created() {
+			this.init();
+		},
+		data() {
+			return {
+				ptitle: '',
+				pdesc: '',
+				pbutton: [],
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+		}),
+		methods: {
+			init() {
+				let {
+					type,
+				} = this;
+				if (Types[type]) {
+					this.ptitle = this.title || Types[type].title
+					this.pdesc = this.desc || Types[type].desc
+					this.pbutton = this.button
+					if (!Types[type].text) return
+					this.pbutton[1].title = Types[type].text
+				}
+			},
+			open() {
+				this.$refs.common_popup.open()
+			},
+			close() {
+				this.$refs.common_popup.close()
+			},
+			toEmit(index) {
+				let {
+					type
+				} = this.button[index]
+				if (type == 'cancel') {
+					this.close()
+				} else {
+					this.$emit(type)
+				}
+			}
+		},
+	}
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/components/fix-bottom-button.vue b/components/fix-bottom-button.vue
new file mode 100644
index 0000000..e00bf17
--- /dev/null
+++ b/components/fix-bottom-button.vue
@@ -0,0 +1,98 @@
+<template>
+	<view class="content" :style="{background: bgColor}">
+		<block v-for="(item,index) in text" :key="index">
+			<!-- 无间隔的按钮 -->
+			<auth @tap.stop.prevent :needAuth="item.isAuth && (userInfo && (!userInfo.phone || !userInfo.nickName))"
+				:must="true" :type="!userInfo.phone ? 'phone' : 'userInfo'" @go="confirm(item)" :style="{
+				width:(100/ text.length)+ '%'}" v-if="classType === 1">
+				<view class="bottom-view" :style="{
+				margin:text.length==1?'0 30rpx':index==0?'0 0 0 30rpx':'0 30rpx 0 0',
+				borderRadius:text.length==1?'88rpx':index==0?'88rpx 0 0 88rpx':'0 88rpx 88rpx 0',
+				background: item.type == 'confirm'? `linear-gradient(68deg, ${primaryColor}, ${subColor})` : subColor}">
+					{{ item.text }}
+				</view>
+			</auth>
+			<!-- 有间隔的圆弧形按钮 -->
+			<auth @tap.stop.prevent :needAuth="item.isAuth && (userInfo && (!userInfo.phone || !userInfo.nickName))"
+				:must="true" :type="!userInfo.phone ? 'phone' : 'userInfo'" @go="confirm(item)" :style="{
+				width:text.length==2 ? index==0 ? '390rpx' : '360rpx' : (100/ text.length) + '%'}" v-if="classType === 2">
+				<view class="bottom-view" :style="{
+				margin:text.length==1?'0 30rpx':index==0?'0 30rpx 0 30rpx':'0 30rpx 0 0',
+				borderRadius:'88rpx',
+				background: item.type == 'confirm'? `linear-gradient(68deg, ${primaryColor}, ${subColor})` : '',
+				color: item.type === 'confirm' ?  '#fff' : '#000',
+				transform: 'rotateZ(360deg)',
+				border: item.type == 'confirm'? `1rpx solid ${primaryColor}` : '1rpx solid #C7C7C7'}">
+					{{ item.text }}
+				</view>
+			</auth>
+		</block>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	export default {
+		props: {
+			text: {
+				type: Array,
+				default () {
+					return [{
+						text: '保存',
+						type: 'confirm'
+					}]
+				}
+			},
+			bgColor: {
+				type: String,
+				default () {
+					return '#F8F8F8'
+				}
+			},
+			classType: {
+				type: Number,
+				default () {
+					return 1
+				}
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			userInfo: state => state.user.userInfo,
+		}),
+		methods: {
+			confirm(item) {
+				this.$emit(item.type)
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.content {
+		position: fixed;
+		bottom: 0rpx;
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 100%;
+		height: 128rpx;
+		z-index: 997;
+		height: calc(128rpx + env(safe-area-inset-bottom) / 2);
+		padding-bottom: calc(env(safe-area-inset-bottom) / 2);
+
+		.bottom-view {
+			width: auto;
+			height: 88rpx;
+			line-height: 88rpx;
+			text-align: center;
+			font-size: 32rpx;
+			font-weight: bold;
+			color: #FFFFFF;
+		}
+	}
+</style>
diff --git a/components/fixed.vue b/components/fixed.vue
new file mode 100644
index 0000000..645f0a0
--- /dev/null
+++ b/components/fixed.vue
@@ -0,0 +1,86 @@
+<template>
+	<view>
+		<view class="ui-fixed" :class="{'fixed-top':position=='top','fixed-bottom':position=='bottom'}"
+			:style="{top:position=='top'?`${top}px`:`` , zIndex: zIndex}">
+			<slot></slot>
+		</view>
+		<view :style="{height:height+'px'}" v-if="position=='top'"></view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'fixed',
+		props: {
+			position: {
+				type: [String],
+				default () {
+					return 'top'
+				}
+			},
+			top: {
+				type: [Number],
+				default () {
+					return 0
+				}
+			},
+			zIndex: {
+				type: [Number],
+				default () {
+					return 999
+				}
+			},
+			initHeight: {
+				type: String || Number,
+				default () {
+					return ''
+				}
+			},
+		},
+		data() {
+			return {
+				height: uni.getSystemInfoSync().windowWidth * 100 / 750
+			}
+		},
+		mounted() {
+			setTimeout(() => {
+				this.setHeight();
+			}, 100)
+		},
+		watch: {
+			initHeight(newVal, oldval) {
+				this.$nextTick(() => {
+					this.setHeight()
+				})
+			}
+		},
+		methods: {
+			setHeight() {
+				var _this = this;
+				var query = uni.createSelectorQuery().in(_this);
+				query.select('.ui-fixed').boundingClientRect(function(res) {
+					_this.height = res.height;
+					_this.$emit('height', res.height)
+				}).exec();
+			}
+		},
+	}
+</script>
+
+
+<style>
+	.ui-fixed {
+		position: fixed;
+		left: 0;
+		width: 100%;
+		z-index: 999;
+	}
+
+	.fixed-top {
+		top: 0;
+	}
+
+	.fixed-bottom {
+		bottom: 0;
+	}
+</style>
diff --git a/components/jyf-Parser/handler.sjs b/components/jyf-Parser/handler.sjs
new file mode 100644
index 0000000..e553bf7
--- /dev/null
+++ b/components/jyf-Parser/handler.sjs
@@ -0,0 +1,62 @@
+var inlineTags = {
+	abbr: true,
+	b: true,
+	big: true,
+	code: true,
+	del: true,
+	em: true,
+	font: true,
+	i: true,
+	ins: true,
+	label: true,
+	mark: true,
+	q: true,
+	s: true,
+	small: true,
+	span: true,
+	strong: true,
+	u: true
+}
+export default {
+	getStyle: function(style, display) {
+		var res = "";
+		var reg = getRegExp("float\s*:\s*[^;]*", "i");
+		if (reg.test(style)) res += reg.exec(style)[0];
+		reg = getRegExp("margin[^;]*", "gi");
+		var margin = reg.exec(style);
+		while (margin) {
+			res += (';' + margin[0]);
+			margin = reg.exec(style);
+		}
+		reg = getRegExp("display\s*:\s*([^;]*)", "i");
+		if (reg.test(style) && reg.exec(style)[1] != "flex") res += (';' + reg.exec(style)[0]);
+		else res += (';display:' + display);
+		reg = getRegExp("flex\s*:[^;]*", "i");
+		if (reg.test(style)) res += (';' + reg.exec(style)[0]);
+		reg = getRegExp("[^;\s]*width[^;]*", "ig");
+		var width = reg.exec(style);
+		while (width) {
+			res += (';' + width[0]);
+			width = reg.exec(style);
+		}
+		return res;
+	},
+	setImgStyle: function(item, imgMode) {
+		if (imgMode == "widthFix")
+			item.attrs.style = (item.attrs.style || '') + ";height:auto !important";
+		if (getRegExp("[^-]width[^pev;]+").test(";" + item.attrs.style))
+			item.attrs.style = (item.attrs.style || '') + ";width:100%";
+		if (item.attrs.style)
+			item.attrs.style = item.attrs.style.replace(getRegExp('margin[^;]*', "gi"), "");
+		return [item];
+	},
+	setStyle: function(item) {
+		if (item.attrs.style)
+			item.attrs.style = item.attrs.style.replace(getRegExp("width[^;]*?%", "gi"), "width:100%").replace(getRegExp(
+				'margin[^;]+', "gi"), "");
+		return [item];
+	},
+	notContinue: function(item) {
+		return !(item.c || inlineTags[item.name] || item["continue"]);
+	}
+}
diff --git a/components/jyf-Parser/handler.wxs b/components/jyf-Parser/handler.wxs
new file mode 100644
index 0000000..6928302
--- /dev/null
+++ b/components/jyf-Parser/handler.wxs
@@ -0,0 +1,58 @@
+var inlineTags = {
+	abbr: true,
+	b: true,
+	big: true,
+	code: true,
+	del: true,
+	em: true,
+	font: true,
+	i: true,
+	ins: true,
+	label: true,
+	mark: true,
+	q: true,
+	s: true,
+	small: true,
+	span: true,
+	strong: true,
+	u: true
+}
+module.exports = {
+	getStyle: function(style, display) {
+		var res = "";
+		var reg = getRegExp("float[^;]+(?![\s\S]*?float)", "i");
+		if (reg.test(style)) res += reg.exec(style)[0];
+		reg = getRegExp("margin[^;]+", "gi");
+		if (reg.test(style)) res += (';' + style.match(reg).join(';'));
+		reg = getRegExp("display\s*:\s*([^;]*)(?![\s\S]*?display)", "i");
+		if (reg.test(style) && reg.exec(style)[1] != "flex") res += (';' + reg.exec(style)[0]);
+		else res += (';display:' + display);
+		reg = getRegExp("flex[^;]*:[^;]+", "ig");
+		if (reg.test(style)) res += (';' + style.match(reg).join(';'));
+		reg = getRegExp("[^;\s]*width[^;]+", "ig");
+		if (reg.test(style)) res += (';' + style.match(reg).join(';'));
+		return res;
+	},
+	setImgStyle: function(item, imgMode, imgLoad) {
+		if (imgMode == "widthFix") item.attrs.style = (item.attrs.style || '') + ";height:auto !important";
+		if (item.attrs.style)
+			item.attrs.style = item.attrs.style.replace(getRegExp("width[^;]*?%", "gi"), "width:100%").replace(
+				getRegExp(
+					'margin[^;]+', "gi"), "");
+		if (!imgLoad) {
+			delete item.attrs.src;
+			item.attrs.style += ";width:20px !important;height:20px !important";
+		}
+		return [item];
+	},
+	setStyle: function(item) {
+		if (item.attrs.style)
+			item.attrs.style = item.attrs.style.replace(getRegExp("width[^;]*?%", "gi"), "width:100%").replace(
+				getRegExp(
+					'margin[^;]+', "gi"), "");
+		return [item];
+	},
+	notContinue: function(item) {
+		return !(item.c || inlineTags[item.name] || item["continue"]);
+	}
+}
diff --git a/components/jyf-Parser/index.vue b/components/jyf-Parser/index.vue
new file mode 100644
index 0000000..997c112
--- /dev/null
+++ b/components/jyf-Parser/index.vue
@@ -0,0 +1,617 @@
+<!--
+ parser 主模块组件
+ github地址：https://github.com/jin-yufeng/Parser
+ 文档地址：https://jin-yufeng.github.io/Parser
+ 插件市场：https://ext.dcloud.net.cn/plugin?id=805
+ author：JinYufeng
+-->
+<template>
+	<view>
+		<!--#ifdef H5-->
+		<slot v-if="!html && !nodes.length"></slot>
+		<div :id="'rtf' + uid" :style="(selectable ? 'user-select:text;-webkit-user-select:text;' : '') + (showWithAnimation ? ('opacity:0;' + showAnimation) : '')"></div>
+		<!--#endif-->
+		<!--#ifndef H5-->
+		<slot v-if="!html[0].name && !html[0].type && !nodes.length"></slot>
+		<!--#endif-->
+		<!--#ifdef MP-ALIPAY-->
+		<view class="_contain" :style="(selectable ? 'user-select:text;-webkit-user-select:text;' : '') + (showWithAnimation ? ('opacity:0;' + showAnimation) : '')">
+			<trees :nodes="nodes.length ? nodes : (html[0].name || html[0].type ? html : [])" :imgMode="imgMode" />
+		</view>
+		<!--#endif-->
+		<!--#ifndef MP-ALIPAY || H5-->
+		<trees class="_contain" :style="'display:block;' + (selectable ? 'user-select:text;-webkit-user-select:text;' : '') + (showWithAnimation ? ('opacity:0;' + showAnimation) : '')"
+		 :nodes="nodes.length ? nodes : (html[0].name || html[0].type ? html : [])" :imgMode="imgMode" :loadVideo="loadVideo" />
+		<!--#endif-->
+	</view>
+</template>
+
+<script>
+	// #ifndef H5
+	import trees from "./trees"
+	var document; // document 补丁包，详见 https://jin-yufeng.github.io/Parser/#/instructions?id=document
+	const parseHtmlSync = require('./libs/MpHtmlParser.js').parseHtmlSync;
+	const cache = getApp().parserCache = {};
+	const CssHandler = require("./libs/CssHandler.js");
+	// 散列函数（计算 cache 的 key）
+	const Hash = (str) => {
+		for (var i = 0, hash = 5381, len = str.length; i < len; i++)
+			hash += (hash << 5) + str.charCodeAt(i);
+		return hash;
+	};
+	// #endif
+	// 动画
+	const showAnimation =
+		"transition:400ms ease 0ms;transition-property:transform,opacity;transform-origin:50% 50% 0;-webkit-transition:400ms ease 0ms;-webkit-transform:;-webkit-transition-property:transform,opacity;-webkit-transform-origin:50% 50% 0;opacity: 1"
+	const config = require('./libs/config.js');
+	// #ifdef MP-WEIXIN || MP-QQ || MP-BAIDU || MP-TOUTIAO
+	// 图片链接去重
+	const Deduplication = (src) => {
+		if (src.indexOf("http") != 0) return src;
+		var newSrc = '';
+		for (var i = 0; i < src.length; i++) {
+			newSrc += (Math.random() >= 0.5 ? src[i].toUpperCase() : src[i].toLowerCase());
+			if (src[i] == '/' && src[i - 1] != '/' && src[i + 1] != '/') break;
+		}
+		newSrc += src.substring(i + 1);
+		return newSrc;
+	}
+	// #endif
+	export default {
+		name: 'parser',
+		data() {
+			return {
+				// #ifdef APP-PLUS
+				loadVideo: false,
+				// #endif
+				// #ifdef H5
+				uid: this._uid,
+				showAnimation: '',
+				// #endif
+				// #ifndef H5
+				showAnimation: {},
+				controls: {},
+				// #endif
+				nodes: []
+			}
+		},
+		// #ifndef H5
+		components: {
+			trees
+		},
+		// #endif
+		props: {
+			'html': {
+				type: null,
+				default: null
+			},
+			'autocopy': {
+				type: Boolean,
+				default: true
+			},
+			// #ifndef MP-ALIPAY
+			'autopause': {
+				type: Boolean,
+				default: true
+			},
+			// #endif
+			'autopreview': {
+				type: Boolean,
+				default: true
+			},
+			'autosetTitle': {
+				type: Boolean,
+				default: true
+			},
+			'domain': {
+				type: String,
+				default: null
+			},
+			'imgMode': {
+				type: String,
+				default: 'default'
+			},
+			// #ifdef MP-WEIXIN || MP-QQ || H5 || APP-PLUS
+			'lazyLoad': {
+				type: Boolean,
+				default: false
+			},
+			// #endif
+			'selectable': {
+				type: Boolean,
+				default: false
+			},
+			'tagStyle': {
+				type: Object,
+				default: () => {
+					return {};
+				}
+			},
+			'showWithAnimation': {
+				type: Boolean,
+				default: false
+			},
+			'useAnchor': {
+				type: Boolean,
+				default: false
+			},
+			'useCache': {
+				type: Boolean,
+				default: false
+			}
+		},
+		watch: {
+			html(html) {
+				this.setContent(html, undefined, true);
+			}
+		},
+		mounted() {
+			this.imgList = [];
+			this.imgList.each = function(f) {
+				for (var i = 0; i < this.length; i++) {
+					// #ifdef MP-ALIPAY || APP-PLUS
+					this[i] = f(this[i], i, this) || this[i];
+					// #endif
+					// #ifndef MP-ALIPAY || APP-PLUS
+					var newSrc = f(this[i], i, this);
+					if (newSrc) {
+						if (this.includes(newSrc)) this[i] = Deduplication(newSrc);
+						else this[i] = newSrc;
+					}
+					// #endif
+				}
+			}
+			this.setContent(this.html, undefined, true);
+		},
+		// #ifdef H5
+		beforeDestroy() {
+			if (this._observer) this._observer.disconnect();
+		},
+		// #endif
+		methods: {
+			// #ifdef H5
+			setContent(html, options, observed) {
+				if (typeof options == "object")
+					for (var key in options) {
+						key = key.replace(/-(\w)/g, function() {
+							return arguments[1].toUpperCase();
+						})
+						this[key] = options[key];
+					}
+				html = html || '';
+				if (!html) {
+					if (this.rtf) this.rtf.parentNode.removeChild(this.rtf);
+					return;
+				}
+				if (typeof html != 'string') html = this.Dom2Str(html.nodes || html);
+				// 处理 rpx
+				if (/[0-9.]*?rpx/.test(html)) {
+					const rpx = uni.getSystemInfoSync().screenWidth / 750;
+					html = html.replace(/([0-9.]*?)rpx/g, function() {
+						return parseFloat(arguments[1]) * rpx + "px";
+					})
+				}
+				// 处理 tag-style 和 userAgentStyles
+				var style = "<style>";
+				for (var item in config.userAgentStyles)
+					style += (item + '{' + config.userAgentStyles[item] + '}');
+				for (var item in this.tagStyle)
+					style += (item + '{' + this.tagStyle[item] + '}');
+				style += "</style>";
+				html = style + html;
+				if (this.rtf) this.rtf.parentNode.removeChild(this.rtf);
+				this.rtf = document.createElement('div');
+				this.rtf.innerHTML = html;
+				for (var style of this.rtf.getElementsByTagName("style")) {
+					style.innerHTML = style.innerHTML.replace(/\s*body/g, "#rtf" + this._uid);
+					style.setAttribute("scoped", "true");
+				}
+				// 懒加载
+				if (this.lazyLoad && IntersectionObserver) {
+					if (this._observer) this._observer.disconnect();
+					this._observer = new IntersectionObserver(changes => {
+						for (var change of changes) {
+							if (change.isIntersecting) {
+								change.target.src = change.target.getAttribute("data-src");
+								change.target.removeAttribute("data-src");
+								this._observer.unobserve(change.target);
+							}
+						}
+					}, {
+						rootMargin: "1000px 0px 1000px 0px"
+					})
+				}
+				var component = this;
+				// 获取标题
+				var title = this.rtf.getElementsByTagName("title");
+				if (title.length && this.autosetTitle)
+					uni.setNavigationBarTitle({
+						title: title[0].innerText
+					})
+				// 图片处理
+				this.imgList.length = 0;
+				var imgs = this.rtf.getElementsByTagName("img");
+				for (var i = 0; i < imgs.length; i++) {
+					var img = imgs[i];
+					img.style.maxWidth = "100%";
+					img.i = i;
+					if (this.domain && img.getAttribute("src")[0] == "/") {
+						if (img.getAttribute("src")[1] == "/")
+							img.src = (this.domain.includes("://") ? this.domain.split("://")[0] : "http") + ':' + img.getAttribute("src");
+						else img.src = this.domain + img.getAttribute("src");
+					}
+					component.imgList.push(img.src);
+					if (img.parentElement.nodeName != 'A') {
+						img.onclick = function() {
+							if (!this.hasAttribute('ignore')) {
+								var preview = true;
+								this.ignore = () => preview = false;
+								component.$emit('imgtap', this);
+								if (preview && component.autopreview) {
+									uni.previewImage({
+										current: this.i,
+										urls: component.imgList
+									});
+								}
+							}
+						}
+					}
+					img.onerror = function() {
+						component.$emit('error', {
+							source: "img",
+							target: this
+						});
+					}
+					if (component.lazyLoad && this._observer) {
+						img.setAttribute("data-src", img.src);
+						img.removeAttribute("src");
+						this._observer.observe(img);
+					}
+				}
+				// 链接处理
+				var links = this.rtf.getElementsByTagName("a");
+				for (var link of links) {
+					link.onclick = function(e) {
+						var jump = true,
+							href = this.getAttribute("href");
+						component.$emit('linkpress', {
+							href,
+							ignore: () => jump = false
+						});
+						if (jump && href) {
+							if (href[0] == '#') {
+								if (component.useAnchor) {
+									component.navigateTo({
+										id: href.substring(1)
+									})
+								}
+							} else if (href.indexOf("http") == 0 || href.indexOf("//") == 0)
+								return true;
+							else {
+								uni.navigateTo({
+									url: href
+								})
+							}
+						}
+						return false;
+					}
+				}
+				// 视频处理
+				var videos = this.rtf.getElementsByTagName("video");
+				component.videoContexts = videos;
+				for (var video of videos) {
+					video.style.maxWidth = "100%";
+					video.onerror = function() {
+						component.$emit('error', {
+							source: "video",
+							target: this
+						});
+					}
+					video.onplay = function() {
+						if (component.autopause) {
+							for (var video of component.videoContexts) {
+								if (video != this)
+									video.pause();
+							}
+						}
+					}
+				}
+				// 音频处理
+				var audios = this.rtf.getElementsByTagName("audios");
+				for (var audio of audios) {
+					audio.onerror = function(e) {
+						component.$emit('error', {
+							source: "audio",
+							target: this
+						});
+					}
+				}
+				document.getElementById("rtf" + this._uid).appendChild(this.rtf);
+				if (this.showWithAnimation)
+					this.showAnimation = showAnimation;
+				if (!observed) this.nodes = [0];
+				this.$nextTick(() => {
+					this.$emit("ready", this.rtf.getBoundingClientRect());
+				})
+			},
+			Dom2Str(nodes) {
+				var str = "";
+				for (var node of nodes) {
+					if (node.type == "text")
+						str += node.text;
+					else {
+						str += ('<' + node.name);
+						for (var attr in node.attrs || {})
+							str += (' ' + attr + '="' + node.attrs[attr] + '"');
+						if (!node.children || !node.children.length) str += "/>";
+						else str += ('>' + this.Dom2Str(node.children) + "</" + node.name + '>');
+					}
+				}
+				return str;
+			},
+			getText(whiteSpace = true) {
+				if (!whiteSpace) return this.rtf.innerText.replace(/\s/g, '');
+				return this.rtf.innerText;
+			},
+			navigateTo(obj) {
+				if (!obj.id) {
+					window.scrollTo(0, this.rtf.offsetTop);
+					return obj.success ? obj.success({
+						errMsg: "pageScrollTo:ok"
+					}) : null;
+				}
+				var target = document.getElementById(obj.id);
+				if (!target) return obj.fail ? obj.fail({
+					errMsg: "Label Not Found"
+				}) : null;
+				uni.pageScrollTo({
+					scrollTop: this.rtf.offsetTop + target.offsetTop,
+					success: obj.success,
+					fail: obj.fail
+				});
+			},
+			// #endif
+			// #ifndef H5
+			setContent(html, options, observed) {
+				if (typeof options == "object")
+					for (var key in options) {
+						key = key.replace(/-(\w)/g, function() {
+							return arguments[1].toUpperCase();
+						})
+						this[key] = options[key];
+					}
+				if (this.showWithAnimation)
+					this.showAnimation = showAnimation;
+				if (!html) {
+					if (observed) return;
+					else this.nodes = [];
+				} else if (typeof html == "string") {
+					var res;
+					// 缓存读取
+					if (this.useCache) {
+						var hash = Hash(html);
+						if (cache[hash])
+							res = cache[hash];
+						else {
+							res = parseHtmlSync(html, this);
+							cache[hash] = res;
+						}
+					} else res = parseHtmlSync(html, this);
+					this.nodes = res;
+					this.$emit('parse', res);
+				} else if (html.constructor == Array) {
+					if (!observed) this.nodes = html;
+					else this.nodes = [];
+					// 非本插件产生的 array 需要进行一些转换
+					if (html.length && html[0].PoweredBy != "Parser") {
+						const Parser = {
+							_imgNum: 0,
+							_videoNum: 0,
+							_audioNum: 0,
+							_domain: this.domain,
+							_protocol: this.domain ? (this.domain.includes("://") ? this.domain.split("://")[0] : "http") : undefined,
+							_STACK: [],
+							CssHandler: new CssHandler(this.tagStyle)
+						};
+						Parser.CssHandler.getStyle('');
+						const DFS = (nodes) => {
+							for (var node of nodes) {
+								if (node.type == "text") continue;
+								node.attrs = node.attrs || {};
+								for (var item in node.attrs) {
+									if (!config.trustAttrs[item]) node.attrs[item] = undefined;
+									else if (typeof node.attrs[item] != "string") node.attrs[item] = node.attrs[item].toString();
+								}
+								config.LabelAttrsHandler(node, Parser);
+								if (config.blockTags[node.name]) node.name = 'div';
+								else if (!config.trustTags[node.name]) node.name = 'span';
+								if (node.children && node.children.length) {
+									Parser._STACK.push(node);
+									DFS(node.children);
+									Parser._STACK.pop();
+								} else node.children = undefined;
+							}
+						}
+						DFS(html);
+						this.nodes = html;
+					}
+				} else if (typeof html == 'object' && html.nodes) {
+					this.nodes = html.nodes;
+					console.warn("Parser 类型错误：object 类型已废弃，请直接将 html 设置为 object.nodes （array 类型）");
+				} else {
+					return this.$emit('error', {
+						source: "parse",
+						errMsg: "传入的nodes数组格式不正确！应该传入的类型是array，实际传入的类型是：" + typeof html.nodes
+					});
+				}
+				// #ifdef APP-PLUS
+				this.loadVideo = false;
+				// #endif
+				if (document) this.document = new document("html", this.html || html, this);
+				this.$nextTick(() => {
+					this.imgList.length = 0;
+					this.videoContexts = [];
+					const getContext = (components) => {
+						for (let component of components) {
+							if (component.$options.name == "trees") {
+								var observered = false;
+								for (var item of component.nodes) {
+									if (item.continue) continue;
+									if (item.name == 'img') {
+										if (item.attrs.src && item.attrs.i) {
+											// #ifndef MP-ALIPAY || APP-PLUS
+											if (this.imgList.indexOf(item.attrs.src) == -1)
+												this.imgList[item.attrs.i] = item.attrs.src;
+											else this.imgList[item.attrs.i] = Deduplication(item.attrs.src);
+											// #endif
+											// #ifdef MP-ALIPAY || APP-PLUS
+											this.imgList[item.attrs.i] = item.attrs.src;
+											// #endif
+										}
+										// #ifndef MP-ALIPAY
+										if (!observered) {
+											observered = true;
+											if (this.lazyLoad && uni.createIntersectionObserver) {
+												if (component._observer) component._observer.disconnect();
+												component._observer = uni.createIntersectionObserver(component);
+												component._observer.relativeToViewport({
+													top: 1000,
+													bottom: 1000
+												}).observe('.img', res => {
+													component.imgLoad = true;
+													component._observer.disconnect();
+													component._observer = null;
+												})
+											} else
+												component.imgLoad = true;
+										}
+										// #endif
+									}
+									// #ifndef MP-ALIPAY
+									else if (item.name == 'video') {
+										var context = uni.createVideoContext(item.attrs.id, component);
+										context.id = item.attrs.id;
+										this.videoContexts.push(context);
+									}
+									// #endif
+									// #ifdef MP-WEIXIN
+									else if (item.name == 'audio' && item.attrs.autoplay)
+										wx.createAudioContext(item.attrs.id, component).play();
+									// #endif
+									// 设置标题
+									else if (item.name == "title") {
+										if (item.children[0].type == "text" && item.children[0].text && this.autosetTitle)
+											uni.setNavigationBarTitle({
+												title: item.children[0].text
+											})
+									}
+									// #ifdef MP-BAIDU || MP-ALIPAY
+									if (item.attrs && item.attrs.id) {
+										this.anchors = this.anchors || [];
+										this.anchors.push({
+											id: item.attrs.id,
+											node: component
+										})
+									}
+									// #endif
+								}
+							}
+							if (component.$children.length)
+								getContext(component.$children)
+						}
+					}
+					// #ifdef MP-TOUTIAO
+					setTimeout(() => {
+						// #endif
+						getContext(this.$children)
+						uni.createSelectorQuery().in(this).select("._contain").boundingClientRect(res => {
+							this.$emit("ready", res);
+						}).exec();
+						// #ifdef MP-TOUTIAO
+					}, 200)
+					// #endif
+					// #ifdef APP-PLUS
+					setTimeout(() => {
+						this.loadVideo = true;
+					}, 3000);
+					// #endif
+				})
+			},
+			getText(whiteSpace = true) {
+				var text = "";
+				const DFS = (node) => {
+					if (node.type == "text") return text += node.text;
+					else {
+						if (whiteSpace && (((node.name == 'p' || node.name == "div" || node.name == "tr" || node.name == "li" ||
+								/h[1-6]/.test(node.name)) && text && text[text.length - 1] != '\n') || node.name == "br"))
+							text += '\n';
+						for (var child of node.children || [])
+							DFS(child);
+						if (whiteSpace && (node.name == 'p' || node.name == "div" || node.name == "tr" || node.name == "li" || /h[1-6]/.test(
+								node.name)) && text && text[text.length - 1] != '\n')
+							text += '\n';
+						else if (whiteSpace && node.name == "td") text += '\t';
+					}
+				}
+				var nodes = ((this.nodes && this.nodes.length) ? this.nodes : (this.html[0] && (this.html[0].name || this.html[0].type) ?
+					this.html : []));
+				if (!nodes.length) return "";
+				for (var node of nodes)
+					DFS(node);
+				return text;
+			},
+			navigateTo(obj) {
+				var Scroll = (selector, component) => {
+					const query = uni.createSelectorQuery().in(component ? component : this);
+					query.select(selector).boundingClientRect();
+					query.selectViewport().scrollOffset();
+					query.exec(res => {
+						if (!res || !res[0])
+							return obj.fail ? obj.fail({
+								errMsg: "Label Not Found"
+							}) : null;
+						uni.pageScrollTo({
+							scrollTop: res[1].scrollTop + res[0].top,
+							success: obj.success,
+							fail: obj.fail
+						})
+					})
+				}
+				if (!obj.id) Scroll("._contain");
+				else {
+					// #ifndef MP-BAIDU || MP-ALIPAY
+					Scroll('._contain >>> #' + obj.id + ', ._contain >>> .' + obj.id);
+					// #endif
+					// #ifdef MP-BAIDU || MP-ALIPAY
+					for (var anchor of this.anchors) {
+						if (anchor.id == obj.id) {
+							Scroll("#" + obj.id + ", ." + obj.id, anchor.node);
+						}
+					}
+					// #endif
+				}
+			},
+			// #endif
+			getVideoContext(id) {
+				if (!id) return this.videoContexts;
+				else {
+					for (var video of this.videoContexts) {
+						if (video.id == id) return video;
+					}
+				}
+				return null;
+			}
+		}
+	}
+</script>
+
+<style>
+	/* #ifndef MP-BAIDU */
+	:host {
+		display: block;
+		overflow: scroll;
+		-webkit-overflow-scrolling: touch;
+	}
+
+	/* #endif */
+</style>
diff --git a/components/jyf-Parser/libs/CssHandler.js b/components/jyf-Parser/libs/CssHandler.js
new file mode 100644
index 0000000..d9d2906
--- /dev/null
+++ b/components/jyf-Parser/libs/CssHandler.js
@@ -0,0 +1,149 @@
+/*
+ 解析和匹配 Css 的选择器
+ github地址：https://github.com/jin-yufeng/Parser
+ 文档地址：https://jin-yufeng.github.io/Parser
+ author：JinYufeng
+*/
+const userAgentStyles = require("./config.js").userAgentStyles;
+class CssHandler {
+	constructor(tagStyle = {}) {
+		this.styles = Object.assign({}, tagStyle);
+	};
+	getStyle(data) {
+		var style = '';
+		data = data.replace(/<[sS][tT][yY][lL][eE][\s\S]*?>([\s\S]*?)<\/[sS][tT][yY][lL][eE][\s\S]*?>/g, function() {
+			style += arguments[1];
+			return '';
+		})
+		this.styles = new CssParser(style, this.styles).parse();
+		return data;
+	};
+	parseCss(css) {
+		return new CssParser(css, {}, true).parse();
+	};
+	match(name, attrs) {
+		var tmp, matched = ((tmp = this.styles[name]) ? (tmp + ';') : '');
+		if (attrs.class) {
+			var classes = attrs.class.split(' ');
+			for (var i = 0; i < classes.length; i++)
+				if (tmp = this.styles['.' + classes[i]])
+					matched += (tmp + ';');
+		}
+		if (tmp = this.styles['#' + attrs.id])
+			matched += tmp;
+		return matched;
+	};
+}
+module.exports = CssHandler;
+
+function isBlankChar(c) {
+	return c == ' ' || c == '\u00A0' || c == '\t' || c == '\r' || c == '\n' || c == '\f';
+};
+class CssParser {
+	constructor(data, tagStyle, api) {
+		this.data = data;
+		this.res = tagStyle;
+		if (!api)
+			for (var item in userAgentStyles) {
+				if (tagStyle[item]) tagStyle[item] = userAgentStyles[item] + ';' + tagStyle[item];
+				else tagStyle[item] = userAgentStyles[item];
+			}
+		this._floor = 0;
+		this._i = 0;
+		this._list = [];
+		this._comma = false;
+		this._sectionStart = 0;
+		this._state = this.Space;
+	};
+	parse() {
+		for (; this._i < this.data.length; this._i++)
+			this._state(this.data[this._i]);
+		return this.res;
+	};
+	// 状态机
+	Space(c) {
+		if (c == '.' || c == '#' || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) {
+			this._sectionStart = this._i;
+			this._state = this.StyleName;
+		} else if (c == '/' && this.data[this._i + 1] == '*')
+			this.Comment();
+		else if (!isBlankChar(c) && c != ';')
+			this._state = this.Ignore;
+	};
+	Comment() {
+		this._i = this.data.indexOf("*/", this._i);
+		if (this._i == -1) this._i = this.data.length;
+		this._i++;
+		this._state = this.Space;
+	};
+	Ignore(c) {
+		if (c == '{') this._floor++;
+		else if (c == '}' && --this._floor <= 0) {
+			this._list = [];
+			this._state = this.Space;
+		}
+	};
+	StyleName(c) {
+		if (isBlankChar(c)) {
+			this._list.push(this.data.substring(this._sectionStart, this._i));
+			this._state = this.NameSpace;
+		} else if (c == '{') {
+			this._list.push(this.data.substring(this._sectionStart, this._i));
+			this._floor = 1;
+			this._sectionStart = this._i + 1;
+			this.Content();
+		} else if (c == ',') {
+			this._list.push(this.data.substring(this._sectionStart, this._i));
+			this._sectionStart = this._i + 1;
+			this._comma = true;
+		} else if (!(c >= 'a' && c <= 'z') && !(c >= 'A' && c <= 'Z') && !(c >= '0' && c <= '9') && c != '.' && c != '#' &&
+			c != '-' && c != '_')
+			this._state = this.Ignore;
+	};
+	NameSpace(c) {
+		if (c == '{') {
+			this._floor = 1;
+			this._sectionStart = this._i + 1;
+			this.Content();
+		} else if (c == ',') {
+			this._comma = true;
+			this._sectionStart = this._i + 1;
+			this._state = this.StyleName;
+		} else if (!isBlankChar(c)) {
+			if (this._comma) {
+				this._state = this.StyleName;
+				this._sectionStart = this._i;
+				this._i--;
+				this._comma = false;
+			} else this._state = this.Ignore;
+		}
+	};
+	Content() {
+		this._i = this.data.indexOf('}', this._i);
+		if (this._i == -1) this._i = this.data.length;
+		// 去除空白符
+		var flag = false,
+			pos, content = this.data.substring(this._sectionStart, this._i);
+		for (var i = 0; i < content.length; i++) {
+			if (isBlankChar(content[i])) {
+				if (!flag) {
+					pos = i;
+					flag = true;
+				}
+			} else {
+				if (flag) {
+					if (pos == 0) content = content.substring(i);
+					else if (i - pos > 1) content = content.substring(0, pos) + (content[pos - 1] == ';' ? (pos--, '') : ' ') +
+						content.substring(i);
+					i = pos;
+					flag = false;
+				}
+			}
+		}
+		if (flag) content = content.substring(0, pos);
+		for (var i = 0; i < this._list.length; i++)
+			this.res[this._list[i]] = (this.res[this._list[i]] || '') + content;
+		this._list = [];
+		this._state = this.Space;
+	}
+}
diff --git a/components/jyf-Parser/libs/MpHtmlParser.js b/components/jyf-Parser/libs/MpHtmlParser.js
new file mode 100644
index 0000000..085d87e
--- /dev/null
+++ b/components/jyf-Parser/libs/MpHtmlParser.js
@@ -0,0 +1,441 @@
+/*
+ 将 html 解析为适用于小程序 rich-text 的 DOM 结构
+ github地址：https://github.com/jin-yufeng/Parser
+ 文档地址：https://jin-yufeng.github.io/Parser
+ author：JinYufeng
+*/
+const CssHandler = require("./CssHandler.js");
+const config = require("./config.js");
+var emoji; // 需要使用 emoji 补丁包时将此行改为 const emoji = require("./emoji.js");
+
+function isBlankChar(c) {
+	return c == ' ' || c == '\u00A0' || c == '\t' || c == '\r' || c == '\n' || c == '\f';
+};
+class MpHtmlParser {
+	constructor(data, options = {}, cb) {
+		this.cb = cb;
+		this.CssHandler = new CssHandler(options.tagStyle);
+		this.data = data;
+		this.DOM = [];
+		// #ifdef MP-BAIDU || MP-TOUTIAO
+		this._imgMode = options.imgMode;
+		// #endif
+		this._attrName = '';
+		this._attrValue = '';
+		this._attrs = {};
+		this._domain = options.domain;
+		this._protocol = options.domain ? (options.domain.includes("://") ? this._domain.split("://")[0] : "http") :
+			undefined;
+		this._i = 0;
+		this._sectionStart = 0;
+		this._state = this.Text;
+		this._STACK = [];
+		this._tagName = '';
+		this._audioNum = 0;
+		this._imgNum = 0;
+		this._videoNum = 0;
+		this._useAnchor = options.useAnchor;
+		this._whiteSpace = false;
+	};
+	parse() {
+		if (this.CssHandler) this.data = this.CssHandler.getStyle(this.data);
+		if (emoji) this.data = emoji.parseEmoji(this.data);
+		// 高亮处理
+		if (config.highlight)
+			this.data = this.data.replace(/<[pP][rR][eE]([\s\S]*?)>([\s\S]*?)<\/[pP][rR][eE][\s\S]*?>/g,
+		function() {
+				return "<pre" + arguments[1] + '>' + config.highlight(arguments[2], "<pre" + arguments[1] +
+					'>') + "</pre>";
+			})
+		for (var len = this.data.length; this._i < len; this._i++)
+			this._state(this.data[this._i]);
+		if (this._state == this.Text) this.setText();
+		while (this._STACK.length)
+			this.popNode(this._STACK.pop());
+		// #ifdef MP-BAIDU || MP-TOUTIAO
+		const inlineTags = config.makeMap(
+			"abbr,b,big,code,del,em,font,i,ins,label,mark,q,s,small,span,strong,sub,sup,u")
+		// 将顶层标签的一些样式提取出来给 rich-text
+		const setContain = function(nodes) {
+			for (var element of nodes) {
+				if (element.type == "text")
+					continue;
+				if (!element.c) {
+					var res = "";
+					var style = element.attrs.style;
+					var reg = /float[^;]+(?![\s\S]*?float)/i;
+					if (reg.test(style)) res += reg.exec(style)[0];
+					reg = /margin[^;]+/gi;
+					if (reg.test(style)) res += (';' + style.match(reg).join(';'));
+					reg = /display\s*:\s*([^;]*)(?![\s\S]*?display)/i;
+					if (reg.test(style) && reg.exec(style)[1] != "flex") res += (';' + reg.exec(style)[0]);
+					else if (inlineTags[element.name]) res += ";display:inline";
+					else res += (";display:" + (element.name == 'img' ? 'inline-block' : 'block'));
+					reg = /flex[^;]*:[^;]+/gi;
+					if (reg.test(style)) res += (';' + style.match(reg).join(';'));
+					reg = /[^;\s]*width[^;]+/gi;
+					if (reg.test(style)) res += (';' + style.match(reg).join(';'));
+					element.attrs.containStyle = res;
+					if (/[^-]width[^pev;]+/.test(";" + style))
+						element.attrs.style += ";width:100%";
+					let addMargin = "";
+					if (/margin\s*:/.test(style)) addMargin = ';margin:0';
+					else if (/margin-top/.test(style)) addMargin = ';margin-top:0';
+					else if (/margin-bottom/.test(style)) addMargin = ';margin-bottom:0';
+					element.attrs.style = (element.attrs.style || '').replace(/margin[^;]*/gi, "");
+					element.attrs.style += addMargin;
+				} else setContain(element.children);
+			}
+		};
+		setContain(this.DOM);
+		// #endif
+		if (this.DOM.length) this.DOM[0].PoweredBy = "Parser";
+		// console.log(this.DOM)
+		if (this.cb)
+			this.cb(this.DOM)
+		else return this.DOM;
+	};
+	// 设置属性
+	setAttr() {
+		if (config.trustAttrs[this._attrName])
+			this._attrs[this._attrName] = (this._attrValue ? this._attrValue : (this._attrName == "src" ? "" :
+				"true"));
+		this._attrValue = '';
+		while (isBlankChar(this.data[this._i])) this._i++;
+		if (this.checkClose()) this.setNode();
+		else this._state = this.AttrName;
+	};
+	// 设置文本节点
+	setText() {
+		var text = this.getSelection();
+		if (text) {
+			if (!this._whiteSpace) {
+				// 移除空白符
+				var flag = false,
+					has = false,
+					pos;
+				for (var i = 0; i < text.length; i++) {
+					if (isBlankChar(text[i])) {
+						if (!flag) {
+							pos = i;
+							flag = true;
+						}
+					} else {
+						has = true;
+						if (flag) {
+							if (i - pos > 1) text = text.substring(0, pos) + ' ' + text.substring(i);
+							i = pos;
+							flag = false;
+						}
+					}
+				}
+				if (flag) text = text.substring(0, pos) + ' ';
+				if (!text || !has) return;
+			}
+			// 检查实体
+			// #ifdef MP-BAIDU || MP-ALIPAY || MP-TOUTIAO
+			var entities = {
+				lt: "<",
+				gt: ">",
+				amp: "&",
+				quot: '"',
+				apos: "'",
+				nbsp: "\u00A0",
+				ensp: "\u2002",
+				emsp: "\u2003",
+				ndash: "–",
+				mdash: "—",
+				middot: "·",
+				lsquo: "‘",
+				rsquo: "’",
+				ldquo: "“",
+				rdquo: "”",
+				bull: "•",
+				hellip: "…",
+				permil: "‰",
+				copy: "©",
+				reg: "®",
+				trade: "™",
+				times: "×",
+				divide: "÷",
+				cent: "￠",
+				pound: "£",
+				yen: "¥",
+				euro: "€",
+				sect: "§"
+			};
+			// #endif
+			var i = text.indexOf('&'),
+				j, decode;
+			while (i != -1 && i < text.length) {
+				j = text.indexOf(';', i);
+				if (j - i >= 2 && j - i <= 7) {
+					var entity = text.substring(i + 1, j);
+					// #ifdef MP-WEIXIN || MP-QQ || APP-PLUS
+					if (!entity.includes("sp") && !entity.includes("lt") && !entity.includes("gt")) {
+						decode = true
+						break;
+					}
+					// #endif
+					// #ifdef MP-BAIDU || MP-ALIPAY || MP-TOUTIAO
+					if (entities[entity]) text = text.substring(0, i) + entities[entity] + text.substring(j + 1);
+					// #endif
+				}
+				i = text.indexOf('&', i + 1);
+			}
+			var slibings = this._STACK.length ? this._STACK[this._STACK.length - 1].children : this.DOM;
+			if (slibings.length && slibings[slibings.length - 1].type == "text") {
+				slibings[slibings.length - 1].text += text;
+				if (decode) slibings[slibings.length - 1].decode = true;
+			} else
+				slibings.push({
+					type: "text",
+					text,
+					decode
+				})
+		}
+	};
+	// 设置元素节点
+	setNode() {
+		var slibings = this._STACK.length ? this._STACK[this._STACK.length - 1].children : this.DOM;
+		var node = {
+			name: this._tagName.toLowerCase(),
+			attrs: this._attrs
+		}
+		config.LabelAttrsHandler(node, this);
+		this._attrs = {};
+		if (this.data[this._i] == '>') {
+			if (!config.selfClosingTags[this._tagName]) {
+				if (config.ignoreTags[node.name]) {
+					var j = this._i;
+					// 处理要被移除的标签
+					while (this._i < this.data.length) {
+						this._i = this.data.indexOf("</", this._i);
+						if (this._i == -1) return this._i = this.data.length;
+						this._i += 2;
+						this._sectionStart = this._i;
+						while (!isBlankChar(this.data[this._i]) && this.data[this._i] != '>' && this.data[this
+							._i] != '/') this._i++;
+						if (this.data.substring(this._sectionStart, this._i).toLowerCase() == node.name) {
+							this._i = this.data.indexOf('>', this._i);
+							if (this._i == -1) this._i = this.data.length;
+							else this._sectionStart = this._i + 1;
+							this._state = this.Text;
+							// 处理svg 
+							if (node.name == "svg") {
+								var src = this.data.substring(j, this._i + 1);
+								if (!node.attrs.xmlns) src = " xmlns=\"http://www.w3.org/2000/svg\"" + src;
+								this._i = j;
+								while (this.data[j] != '<') j--;
+								src = this.data.substring(j, this._i) + src;
+								this._i = this._sectionStart - 1;
+								node.name = "img";
+								node.attrs = {
+									src: "data:image/svg+xml;utf8," + src.replace(/#/g, "%23"),
+									ignore: "true"
+								}
+								slibings.push(node);
+							}
+							break;
+						}
+					}
+					return;
+				} else this._STACK.push(node);
+				node.children = [];
+			}
+		} else this._i++;
+		this._sectionStart = this._i + 1;
+		this._state = this.Text;
+		if (!config.ignoreTags[node.name]) {
+			// 检查空白符是否有效
+			if (node.name == "pre" || (node.attrs.style && node.attrs.style.toLowerCase().includes("white-space") &&
+					node.attrs
+					.style.toLowerCase().includes("pre"))) {
+				this._whiteSpace = true;
+				node.pre = true;
+			}
+			slibings.push(node);
+		}
+	};
+	// 标签出栈处理
+	popNode(node) {
+		// 替换一些标签名
+		if (config.blockTags[node.name]) node.name = 'div';
+		else if (!config.trustTags[node.name]) node.name = 'span';
+		// 空白符处理
+		if (node.pre) {
+			this._whiteSpace = false;
+			node.pre = undefined;
+			for (var i = 0; i < this._STACK.length; i++)
+				if (this._STACK[i].pre)
+					this._whiteSpace = true;
+		}
+		// 处理表格的边框
+		if (node.name == 'table') {
+			if (node.attrs.border)
+				node.attrs.style = "border:" + node.attrs.border + "px solid gray;" + (node.attrs.style || '');
+			if (node.attrs.hasOwnProperty("cellspacing"))
+				node.attrs.style = "border-spacing:" + node.attrs.cellspacing + "px;" + (node.attrs.style || '');
+
+			function setBorder(elem) {
+				if (elem.name == 'th' || elem.name == 'td') {
+					if (node.attrs.border)
+						elem.attrs.style = "border:" + node.attrs.border + "px solid gray;" + (elem.attrs.style ||
+							'');
+					if (node.attrs.hasOwnProperty("cellpadding"))
+						elem.attrs.style = "padding:" + node.attrs.cellpadding + "px;" + (elem.attrs.style || '');
+					return;
+				}
+				if (elem.type == 'text') return;
+				for (var i = 0; i < elem.children.length; i++)
+					setBorder(elem.children[i]);
+			}
+			if (node.attrs.border || node.attrs.hasOwnProperty("cellpadding"))
+				for (var i = 0; i < node.children.length; i++)
+					setBorder(node.children[i]);
+		}
+		// 合并一些不必要的层，减小节点深度
+		if (node.children.length == 1 && node.name == "div" && node.children[0].name == "div") {
+			var child = node.children[0];
+			node.attrs.style = node.attrs.style || '';
+			child.attrs.style = child.attrs.style || '';
+			if (node.attrs.style.includes("padding") && (node.attrs.style.includes("margin") || child.attrs.style
+					.includes(
+						"margin")) && node.attrs.style.includes("display") && child.attrs.style.includes(
+				"display") && !(node.attrs.id &&
+					node.attrs.id) && !(node.attrs.class && child.attrs.class)) {
+				if (child.attrs.style.includes("padding"))
+					child.attrs.style = "box-sizing:border-box;" + child.attrs.style;
+				node.attrs.style = node.attrs.style + ";" + child.attrs.style;
+				node.attrs.id = (child.attrs.id || '') + (node.attrs.id || '');
+				node.attrs.class = (child.attrs.class || '') + (node.attrs.class || '');
+				node.children = child.children;
+			}
+		}
+		// 多层样式处理
+		if (this.CssHandler.pop)
+			this.CssHandler.pop(node);
+	};
+	// 工具函数
+	checkClose() {
+		if (this.data[this._i] == '>' || (this.data[this._i] == '/' && this.data[this._i + 1] == '>'))
+			return true;
+		return false;
+	};
+	getSelection(trim) {
+		var str = (this._sectionStart == this._i ? '' : this.data.substring(this._sectionStart, this._i));
+		while (trim && isBlankChar(this.data[++this._i]));
+		if (trim) this._i--;
+		this._sectionStart = this._i + 1;
+		return str;
+	};
+	// 状态机
+	Text(c) {
+		if (c == '<') {
+			var next = this.data[this._i + 1];
+			if ((next >= 'a' && next <= 'z') || (next >= 'A' && next <= 'Z')) {
+				this.setText();
+				this._state = this.TagName;
+			} else if (next == '/') {
+				this.setText();
+				this._i++;
+				next = this.data[this._i + 1];
+				if ((next >= 'a' && next <= 'z') || (next >= 'A' && next <= 'Z')) {
+					this._sectionStart = this._i + 1;
+					this._state = this.EndTag;
+				} else
+					this._state = this.Comment;
+			} else if (next == '!') {
+				this.setText();
+				this._state = this.Comment;
+			}
+		}
+	};
+	Comment() {
+		if (this.data.substring(this._i + 1, this._i + 3) == "--" || this.data.substring(this._i + 1, this._i +
+			7) ==
+			"[CDATA[") {
+			this._i = this.data.indexOf("-->", this._i + 1);
+			if (this._i == -1) return this._i = this.data.length;
+			else this._i = this._i + 2;
+		} else {
+			this._i = this.data.indexOf(">", this._i + 1);
+			if (this._i == -1) return this._i = this.data.length;
+		}
+		this._sectionStart = this._i + 1;
+		this._state = this.Text;
+	};
+	TagName(c) {
+		if (isBlankChar(c)) {
+			this._tagName = this.getSelection(true);
+			if (this.checkClose()) this.setNode();
+			else this._state = this.AttrName;
+		} else if (this.checkClose()) {
+			this._tagName = this.getSelection();
+			this.setNode();
+		}
+	};
+	AttrName(c) {
+		if (isBlankChar(c)) {
+			this._attrName = this.getSelection(true).toLowerCase();
+			if (this.data[this._i] == '=') {
+				while (isBlankChar(this.data[++this._i]));
+				this._sectionStart = this._i;
+				this._i--;
+				this._state = this.AttrValue;
+			} else this.setAttr();
+		} else if (c == '=') {
+			this._attrName = this.getSelection().toLowerCase();
+			while (isBlankChar(this.data[++this._i]));
+			this._sectionStart = this._i;
+			this._i--;
+			this._state = this.AttrValue;
+		} else if (this.checkClose()) {
+			this._attrName = this.getSelection().toLowerCase();
+			this.setAttr();
+		}
+	};
+	AttrValue(c) {
+		if (c == '"' || c == "'") {
+			this._sectionStart++;
+			if ((this._i = this.data.indexOf(c, this._i + 1)) == -1) return this._i = this.data.length;
+		} else
+			for (; !isBlankChar(this.data[this._i] && this.data[this._i] != '/' && this.data[this._i] != '>'); this
+				._i++);
+		this._attrValue = this.getSelection();
+		while (this._attrValue.includes("&quot;")) this._attrValue = this._attrValue.replace("&quot;", '');
+		this.setAttr();
+	};
+	EndTag(c) {
+		if (isBlankChar(c) || c == '>' || c == '/') {
+			var name = this.getSelection().toLowerCase();
+			var flag = false;
+			for (var i = this._STACK.length - 1; i >= 0; i--)
+				if (this._STACK[i].name == name) {
+					flag = true;
+					break;
+				}
+			if (flag) {
+				var node;
+				while (flag) {
+					node = this._STACK.pop();
+					if (node.name == name) flag = false;
+					this.popNode(node);
+				}
+			} else if (name == 'p' || name == "br") {
+				var slibings = this._STACK.length ? this._STACK[this._STACK.length - 1].children : this.DOM;
+				var node = {
+					name
+				}
+				slibings.push(node);
+			}
+			this._i = this.data.indexOf('>', this._i);
+			if (this._i == -1) this._i = this.data.length;
+			else this._state = this.Text;
+		}
+	};
+};
+module.exports = {
+	parseHtml: (data, options) => new Promise((resolve) => new MpHtmlParser(data, options, resolve).parse()),
+	parseHtmlSync: (data, options) => new MpHtmlParser(data, options).parse()
+};
diff --git a/components/jyf-Parser/libs/config.js b/components/jyf-Parser/libs/config.js
new file mode 100644
index 0000000..e2f37f5
--- /dev/null
+++ b/components/jyf-Parser/libs/config.js
@@ -0,0 +1,252 @@
+/* 配置文件 */
+function makeMap(str) {
+	var map = Object.create(null),
+		list = str.split(',');
+	for (var item of list)
+		map[item] = true;
+	return map;
+}
+// 信任的属性列表，不在列表中的属性将被移除 
+const trustAttrs = makeMap(
+	"align,alt,app-id,appId,"
+	// #ifdef MP-BAIDU
+	+
+	"appid,apid,"
+	// #endif
+	+
+	"author,autoplay,border,cellpadding,cellspacing,class,color,colspan,controls,data-src,dir,face,height,href,id,ignore,loop,muted,name,path,poster,rowspan,size,span,src,start,style,type,lbType,lbtype,"
+	// #ifdef MP-WEIXIN || MP-QQ
+	+
+	"unit-id,unitId,"
+	// #endif
+	+
+	"width,xmlns"
+);
+// 信任的标签，将保持标签名不变 
+const trustTags = makeMap(
+	"a,abbr,ad,audio,b,blockquote,br,code,col,colgroup,dd,del,dl,dt,div,em,fieldset,h1,h2,h3,h4,h5,h6,hr,i,img,ins,label,legend,li,ol,p,q,source,span,strong,sub,sup,table,tbody,td,tfoot,th,thead,tr,title,u,ul,video,iframe"
+);
+// 块级标签，将被转为 div
+const blockTags = makeMap("address,article,aside,body,center,cite,footer,header,html,nav,pre,section");
+// 被移除的标签（其中 svg 系列标签会被转为图片） 
+const ignoreTags = makeMap(
+	"area,base,basefont,canvas,circle,command,ellipse,embed,frame,head,input,isindex,keygen,line,link,map,meta,param,path,polygon,rect,script,source,svg,textarea,track,use,wbr,"
+);
+// 只能用 rich-text 显示的标签（其中图片不能预览、不能显示视频、音频等） 
+const richOnlyTags = makeMap(
+	"a,ad,audio,colgroup,fieldset,legend,li,ol,sub,sup,table,tbody,td,tfoot,th,thead,tr,ul,video,iframe,");
+// 自闭合标签
+const selfClosingTags = makeMap(
+	"area,base,basefont,br,col,circle,ellipse,embed,frame,hr,img,input,isindex,keygen,line,link,meta,param,path,polygon,rect,source,track,use,wbr,"
+);
+// 默认的标签样式
+var userAgentStyles = {
+	a: "color:#366092;word-break:break-all;padding:1.5px 0 1.5px 0",
+	address: "font-style:italic",
+	blockquote: "background-color:#f6f6f6;border-left:3px solid #dbdbdb;color:#6c6c6c;padding:5px 0 5px 10px",
+	center: "text-align:center",
+	cite: "font-style:italic",
+	code: "padding:0 1px 0 1px;margin-left:2px;margin-right:2px;background-color:#f8f8f8;border-radius:3px",
+	dd: "margin-left:40px",
+	img: "max-width:100%",
+	mark: "background-color:yellow",
+	pre: "font-family:monospace;white-space:pre;overflow:scroll",
+	s: "text-decoration:line-through",
+	u: "text-decoration:underline"
+};
+// #ifndef MP-ALIPAY || H5
+const SDKVersion = uni.getSystemInfoSync().SDKVersion;
+
+function versionHigherThan(version = '') {
+	var v1 = SDKVersion.split('.'),
+		v2 = version.split('.');
+	while (v1.length != v2.length)
+		v1.length < v2.length ? v1.push('0') : v2.push('0');
+	for (var i = 0; i < v1.length; i++) {
+		if (v1[i] == v2[i]) continue;
+		if (parseInt(v1[i]) > parseInt(v2[i])) return true;
+		return false;
+	}
+	return true;
+};
+// #endif
+// #ifdef MP-WEIXIN || MP-QQ
+// 版本兼容
+if (versionHigherThan("2.7.1")) {
+	trustTags.bdi = true;
+	trustTags.bdo = true;
+	trustTags.caption = true;
+	trustTags.rt = true;
+	trustTags.ruby = true;
+	ignoreTags.rp = true;
+	trustTags.big = true;
+	trustTags.small = true;
+	trustTags.pre = true;
+	trustTags.iframe = true;
+	richOnlyTags.bdi = true;
+	richOnlyTags.bdo = true;
+	richOnlyTags.caption = true;
+	richOnlyTags.rt = true;
+	richOnlyTags.ruby = true;
+	richOnlyTags.pre = true;
+	blockTags.pre = undefined;
+} else {
+	blockTags.caption = true;
+	userAgentStyles.big = "display:inline;font-size:1.2em";
+	userAgentStyles.small = "display:inline;font-size:0.8em";
+}
+// #endif
+function bubbling(Parser) {
+	for (var i = Parser._STACK.length - 1; i >= 0; i--) {
+		if (!richOnlyTags[Parser._STACK[i].name])
+			Parser._STACK[i].c = 1;
+		else return false;
+	}
+	return true;
+}
+module.exports = {
+	// 高亮处理函数
+	highlight: null,
+	// 处理标签的属性，需要通过组件递归方式显示的标签需要调用 bubbling(Parser)
+	LabelAttrsHandler(node, Parser) {
+		let default_style = "max-width: 100% !important;display:block;"
+		node.attrs.style = Parser.CssHandler.match(node.name, node.attrs, node) + (node.attrs.style || '');
+		switch (node.name) {
+			case "ul":
+			case "ol":
+			case "li":
+			case "dd":
+			case "dl":
+			case "dt":
+			case "div":
+			case "span":
+			case "em":
+			case 'p':
+				if (node.name === 'span') {
+					default_style = 'white-space:normal;'
+				}
+				if (node.name === 'p' && (!node.attrs.style || !node.attrs.style.includes('margin-top:'))) {
+					default_style += 'margin-top:10px;'
+				}
+				if (node.attrs.style) {
+					node.attrs.style = node.attrs.style.includes('width:') ? default_style : node.attrs.style +
+						`;${default_style}`
+				}
+				if (node.attrs.align) {
+					node.attrs.style = "text-align:" + node.attrs.align + ';' + node.attrs.style;
+					node.attrs.align = undefined;
+				}
+				break;
+			case "img":
+				if (node.attrs.height) {
+					node.attrs.height = 'auto'
+				}
+				if (node.attrs.style) {
+					node.attrs.style = node.attrs.style.includes('height:') ? default_style : node.attrs.style +
+						`;${default_style}`
+				}
+				if (node.attrs["data-src"]) {
+					node.attrs.src = node.attrs.src || node.attrs["data-src"];
+					node.attrs["data-src"] = undefined;
+				}
+				// #ifdef MP-BAIDU || MP-TOUTIAO
+				if (Parser._imgMode == "widthFix") node.attrs.style = node.attrs.style + ";height:auto !important;";
+				// #endif
+				if (node.attrs.src) {
+					if (!node.attrs.ignore) {
+						if (bubbling(Parser)) node.attrs.i = (Parser._imgNum++).toString();
+						else node.attrs.ignore = "true";
+					}
+					if (Parser._domain && node.attrs.src[0] == '/') {
+						if (node.attrs.src[1] == '/') node.attrs.src = Parser._protocol + ":" + node.attrs.src;
+						else node.attrs.src = Parser._domain + node.attrs.src;
+					}
+				}
+				break;
+			case 'a':
+			case "ad":
+				bubbling(Parser);
+				break;
+			case "font":
+				if (node.attrs.color) {
+					node.attrs.style = "color:" + node.attrs.color + ';' + node.attrs.style;
+					node.attrs.color = undefined;
+				}
+				if (node.attrs.face) {
+					node.attrs.style = "font-family:" + node.attrs.face + ';' + node.attrs.style;
+					node.attrs.face = undefined;
+				}
+				if (node.attrs.size) {
+					var size = parseInt(node.attrs.size);
+					if (size < 1) size = 1;
+					else if (size > 7) size = 7;
+					var map = ["xx-small", "x-small", "small", "medium", "large", "x-large", "xx-large"];
+					node.attrs.style = "font-size:" + map[size - 1] + ';' + node.attrs.style;
+					node.attrs.size = undefined;
+				}
+				break;
+			case 'iframe':
+			case "video":
+			case "audio":
+				node.attrs.loop = node.attrs.hasOwnProperty('loop') || false;
+				node.attrs.controls = node.attrs.hasOwnProperty(
+					'controls') || true;
+				node.attrs.autoplay = node.attrs.hasOwnProperty('autoplay') || false;
+				if (node.attrs.id) Parser['_' + node.name + "Num"]++;
+				else node.attrs.id = (node.name + (++Parser['_' + node.name + "Num"]));
+				if (node.name == "video") {
+					node.attrs.style = node.attrs.style || '';
+					if (node.attrs.width) {
+						node.attrs.style = "width:" + parseFloat(node.attrs.width) + (node.attrs.height.includes(
+								'%') ? '%' : "px") +
+							';' + node.attrs.style;
+						node.attrs.width = undefined;
+					}
+					if (node.attrs.height) {
+						node.attrs.style = "height:" + parseFloat(node.attrs.height) + (node.attrs.height.includes(
+								'%') ? '%' : "px") +
+							';' + node.attrs.style;
+						node.attrs.height = undefined;
+					}
+					if (Parser._videoNum > 3) node.lazyLoad = true;
+				}
+				// 新增iframe【create_by_xx】 
+				if (node.name == 'iframe') {
+					// console.log(node.attrs, "====iframe attrs");
+				}
+				node.attrs.source = [];
+				if (node.attrs.src) node.attrs.source.push(node.attrs.src);
+				if (!node.attrs.controls && !node.attrs.autoplay)
+					console.warn("存在没有controls属性的 " + node.name + " 标签，可能导致无法播放", node);
+				bubbling(Parser);
+				break;
+			case "source":
+				var parent = Parser._STACK[Parser._STACK.length - 1];
+				if (parent && (parent.name == "video" || parent.name == "audio")) {
+					parent.attrs.source.push(node.attrs.src);
+					if (!parent.attrs.src) parent.attrs.src = node.attrs.src;
+				}
+				break;
+		}
+		if (Parser._domain && node.attrs.style.includes("url"))
+			node.attrs.style = node.attrs.style.replace(/url\s*\(['"\s]*(\S*?)['"\s]*\)/, function() {
+				var src = arguments[1];
+				if (src && src[0] == '/') {
+					if (src[1] == '/') return "url(" + Parser._protocol + ':' + src + ')';
+					else return "url(" + Parser._domain + src + ')';
+				} else return arguments[0];
+			})
+		if (!node.attrs.style) node.attrs.style = undefined;
+		if (Parser._useAnchor && node.attrs.id) bubbling(Parser);
+	},
+	trustAttrs,
+	trustTags,
+	blockTags,
+	ignoreTags,
+	selfClosingTags,
+	userAgentStyles,
+	// #ifndef MP-ALIPAY || H5
+	versionHigherThan,
+	// #endif
+	makeMap
+}
\ No newline at end of file
diff --git a/components/jyf-Parser/trees.vue b/components/jyf-Parser/trees.vue
new file mode 100644
index 0000000..f17789a
--- /dev/null
+++ b/components/jyf-Parser/trees.vue
@@ -0,0 +1,407 @@
+<!--
+ trees 递归显示组件
+ github地址：https://github.com/jin-yufeng/Parser
+ 文档地址：https://jin-yufeng.github.io/Parser
+ 插件市场：https://ext.dcloud.net.cn/plugin?id=805
+ author：JinYufeng
+-->
+<template>
+	<view style="display: inherit; white-space: inherit;word-break:normal">
+		<block v-for="(item, index) in nodes" v-bind:key="index">
+			<!-- {{item.name}} {{item}} -->
+			<!--#ifdef MP-WEIXIN || MP-QQ || MP-ALIPAY || APP-PLUS-->
+			<block v-if="handler.notContinue(item)">
+				<!--#endif-->
+				<!--#ifdef MP-BAIDU || MP-TOUTIAO-->
+				<block v-if="!item.c">
+					<!--#endif-->
+					<!--图片-->
+					<!--#ifdef MP-WEIXIN || MP-QQ || MP-ALIPAY || APP-PLUS-->
+					<rich-text v-if="item.name=='img'" :id="item.attrs.id" class="img"
+						:style="'text-indent:0;'+handler.getStyle(item.attrs.style, 'inline-block')"
+						:nodes='handler.setImgStyle(item, imgMode, imgLoad)' :data-attrs="item.attrs"
+						@tap='previewEvent' />
+					<!--#endif-->
+					<!--#ifdef MP-BAIDU || MP-TOUTIAO-->
+					<rich-text v-if="item.name=='img'" :id="item.attrs.id"
+						:style="'text-indent:0;'+item.attrs.containStyle" :nodes='[item]' :data-attrs="item.attrs"
+						@tap='previewEvent' />
+					<!--#endif-->
+					<!--文本-->
+					<!--#ifdef MP-WEIXIN || MP-QQ || APP-PLUS-->
+					<block v-else-if="item.type=='text'">
+						<text v-if="!item.decode" decode>{{item.text}}</text>
+						<rich-text v-else style="display:inline-block;word-break:normal" :nodes="[item]"></rich-text>
+					</block>
+					<!--#endif-->
+					<!--#ifdef MP-ALIPAY-->
+					<text v-else-if="item.type=='text'" decode>{{item.text}}</text>
+					<!--#endif-->
+					<text v-else-if="item.name=='br'">\n</text>
+					<!--视频-->
+					<block v-else-if="item.name=='video'">
+						<!--#ifdef APP-PLUS-->
+						<view v-if="(!loadVideo||item.lazyLoad)&&!controls[item.attrs.id].play" :id="item.attrs.id"
+							:class="'_video '+(item.attrs.class||'')" :style="item.attrs.style||''" @tap="_loadVideo" />
+						<!--#endif-->
+						<!--#ifndef APP-PLUS-->
+						<view v-if="item.lazyLoad&&!controls[item.attrs.id].play" :id="item.attrs.id"
+							:class="'_video '+(item.attrs.class||'')" :style="item.attrs.style||''" @tap="_loadVideo" />
+						<!--#endif-->
+						<video v-else
+							:src="controls[item.attrs.id]?item.attrs.source[controls[item.attrs.id].index] : item.attrs.src"
+							:id="item.attrs.id" :loop="item.attrs.loop" :controls="item.attrs.controls"
+							:autoplay="item.attrs.autoplay||(controls[item.attrs.id]&&controls[item.attrs.id].play)"
+							:unit-id="item.attrs['unit-id']" :class="item.attrs.class" :muted="item.attrs.muted"
+							:style="item.attrs.style||''" :data-source="item.attrs.source" @play="playEvent"
+							@error="videoError" />
+					</block>
+					<!-- iframe 【create_by_xx】-->
+					<block v-else-if="item.name=='iframe'">
+						<!-- #ifdef MP-WEIXIN -->
+						<!-- 腾讯视频 -->
+						<txv-video :vid="item.attrs.src" :playerid="item.attrs.src" width="100%" height="100%"
+							:controls="true" :autoplay="false" :isHiddenStop="true"
+							v-if="item.attrs.lbType=='vid' || item.attrs.lbtype=='vid'">
+						</txv-video>
+						<!-- #endif -->
+					</block>
+					<!--音频-->
+					<audio v-else-if="item.name=='audio'"
+						:src="controls[item.attrs.id]?item.attrs.source[controls[item.attrs.id].index] : item.attrs.src"
+						:id="item.attrs.id" :loop="item.attrs.loop" :controls="item.attrs.controls"
+						:poster="item.attrs.poster" :name="item.attrs.name" :author="item.attrs.author"
+						:class="item.attrs.class" :style="item.attrs.style||''" :data-source="item.attrs.source"
+						@error="audioError" />
+					<!--链接-->
+					<view v-else-if="item.name=='a'" :class="'_a '+(item.attrs.class||'')" :style="item.attrs.style||''"
+						:data-attrs="item.attrs" hover-class="navigator-hover" :hover-start-time="25"
+						:hover-stay-time="300" @tap="tapEvent">
+						<trees :nodes="item.children" :imgMode="imgMode" />
+					</view>
+					<!--广告-->
+					<!--#ifdef MP-WEIXIN || MP-QQ-->
+					<ad v-else-if="item.name=='ad'" :unit-id="item.attrs['unit-id']" :class="item.attrs.class||''"
+						:style="item.attrs.style||''" @error="adError"></ad>
+					<!--#endif-->
+					<!--#ifdef MP-BAIDU-->
+					<ad v-else-if="item.name=='ad'" :appid="item.attrs.appid" :apid="item.attrs.apid"
+						:type="item.attrs.type" :class="item.attrs.class||''" :style="item.attrs.style"
+						@error="adError"></ad>
+					<!--#endif-->
+					<!--富文本-->
+					<!--#ifdef MP-WEIXIN || MP-QQ || MP-ALIPAY || APP-PLUS-->
+					<rich-text v-else :id="item.attrs.id" :class="'__'+item.name"
+						:style="'word-break:normal;'+handler.getStyle(item.attrs.style, 'block')" :nodes="handler.setStyle(item)" />
+					<!--#endif-->
+					<!--#ifdef MP-BAIDU || MP-TOUTIAO-->
+					<rich-text v-else :id="item.attrs.id" :style="item.attrs?item.attrs.containStyle:''"
+						:nodes="[item]" />
+					<!--#endif-->
+				</block>
+				<!--#ifdef MP-ALIPAY-->
+				<view v-else :id="item.attrs.id" :class="'_'+item.name+' '+(item.attrs.class||'')"
+					:style="item.attrs.style||''">
+					<trees :nodes="item.children" :imgMode="imgMode" />
+				</view>
+				<!--#endif-->
+				<!--#ifndef MP-ALIPAY-->
+				<trees v-else :class="item.attrs.id+' _'+item.name+' '+(item.attrs.class||'')"
+					:style="item.attrs.style||''" :nodes="item.children" :imgMode="imgMode" :loadVideo="loadVideo" />
+				<!--#endif-->
+			</block>
+	</view>
+</template>
+<script module="handler" lang="wxs" src="./handler.wxs"></script>
+<script module="handler" lang="sjs" src="./handler.sjs"></script>
+<script>
+	import trees from "./trees"
+	export default {
+		components: {
+			trees
+		},
+		name: 'trees',
+		data() {
+			return {
+				controls: {},
+				// #ifdef MP-WEIXIN || MP-QQ || APP-PLUS
+				imgLoad: true
+				// #endif
+			}
+		},
+		props: {
+			nodes: {
+				type: Array,
+				default: []
+			},
+			// #ifdef APP-PLUS
+			loadVideo: {
+				type: Boolean,
+				default: false
+			},
+			// #endif
+			imgMode: {
+				type: String,
+				default: "default"
+			}
+		},
+		mounted() {
+			// 获取顶层组件
+			this._top = this.$parent;
+			while (this._top.$options.name != 'parser') {
+				if (this._top._top) {
+					this._top = this._top._top;
+					break;
+				}
+				this._top = this._top.$parent;
+			}
+		},
+		// #ifdef MP-WEIXIN || MP-QQ || APP-PLUS
+		beforeDestroy() {
+			if (this._observer)
+				this._observer.disconnect();
+		},
+		// #endif
+		methods: {
+			// #ifndef MP-ALIPAY
+			playEvent(e) {
+				if ((this._top.videoContexts || []).length > 1 && this._top.autopause) {
+					for (var video of this._top.videoContexts) {
+						if (video.id == e.currentTarget.id) continue;
+						video.pause();
+					}
+				}
+			},
+			// #endif
+			previewEvent(e) {
+				var attrs = e.currentTarget.dataset.attrs;
+				if (!attrs.ignore) {
+					var preview = true;
+					this._top.$emit('imgtap', {
+						id: e.currentTarget.id,
+						src: attrs.src,
+						ignore: () => preview = false
+					})
+					if (preview && this._top.autopreview) {
+						var urls = this._top.imgList || [],
+							current = urls[attrs.i] ? attrs.i : (urls = [attrs.src], 0);
+						uni.previewImage({
+							current,
+							urls
+						})
+					}
+				}
+			},
+			tapEvent(e) {
+				var jump = true,
+					attrs = e.currentTarget.dataset.attrs;
+				attrs.ignore = () => jump = false;
+				this._top.$emit('linkpress', attrs);
+				if (jump) {
+					// #ifdef MP
+					if (attrs['app-id'] || attrs.appId) {
+						return uni.navigateToMiniProgram({
+							appId: attrs['app-id'] || attrs.appId,
+							path: attrs.path || ''
+						})
+					}
+					// #endif
+					if (attrs.href) {
+						if (attrs.href[0] == "#") {
+							if (this._top.useAnchor)
+								this._top.navigateTo({
+									id: attrs.href.substring(1)
+								})
+						} else if (attrs.href.indexOf("http") == 0 || attrs.href.indexOf("//") == 0) {
+							if (this._top.autocopy) {
+								uni.setClipboardData({
+									data: attrs.href,
+									success() {
+										uni.showToast({
+											title: '链接已复制'
+										});
+									}
+								});
+							}
+						} else
+							uni.navigateTo({
+								url: attrs.href
+							})
+					}
+				}
+			},
+			triggerError(source, target, errMsg, errCode, context) {
+				this._top.$emit('error', {
+					source,
+					target,
+					errMsg,
+					errCode,
+					context
+				});
+			},
+			loadSource(target) {
+				// console.log(target)
+				var index = (this.controls[target.id] ? this.controls[target.id].index : 0) + 1;
+				if (index < target.dataset.source.length) {
+					this.$set(this.controls[target.id], "index", index);
+					return true;
+				}
+				return false;
+			},
+			adError(e) {
+				this.triggerError("ad", e.currentTarget, "", e.detail.errorCode);
+			},
+			videoError(e) {
+				if (!this.loadSource(e.currentTarget) && this._top)
+					this.triggerError("video", e.currentTarget, e.detail.errMsg, undefined, uni.createVideoContext(e
+						.currentTarget.id,
+						this));
+			},
+			audioError(e) {
+				if (!this.loadSource(e.currentTarget))
+					this.triggerError("audio", e.currentTarget, e.detail.errMsg);
+			},
+			_loadVideo(e) {
+				this.$set(this.controls, e.currentTarget.id, {
+					play: true,
+					index: 0
+				})
+			}
+		}
+	}
+</script>
+
+<style>
+	/* 可以在这里引入自定义的外部样式 */
+
+	/* 链接受到点击的hover-class，可自定义修改 */
+	.navigator-hover {
+		opacity: 0.7;
+		text-decoration: underline;
+	}
+
+	/* 以下内容不建议修改 */
+	/* #ifndef MP-BAIDU */
+	:host {
+		display: inherit;
+		float: inherit;
+	}
+
+	/* #endif */
+
+	._b,
+	._strong {
+		font-weight: bold;
+	}
+
+	._big {
+		font-size: 1.2em;
+	}
+
+	._small {
+		font-size: 0.8em;
+	}
+
+	._blockquote,
+	._div,
+	._p {
+		display: block;
+	}
+
+	._code {
+		font-family: monospace;
+	}
+
+	._del {
+		text-decoration: line-through;
+	}
+
+	._em,
+	._i {
+		font-style: italic;
+	}
+
+	._h1 {
+		font-size: 2em;
+	}
+
+	._h2 {
+		font-size: 1.5em;
+	}
+
+	._h3 {
+		font-size: 1.17em;
+	}
+
+	._h5 {
+		font-size: 0.67em;
+	}
+
+	._h1,
+	._h2,
+	._h3,
+	._h4,
+	._h5,
+	._h6 {
+		font-weight: bold;
+	}
+
+	._ins {
+		text-decoration: underline;
+	}
+
+	._q::before {
+		content: '"';
+	}
+
+	._q::after {
+		content: '"';
+	}
+
+	._a,
+	._abbr,
+	._b,
+	._big,
+	._small,
+	._code,
+	._del,
+	._em,
+	._i,
+	._ins,
+	._label,
+	._q,
+	._span,
+	._strong {
+		display: inline;
+	}
+
+	/* #ifdef MP-WEIXIN || MP-QQ || MP-ALIPAY */
+	.__sub,
+	.__sup,
+	.__bdo,
+	.__bdi,
+	.__ruby,
+	.__rt {
+		display: inline-block !important;
+	}
+
+	/* #endif */
+	._video {
+		background-color: black;
+		width: 300px;
+		height: 225px;
+		display: inline-block;
+		position: relative;
+	}
+
+	._video::after {
+		content: '';
+		border-width: 15px 0 15px 30px;
+		border-style: solid;
+		border-color: transparent transparent transparent white;
+		position: absolute;
+		left: 50%;
+		top: 50%;
+		margin: -15px 0 0 -15px;
+	}
+</style>
diff --git a/components/load-more.vue b/components/load-more.vue
new file mode 100644
index 0000000..70480b8
--- /dev/null
+++ b/components/load-more.vue
@@ -0,0 +1,131 @@
+<template>
+	<view class='load-more'>
+		<block v-if="!loading&&noMore">
+			<view class="loadmore__line"></view>
+			<text class="loadmore__text">{{noMoreText}}</text>
+			<view class="loadmore__line"></view>
+		</block>
+		<block v-if="loading">
+			<view class="weui-loading"></view>
+			<text class="loadmore__text">{{loadText}}</text>
+		</block>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'load-more',
+		props: {
+			loadText: {
+				type: String,
+				default () {
+					return '努力加载中'
+				}
+			},
+			noMoreText: {
+				type: String,
+				default () {
+					return '没有更多了'
+				}
+			},
+			noMore: {
+				type: Boolean,
+				default () {
+					return false
+				}
+			},
+			loading: {
+				type: Boolean,
+				default () {
+					return true
+				}
+			}
+		},
+		created() {
+
+		},
+		data() {
+			return {
+				
+			}
+		},
+		methods: {
+			
+		},
+	}
+</script>
+
+<style>
+	.load-more {
+		display: flex;
+		width: 100%;
+		height: 90rpx;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.loading-icon {
+		width: 30rpx;
+		height: 30rpx;
+		margin-right: 8rpx;
+		display: inline-block;
+		vertical-align: middle;
+		animation: weuiLoading 1s steps(12, end) infinite;
+		background: url('https://s10.mogucdn.com/mlcdn/c45406/171016_4a61e09hcadd157gadhdeje55e82c_32x32.png') no-repeat;
+		-webkit-background-size: 100%;
+		background-size: 100%;
+	}
+
+	.loadmore__text {
+		margin: 0 8rpx 0 8rpx;
+		color: #999;
+		font-size: 28rpx;
+	}
+
+	.loadmore__line {
+		width: 100rpx;
+		height: 1rpx;
+		border-top: 1rpx solid #d2d2d2;
+	}
+
+	/* 加载中动画 */
+	.weui-loading {
+		margin: 0 5px;
+		width: 20px;
+		height: 20px;
+		display: inline-block;
+		vertical-align: middle;
+		-webkit-animation: a 1s steps(12) infinite;
+		animation: a 1s steps(12) infinite;
+		background: transparent url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMjAiIGhlaWdodD0iMTIwIiB2aWV3Qm94PSIwIDAgMTAwIDEwMCI+PHBhdGggZmlsbD0ibm9uZSIgZD0iTTAgMGgxMDB2MTAwSDB6Ii8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTlFOUU5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTMwKSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iIzk4OTY5NyIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgzMCAxMDUuOTggNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjOUI5OTlBIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDYwIDc1Ljk4IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0EzQTFBMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSg5MCA2NSA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNBQkE5QUEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoMTIwIDU4LjY2IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0IyQjJCMiIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgxNTAgNTQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjQkFCOEI5IiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKDE4MCA1MCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDMkMwQzEiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTE1MCA0NS45OCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNDQkNCQ0IiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTEyMCA0MS4zNCA2NSkiLz48cmVjdCB3aWR0aD0iNyIgaGVpZ2h0PSIyMCIgeD0iNDYuNSIgeT0iNDAiIGZpbGw9IiNEMkQyRDIiIHJ4PSI1IiByeT0iNSIgdHJhbnNmb3JtPSJyb3RhdGUoLTkwIDM1IDY1KSIvPjxyZWN0IHdpZHRoPSI3IiBoZWlnaHQ9IjIwIiB4PSI0Ni41IiB5PSI0MCIgZmlsbD0iI0RBREFEQSIgcng9IjUiIHJ5PSI1IiB0cmFuc2Zvcm09InJvdGF0ZSgtNjAgMjQuMDIgNjUpIi8+PHJlY3Qgd2lkdGg9IjciIGhlaWdodD0iMjAiIHg9IjQ2LjUiIHk9IjQwIiBmaWxsPSIjRTJFMkUyIiByeD0iNSIgcnk9IjUiIHRyYW5zZm9ybT0icm90YXRlKC0zMCAtNS45OCA2NSkiLz48L3N2Zz4=) no-repeat;
+		background-size: 100%
+	}
+
+	.weui-loading.weui-loading_transparent {
+		background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg xmlns='http://www.w3.org/2000/svg' width='120' height='120' viewBox='0 0 100 100'%3E%3Cpath fill='none' d='M0 0h100v100H0z'/%3E%3Crect xmlns='http://www.w3.org/2000/svg' width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.56)' rx='5' ry='5' transform='translate(0 -30)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.5)' rx='5' ry='5' transform='rotate(30 105.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.43)' rx='5' ry='5' transform='rotate(60 75.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.38)' rx='5' ry='5' transform='rotate(90 65 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.32)' rx='5' ry='5' transform='rotate(120 58.66 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.28)' rx='5' ry='5' transform='rotate(150 54.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.25)' rx='5' ry='5' transform='rotate(180 50 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.2)' rx='5' ry='5' transform='rotate(-150 45.98 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.17)' rx='5' ry='5' transform='rotate(-120 41.34 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.14)' rx='5' ry='5' transform='rotate(-90 35 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.1)' rx='5' ry='5' transform='rotate(-60 24.02 65)'/%3E%3Crect width='7' height='20' x='46.5' y='40' fill='rgba(255,255,255,.03)' rx='5' ry='5' transform='rotate(-30 -5.98 65)'/%3E%3C/svg%3E")
+	}
+
+	@-webkit-keyframes a {
+		0% {
+			-webkit-transform: rotate(0deg);
+			transform: rotate(0deg)
+		}
+
+		to {
+			-webkit-transform: rotate(1turn);
+			transform: rotate(1turn)
+		}
+	}
+
+	@keyframes a {
+		0% {
+			-webkit-transform: rotate(0deg);
+			transform: rotate(0deg)
+		}
+
+		to {
+			-webkit-transform: rotate(1turn);
+			transform: rotate(1turn)
+		}
+	}
+</style>
diff --git a/components/login-info.vue b/components/login-info.vue
new file mode 100644
index 0000000..d9461e8
--- /dev/null
+++ b/components/login-info.vue
@@ -0,0 +1,112 @@
+<template>
+	<view>
+		<view class="login-info pd-lg flex-center rel" :style="{bottom:`${configInfo.tabbarHeight}px`}" v-if="pShow">
+			<view @tap.stop="toClose" class="login-close flex-center radius abs">
+				<i class="iconfont icon-add c-base"></i>
+			</view>
+			<image mode="aspectFill" lazy-load class="logo-img radius" :src="configInfo.app_logo"></image>
+			<view class="flex-center flex-1 ml-md">
+				<view class="flex-1">
+					<view class="f-title c-base max-380 ellipsis">{{`欢迎来到${configInfo.app_text}`}}</view>
+					<view class="text f-caption">登录后获取更多精彩内容</view>
+				</view>
+				<view @tap.stop="toLogin" class="login-btn flex-center f-desc c-base radius"
+					:style="{background:primaryColor}">去登录</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		props: {},
+		mounted() {
+			this.init()
+		},
+		data() {
+			return {
+				pShow: false
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			isShowLogin: state => state.user.isShowLogin
+		}),
+		methods: {
+			...mapActions(['getConfigInfo', 'getUserInfo']),
+			...mapMutations(['updateUserItem']),
+			init() {
+				let {
+					isShowLogin
+				} = this
+				this.$set(this, 'pShow', isShowLogin)
+			},
+			toClose() {
+				this.updateUserItem({
+					key: 'isShowLogin',
+					val: false
+				})
+				this.$set(this, 'pShow', false)
+			},
+			toLogin() {
+				let pages = getCurrentPages();
+				let {
+					route
+				} = pages[pages.length - 1]
+				this.updateUserItem({
+					key: 'loginPage',
+					val: `/${route}`
+				})
+				this.$util.goUrl({
+					url: `/pages/login`
+				})
+			}
+		},
+	}
+</script>
+
+<style scoped lang="scss">
+	.login-info {
+		position: fixed;
+		left: 20rpx;
+		width: 710rpx;
+		height: 139rpx;
+		background: rgba(0, 0, 0, 0.8);
+		border-radius: 16rpx;
+
+		.logo-img {
+			width: 90rpx;
+			height: 90rpx;
+		}
+
+		.text {
+			color: #9E9E9E;
+		}
+
+		.login-btn {
+			width: 150rpx;
+			height: 54rpx;
+		}
+
+		.login-close {
+			top: -10rpx;
+			right: -10rpx;
+			width: 40rpx;
+			height: 40rpx;
+			background: #000;
+
+			.iconfont {
+				font-size: 24rpx;
+				transform: rotate(45deg);
+			}
+		}
+	}
+</style>
diff --git a/components/mask.vue b/components/mask.vue
new file mode 100644
index 0000000..3441b2b
--- /dev/null
+++ b/components/mask.vue
@@ -0,0 +1,121 @@
+<template>
+	<view :class="['ui-mask ','center',effect,{'show':show}]" @tap="handleMaskTap" :style='{top:top,background:background}'>
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'mask',
+		props: {
+			background: {
+				type: String,
+				default: "rgba(0, 0, 0, 0.5)"
+			},
+			show: {
+				type: Boolean
+			},
+			top: {
+				type: String,
+				default () {
+					return '0'
+				}
+			},
+			effect: {
+				type: String
+			},
+			hideDelay: {
+				type: Number
+			},
+			hideOnTap: {
+				type: Number,
+				default () {
+					return 1
+				}
+			},
+			blur: {
+				type: String
+			}
+		},
+		created() {
+
+		},
+		data() {
+			return {
+
+			}
+		},
+		watch: {
+			show(newValue, oldValue) {
+				var _this = this;
+
+				if (newValue) {
+					this.selfShow = false
+				} else {
+					if (this.hideDelay) {
+						setTimeout(function() {
+							_this.selfShow = false
+						}, this.hideDelay);
+					} else {
+						_this.selfShow = false
+					}
+				}
+			}
+		},
+		methods: {
+			handleMaskTap(e) {
+				if (this.hideOnTap) {
+					this.show = false;
+					this.$emit('hide')
+				}
+			}
+		},
+	}
+</script>
+
+
+<style>
+	.ui-mask {
+		position: fixed;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		width: 100%;
+		visibility: hidden;
+		opacity: 0;
+		transition: all 0.25s ease-in;
+		-webkit-backface-visibility: hidden;
+		z-index: 0;
+	}
+
+	.center {
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.ui-mask.scale-out {
+		transition: all 0.25s ease-in;
+		transform: scale(0);
+	}
+
+	.ui-mask.scale-out.show {
+		transform: scale(1);
+	}
+
+	.ui-mask.scale-in {
+		transition: all 0.25s ease-in;
+		transform: scale(1.5);
+	}
+
+	.ui-mask.scale-in.show {
+		transform: scale(1);
+	}
+
+	.ui-mask.show {
+		opacity: 1;
+		visibility: visible;
+	}
+</style>
diff --git a/components/min-countdown.vue b/components/min-countdown.vue
new file mode 100644
index 0000000..f1b2dc5
--- /dev/null
+++ b/components/min-countdown.vue
@@ -0,0 +1,176 @@
+<template>
+	<view>
+		<view class="min-countdown" :class="countdownClass">
+			<rich-text :nodes="time" v-if="type == 1"></rich-text>
+			<view class="flex-y-center" :style="{color:primaryColor}" v-if="type == 2">
+				<view class="count-tag flex-center">{{time.d}}</view>天<view class="count-tag flex-center">{{time.h}}
+				</view>时
+				<view class="count-tag flex-center">{{time.m}}</view>分<view class="count-tag flex-center">{{time.s}}
+				</view>秒
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from 'vuex'; 
+	export default {
+		name: 'min-countdown',
+		props: {
+			type: {
+				type: Number,
+				default: 1
+			},
+			targetTime: {
+				type: Number,
+				default: 0
+			},
+			format: {
+				type: String,
+				default: '{%d}天{%h}小时{%m}分{%s}秒'
+			},
+			countdownClass: {
+				type: String,
+				default: ''
+			},
+			bgColor: {
+				type: String,
+				default: ''
+			},
+			isPlay: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				time: '00:00:00',
+				audioBg: {},
+				playBg: false,
+			}
+		},
+		async mounted() {
+			this.getTime()
+			if (this.isPlay && !this.configInfo.id) {
+				await this.getConfigInfo()
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			isHaveAudio: state => state.user.isHaveAudio,
+		}),
+		methods: {
+			...mapActions(['getConfigInfo', 'toPlayAudio']),
+			...mapMutations(['updateUserItem']),
+			initIndex() {
+				setTimeout(() => {
+					this.getTime()
+				}, 1000)
+			},
+			getTime() {
+				let time = {}
+				let format = this.format
+
+				function formatNumber(num) {
+					return num > 9 ? `${num}` : `0${num}`
+				}
+				const gapTime = Math.ceil((this.targetTime - new Date().getTime()) / 1000)
+				if (gapTime >= 0) {
+					time.d = formatNumber(parseInt(gapTime / 86400))
+					let lastTime = gapTime % 86400;
+					time.h = formatNumber(parseInt(lastTime / 3600))
+					lastTime = lastTime % 3600;
+					time.m = formatNumber(parseInt(lastTime / 60))
+					time.s = formatNumber(lastTime % 60);
+					['d', 'h', 'm', 's'].forEach(item => {
+						const day = time[item].split('');
+						format = format.replace('{%' + item + '}', time[item])
+						format = format.replace('{%' + item + '0}', day[0])
+						format = format.replace('{%' + item + '1}', day[1])
+						format = format.replace('{%' + item + '2}', day[2] ? day[2] : '0')
+					})
+					this.time = this.type == 1 ? format : time
+					this.initIndex()
+					if (this.isPlay && gapTime == 60 * 5) {
+						this.toPlayAudio({
+							key: 'countdown_voice'
+						})
+					}
+					if (this.isPlay && gapTime == 0) {
+						this.toPlayAudio({
+							key: 'service_end_recording'
+						})
+						this.$emit('end')
+					}
+				} else {
+					this.$emit('callback')
+				}
+			},
+			async toInitPlay() {
+				if (!this.configInfo.id) {
+					await this.getConfigInfo()
+				}
+				console.log("======toInitPlay")
+
+				let {
+					countdown_voice
+				} = this.configInfo
+				this.audioBg = uni.createInnerAudioContext();
+				this.audioBg.src = countdown_voice
+				this.audioBg.obeyMuteSwitch = false
+				this.updateUserItem({
+					key: 'isHaveAudio',
+					val: true
+				})
+				console.log(this.audioBg, "=======this.audioBg")
+
+				this.audioBg.onPlay(() => {
+					console.log('onPlay')
+					this.playBg = true
+				})
+				this.audioBg.onStop(() => {
+					console.log('onStop')
+					this.playBg = false
+				})
+				this.audioBg.onError(() => {
+					console.log('onError')
+					this.playBg = false
+					this.audioBg.destroy()
+				})
+				this.audioBg.onEnded(() => {
+					console.log('onEnded')
+					this.playBg = false
+				})
+			},
+			toPlay() {
+				console.log("=====toPlay", this.playBg, this.audioBg)
+				if (this.playBg) {
+					this.audioBg.stop()
+				}
+				this.audioBg.play()
+			}
+		}
+	}
+</script>
+
+<style scoped>
+	.min-countdown {
+		display: inline-flex;
+		justify-content: center;
+		align-items: center;
+	}
+
+	.count-tag {
+		width: 56rpx;
+		height: 56rpx;
+		margin: 0 10rpx;
+		background: linear-gradient(0deg, #F7D9AD 0%, #FBEACB 100%);
+		border-radius: 8rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/components/search.vue b/components/search.vue
new file mode 100644
index 0000000..50f9842
--- /dev/null
+++ b/components/search.vue
@@ -0,0 +1,207 @@
+<template>
+	<view class='search-box'
+		:style='{padding:`${padding}rpx`,margin:`${margin}rpx`,borderRadius:`${radius}rpx`,background:backgroundColor}'>
+		<view class='search-item' :class="[{'flex-y-center': type == 'text'},{'flex-between': type == 'input'}]"
+			:style='{borderRadius:searchStyleObj[searchStyle],background:frontColor,justifyContent:textAlign,height:height}'>
+			<block v-if="type=='text'">
+				<image src='https://lbqny.migugu.com/admin/public/search.png' class="search-icon"></image>
+				<view class='ml-md placeholder'>{{placeholder}}</view>
+			</block>
+			<block v-if="type=='input'">
+				<view class="flex-y-center flex-1">
+					<image src='https://lbqny.migugu.com/admin/public/search.png' class="search-icon"></image>
+					<input type='text' class="flex-1 ml-md mr-md f-paragraph c-title" :disabled="disabled"
+						:placeholder='placeholder' placeholder-class='f-paragraph c-caption' confirm-type="search"
+						@input="handerInput" :value="keyword" @confirm="confirm" :auto-focus="autofocus"></input>
+				</view>
+				<view class='search-item-btn flex-center radius' :style="{background:primaryColor}" @tap='confirm'
+					v-if="confirmSearch">搜索</view>
+			</block>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	export default {
+		name: 'search',
+		props: {
+			type: {
+				type: String,
+				default () {
+					return 'text'
+				}
+			},
+			placeholder: {
+				type: String,
+				default () {
+					return "输入关键字进行搜索"
+				}
+			},
+			searchStyle: {
+				type: String,
+				default () {
+					return 'circle'
+				}
+			},
+			textAlign: {
+				type: String,
+				default () {
+					return 'center'
+				}
+			},
+			padding: {
+				type: Number,
+				default () {
+					return 30
+				}
+			},
+			margin: {
+				type: Number,
+				default () {
+					return 0
+				}
+			},
+			radius: {
+				type: Number,
+				default () {
+					return 0
+				}
+			},
+			height: {
+				type: String,
+				default () {
+					return '64rpx'
+				}
+			},
+			backgroundColor: {
+				type: String,
+				default () {
+					return '#fff'
+				}
+			},
+			frontColor: {
+				type: String,
+				default () {
+					return '#f4f6f8'
+				}
+			},
+			autofocus: {
+				type: Boolean,
+				default () {
+					return false
+				}
+			},
+			disabled: {
+				type: Boolean,
+				default () {
+					return false
+				}
+			},
+			focus: {
+				type: Boolean,
+				default () {
+					return false
+				}
+			},
+			keyword: {
+				type: String,
+				default () {
+					return ''
+				}
+			},
+			confirmSearch: {
+				type: Boolean,
+				default () {
+					return false
+				}
+			}
+		},
+		created() {
+
+		},
+		data() {
+			return {
+				searchStyleObj: {
+					square: '0rpx',
+					radius: '10rpx',
+					circle: '30rpx'
+				},
+				text: ''
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+		}),
+		methods: {
+			confirm(e) {
+				let val = this.text;
+				this.$emit("confirm", val)
+			},
+			handerInput(e) {
+				let val = e.detail.value;
+				this.text = val;
+				this.$emit("input", val)
+			}
+		},
+	}
+</script>
+
+
+<style>
+	.search-box {
+		padding: 16rpx 16rpx;
+		display: flex;
+		align-items: center;
+		background: #efeff5;
+	}
+
+	.search-item {
+		width: 100%;
+		background: #ffffff;
+		border-radius: 30rpx;
+		padding: 0 0 0 25rpx;
+		line-height: 1;
+		font-size: 28rpx;
+		color: #888;
+	}
+
+	.placeholder {
+		font-size: 28rpx;
+		color: #999;
+	}
+
+	.search-item-btn {
+		width: 110rpx;
+		height: 64rpx;
+		font-size: 26rpx;
+		font-weight: 400;
+		color: #ffffff;
+	}
+
+	.search-btn {
+		padding: 0 20rpx 0 40rpx;
+	}
+
+	.search-icon {
+		width: 30rpx;
+		height: 30rpx;
+	}
+
+	.flex-1 {
+		flex: 1;
+	}
+
+	.icon-md {
+		width: 40rpx;
+		height: 40rpx;
+	}
+
+	.ml-md {
+		margin-left: 16rpx;
+	}
+</style>
diff --git a/components/service-list-item.vue b/components/service-list-item.vue
new file mode 100644
index 0000000..fcc5d72
--- /dev/null
+++ b/components/service-list-item.vue
@@ -0,0 +1,180 @@
+<template>
+	<view class="service-list-item">
+		<view @tap.stop="goDetail" class="list-item flex-warp">
+			<!-- #ifdef H5 -->
+			<view class="cover radius-16">
+				<view class="h5-image cover radius-16" :style="{ backgroundImage : `url('${info.cover}')`}">
+				</view>
+			</view>
+			<!-- #endif -->
+			<!-- #ifndef H5 -->
+			<image mode="aspectFill" lazy-load class="cover radius-16" :src="info.cover"></image>
+			<!-- #endif -->
+			<view class="flex-1 ml-md" :style="{maxWidth:maxWidth}">
+				<view class="flex-between">
+					<view class="f-title c-title text-bold max-270 ellipsis">{{ info.title }}</view>
+					<view class="f-caption c-caption">超{{ info.total_sale }}人选择</view>
+				</view>
+				<view class="f-caption c-caption mt-sm mb-sm ellipsis" style="height: 36rpx;">{{ info.sub_title || '' }}
+				</view>
+				<view class="f-caption c-caption" v-if="info.material_price*1>0">物料费：¥{{info.material_price}}</view>
+				<view class="flex-between">
+					<view class="flex-y-center f-desc c-caption max-350 ellipsis">
+						<view class="flex-y-baseline f-icontext c-orange text-bold mr-sm">
+							<b class="f-caption c-orange">￥</b>
+							<view class="f-md-title">
+								{{ info.price }}
+							</view>
+						</view>
+						<view class="text-delete" v-if="info.init_price">￥{{ info.init_price }}</view>
+						<view class="servefc ml-md">	
+							<i class="iconfont icon-shijian" :style="{ color: primaryColor }"></i>
+							<span class="f-caption c-title ml-sm">{{ info.time_long }}分钟</span>
+						</view>				
+					</view>
+					<auth @tap.stop.prevent :needAuth="userInfo && (!userInfo.phone || !userInfo.nickName)" :must="true"
+						:type="!userInfo.phone ? 'phone' : 'userInfo'" @go="toChoose" style="width:190rpx">
+						<view class="flex-between">
+							<view></view>
+							<view class="item-btn flex-center f-caption c-base" :style="{background: `linear-gradient(68deg, ${primaryColor}, ${subColor})`}">
+								{{ from == 'technician-info' ? `立即预约` : `选择${$t('action.attendantName')}`}}
+							</view>
+						</view>
+					</auth>
+				</view>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		props: {
+			from: {
+				type: String,
+				default () {
+					return 'list'
+				}
+			},
+			sid: {
+				type: Number,
+				default () {
+					return 0
+				}
+			},
+			info: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			maxWidth: {
+				type: String,
+				default () {
+					return '490rpx'
+				}
+			}
+		},
+		data() {
+			return {
+				textType: {
+					1: '可服务',
+					2: '服务中',
+					3: '可预约',
+					4: '不可预约'
+				},
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			userInfo: state => state.user.userInfo,
+		}),
+		methods: {
+			// 详情
+			goDetail() {
+				let {
+					id
+				} = this.info
+				let {
+					sid: store_id = 0
+				} = this
+				let url = `/user/pages/detail?id=${id}&store_id=${store_id}`
+				this.$util.goUrl({
+					url
+				})
+			},
+			// 选择技-师
+			toChoose() {
+				let {
+					from
+				} = this
+				if (from == 'technician-info') {
+					this.$emit('order')
+					return
+				}
+				let {
+					id
+				} = this.info
+				let {
+					sid: store_id = 0
+				} = this
+				let url = `/user/pages/choose-technician?id=${id}&store_id=${store_id}`
+				this.$util.goUrl({
+					url
+				})
+			},
+			toEmit(key) {
+				this.$emit(key)
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.service-list-item {
+		.list-item {
+			.cover {
+				width: 180rpx;
+				height: 180rpx;
+			}
+
+			.time-long {
+				min-width: 72rpx;
+				height: 30rpx;
+				padding: 0 5rpx;
+				background: linear-gradient(270deg, #4C545A 0%, #282B34 100%);
+				border-radius: 4rpx;
+				font-size: 20rpx;
+				color: #FFEEB9;
+				margin-right: 16rpx;
+			}
+
+			.f-icontext {
+				font-size: 18rpx;
+			}
+
+			.text-delete {
+				font-size: 24rpx;
+				color: #B9B9B9;
+			}
+
+			.item-btn {
+				min-width: 150rpx;
+				height: 52rpx;
+				padding: 0 10rpx;
+				border-radius: 100rpx;
+			}
+		}
+	}
+	.servefc{
+		display: flex;
+		align-items: center;
+	}	
+</style>
\ No newline at end of file
diff --git a/components/shop-banner.vue b/components/shop-banner.vue
new file mode 100644
index 0000000..ee92837
--- /dev/null
+++ b/components/shop-banner.vue
@@ -0,0 +1,233 @@
+<template>
+	<view class="rel">
+		<view class="abs" style="z-index: 99;" :style="{top:statusBarHeight + 'px'}">
+			<!-- #ifdef MP-WEIXIN -->
+			<view @tap.stop="goBack" class="flex-center circle home-return-btn" v-if="!isShare"
+				:class="[{'back-user-ios': configInfo.isIos},{'back-user-android': !configInfo.isIos}]">
+				<view class="iconfont icon-left c-base text-bold" style="font-size: 40rpx;"></view>
+			</view>
+			<!-- #endif -->
+			<!-- #ifdef H5 -->
+			<view @tap="$util.goUrl({url:`/pages/service`,openType:`reLaunch`})"
+				:class="[{'back-user-ios': configInfo.isIos},{'back-user-android': !configInfo.isIos}]" v-if="isShare">
+				<view class="iconshouye iconfont"></view>
+				<view class="back-user_text">回到首页</view>
+			</view>
+			<!-- #endif -->
+		</view>
+		<view class='banner'>
+			<swiper class='banner-swiper' :style="{background: playVideo && !detail.video_vid ? '#000':'#f4f6f8'}"
+				@change='handerSwiperChange' @transition="swiperTransition" :autoplay="playVideo ? false : true"
+				:current="current">
+				<swiper-item v-for="(item,index) in detail.images" :key="index" @tap='handerBannerClick(index)'>
+					<block v-if="index == 0 && detail.video_url">
+						<block v-if="!playVideo">
+							<view @tap.stop="playCurrent"
+								class="banner-swiper c-base iconfont icontushucxuanzebofangtiaozhuan abs flex-center"
+								style="top: 0rpx;font-size: 80rpx;z-index: 9;"></view>
+							<image mode="aspectFill" class='banner-img' :src='item'></image>
+						</block>
+						<!-- #ifdef MP-WEIXIN -->
+						<txv-video :vid="detail.video_vid" :playerid="detail.video_vid" width="100%" height="100%"
+							:controls="true" :autoplay="true" :isHiddenStop="true" v-if="playVideo && detail.video_vid">
+						</txv-video>
+						<!-- #endif -->
+						<view class="video-box" v-if="playVideo && !detail.video_vid">
+							<video :id="`video_id`" class="my-video" :loop="false" enable-play-gesture
+								:enable-progress-gesture="false" :src="detail.video_url" :autoplay="playVideo"
+								@play="onPlay" @pause="onPause" @ended="onEnded" @timeupdate="onTimeUpdate"
+								@waiting="onWaiting" @progress="onProgress" @loadedmetadata="onLoadedMetaData"></video>
+						</view>
+					</block>
+					<image mode="aspectFill" class='banner-img' :src='item' v-else></image>
+				</swiper-item>
+			</swiper>
+			<view class='banner-tagitem banner-tagitem_count' v-if="!playVideo && detail.images.length">
+				{{current+1}}/{{detail.images.length}}
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState
+	} from "vuex"
+	export default {
+		props: {
+			detail: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			isShare: {
+				type: Boolean,
+				default () {
+					return false
+				}
+			},
+			setCurrent: {
+				type: Number,
+				default () {
+					return 0
+				}
+			}
+		},
+		watch: {
+			'detail.images'(newValue, oldValue) {
+				this.current = 0
+			}
+		},
+		data() {
+			return {
+				statusBarHeight: uni.getSystemInfoSync().statusBarHeight,
+				videoContexts: {},
+				playVideo: false,
+				current: 0
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		created() {
+			this.videoContexts = uni.createVideoContext(`video_id`, this)
+		},
+		methods: {
+			handerSwiperChange(e) {
+				let {
+					current,
+				} = e.detail
+				this.current = current;
+				this.videoContexts.pause()
+				this.playVideo = false;
+			},
+			swiperTransition(e) {
+				// // #ifdef H5
+				// if(this.playVideo && this.current == 0 && e.detail.dx < 30){
+				// 	this.current = 1
+				// 	this.videoContexts.pause()
+				// 	this.playVideo = false;
+				// 	console.log(e,"======swiperTransition")
+				// }
+				// // #endif
+			},
+			playCurrent() {
+				this.videoContexts.play()
+				this.playVideo = true
+			},
+			onPlay(e) {},
+			onPause(e) {},
+			onEnded(e) {},
+			onError(e) {},
+			onTimeUpdate(e) {},
+			onWaiting(e) {},
+			onProgress(e) {},
+			onLoadedMetaData(e) {},
+			handerBannerClick(index) {
+				let {
+					image_url: url,
+					video_url = ''
+				} = this.detail
+				if (index == 0 && video_url) {
+					this.playVideo = true;
+					return
+				}
+				if (!url) return
+				this.$util.goUrl({
+					openType: 'web', //this.configInfo.methodObj[jump_type],
+					url
+				})
+			},
+			goBack() {
+				uni.navigateBack({
+					delta: 1
+				})
+			},
+		}
+	}
+</script>
+
+<style>
+	.home-return-btn {
+		margin-top: 10rpx;
+		margin-left: 24rpx;
+		width: 60rpx;
+		height: 60rpx;
+		border: none;
+		background-color: rgba(0, 0, 0, 0.3);
+	}
+
+	.video-box {
+		position: relative;
+		width: 100%;
+		height: 500rpx;
+	}
+
+	.my-video {
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 80%;
+		align-items: center;
+		margin-top: 120rpx;
+	}
+
+	.banner {
+		position: relative;
+	}
+
+	.banner-swiper {
+		width: 750rpx;
+		height: 564rpx;
+	}
+
+	.banner-img {
+		width: 100%;
+		height: 100%;
+	}
+
+	.banner-taglist {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		position: absolute;
+		bottom: 32rpx;
+		width: 100%;
+	}
+
+	.banner-tagitem {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		width: 90rpx;
+		height: 42rpx;
+		border-radius: 21rpx;
+		background: rgba(255, 255, 255, 0.8);
+		color: #2b2b2b;
+		font-size: 22rpx;
+		margin-left: 32rpx;
+	}
+
+	.banner-tagitem:nth-child(1) {
+		margin-left: 0;
+	}
+
+	.banner-tagitem_count {
+		background: rgba(0, 0, 0, 0.5);
+		color: #fff;
+		position: absolute;
+		bottom: 32rpx;
+		right: 32rpx;
+		z-index: 10;
+	}
+
+	.banner-tagitem_active {
+		background: #19c865;
+		color: #fff;
+	}
+</style>
diff --git a/components/tab.vue b/components/tab.vue
new file mode 100644
index 0000000..7e11e45
--- /dev/null
+++ b/components/tab.vue
@@ -0,0 +1,210 @@
+<template>
+	<view>
+		<scroll-view scroll-x class='tab-list' :scroll-into-view="'tab'+(activeIndex-1)" :scroll-with-animation="true"
+			:style="{background: bgColor,fontSize: fontSize}">
+			<view class='tab-item rel' v-for="(item,index) in list" :key="index" @tap='handerTabChange(index)'
+				data-index="index" :id="'tab'+index"
+				:style='{width,height,lineHeight:height,color:index==activeIndex?activeColor:color}'>
+				<view class="flex-y-baseline flex-x-center rel">
+					<view class="rel" v-if="item.number">
+						{{item.title || item}}
+						<view v-if="numberType == 1" class="item-msg c-base abs"
+							:style="{width: item.number<10 ? '30rpx' :item.number<100 ? '40rpx' : '50rpx',right:item.number<10 ? '-34rpx' :item.number<100 ? '-44rpx' : '-54rpx' }">
+							{{item.number < 100 ? item.number : '99+'}}
+						</view>
+						<view class="tab-label c-base abs"
+							:style="{width: item.number<10 ? '24rpx' :item.number<100 ? '36rpx': '48rpx',right:item.number<10 ? '-14rpx' :item.number<100 ? '-26rpx' : '-38rpx'}"
+							v-if="numberType == 2">
+							{{item.number < 100 ? item.number : '99+'}}
+						</view>
+					</view>
+					<block v-else>{{item.title || item}}</block>
+					<block v-if="item.is_sign == 1">
+						<view class="tab-item-sanjao abs" :style="{right: item.title.length == 3 ? '-20rpx' : ''}">
+							<view class="up iconfont icon-up-fill rel"
+								:style="{color:index==activeIndex && item.sign == 1?activeColor:'#ccc',}"></view>
+							<view class="down iconfont icon-down-fill rel"
+								:style="{color:index==activeIndex && item.sign == 0?activeColor:'#ccc',}"></view>
+						</view>
+					</block>
+				</view>
+				<view class="abs line" :class="[lineClass]" :style="{background: activeColor}"
+					v-if="isLine && index==activeIndex && !item.is_sign">
+				</view>
+			</view>
+		</scroll-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'tab',
+		props: {
+			list: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			activeIndex: {
+				type: Number,
+				default () {
+					return 0
+				}
+			},
+			color: {
+				type: String,
+				default () {
+					return '#333'
+				}
+			},
+			activeColor: {
+				type: String,
+				default () {
+					return '#e73535'
+				}
+			},
+			bgColor: {
+				type: String,
+				default () {
+					return '#fff'
+				}
+			},
+			width: {
+				type: String,
+				default () {
+					return ''
+				}
+			},
+			height: {
+				type: String,
+				default () {
+					return '100rpx'
+				}
+			},
+			isLine: {
+				type: Boolean,
+				default () {
+					return true
+				}
+			},
+			lineClass: {
+				type: String,
+				default () {
+					return ''
+				}
+			},
+			msgRight: {
+				type: String,
+				default () {
+					return '5rpx'
+				}
+			},
+			fontSize: {
+				type: String,
+				default () {
+					return '30rpx'
+				}
+			},
+			numberType: {
+				type: Number,
+				default () {
+					return 1
+				}
+			}
+		},
+		created() {
+
+		},
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+			handerTabChange(index) {
+				this.$emit('change', index);
+			}
+		},
+	}
+</script>
+
+<style lang="scss">
+	.tab-list {
+		white-space: nowrap;
+		background: #fff;
+		width: 100%;
+
+		.tab-item {
+			display: inline-block;
+			text-align: center;
+			padding: 0 20rpx;
+			border-color: #fff;
+			box-sizing: border-box;
+
+			.tab-label {
+				width: 24rpx;
+				height: 24rpx;
+				font-size: 18rpx;
+				text-align: center;
+				line-height: 24rpx;
+				border-radius: 24rpx;
+				background: #F1381F;
+				top: 12rpx;
+				right: -14rpx;
+			}
+
+			.item-msg {
+				width: 30rpx;
+				height: 30rpx;
+				font-size: 20rpx;
+				text-align: center;
+				line-height: 30rpx;
+				border-radius: 15rpx 15rpx 15rpx 0;
+				background: #f12c20;
+				top: 10rpx;
+				right: -34rpx;
+			}
+
+			.tab-item-sanjao {
+				top: 18rpx;
+				right: -6rpx;
+				width: 30rpx;
+				height: 50rpx;
+				transform: scale(0.6);
+
+				.iconfont {
+					font-size: 28rpx;
+				}
+
+				.up {
+					top: 0;
+					left: 0;
+				}
+
+				.down {
+					bottom: 10rpx;
+					left: 0;
+				}
+			}
+
+			.line {
+				width: 80rpx;
+				height: 6rpx;
+				border-radius: 6rpx;
+				left: 50%;
+				bottom: 0rpx;
+				margin-left: -40rpx;
+			}
+
+			.line.sm {
+				width: 60rpx;
+				height: 6rpx;
+				border-radius: 6rpx;
+				left: 50%;
+				bottom: 0rpx;
+				margin-left: -30rpx;
+			}
+		}
+	}
+</style>
diff --git a/components/tabbar.vue b/components/tabbar.vue
new file mode 100644
index 0000000..3942976
--- /dev/null
+++ b/components/tabbar.vue
@@ -0,0 +1,117 @@
+<template>
+	<view class="custom-tabbar fix flex-center fill-base b-1px-t">
+		<view @tap.stop="changeTab(item)" class="flex-center flex-column mt-sm"
+			:style="{width: (100/configInfo.tabBar.length) + '%',color:cur == item.id ? primaryColor : '#666'}"
+			v-for="(item,index) in configInfo.tabBar" :key="index">
+			<i class="iconfont" :class="cur == item.id ? item.selected_img : item.default_img"></i>
+			<image class="" :src="cur == item.id ? item.selected_img : item.default_img" style="width:45rpx;height:45rpx;"></image>
+			<view class="text">{{item.name}}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		props: {
+			cur: {
+				type: Number,
+				default () {
+					return 0
+				}
+			},
+		},
+		data() {
+			return {}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			commonOptions: state => state.user.commonOptions,
+			userPageType: state => state.user.userPageType,
+			activeIndex: state => state.order.activeIndex,
+		}),
+		async mounted() {
+			let that = this;
+			let sysheight = uni.getSystemInfoSync().windowHeight
+			let {
+				navBarHeight
+			} = that.configInfo
+			
+			setTimeout(() => {
+				const query = uni.createSelectorQuery().in(that);
+				query.select('.custom-tabbar').boundingClientRect(data => {
+					let curSysHeight = sysheight - data.height - navBarHeight
+					let configInfo = that.$util.deepCopy(this.configInfo)
+					configInfo.curSysHeight = curSysHeight
+					configInfo.tabbarHeight = data.height
+					that.updateConfigItem({
+						key: 'configInfo',
+						val: configInfo
+					})
+				}).exec();
+			}, 600)
+		},
+		methods: {
+			...mapActions(['getConfigInfo']),
+			...mapMutations(['updateConfigItem']),
+			// 点击跳转
+			async changeTab(item) {
+				if (!item.id) {
+					await this.getConfigInfo()
+					let arr = this.configInfo.tabBar.filter(aitem => {
+						return aitem.name == item.name
+					})
+					item = arr[0]
+				}
+				let {
+					id: index
+				} = item
+				let {
+					activeIndex,
+					cur,
+					userPageType
+				} = this
+				let page = {
+					1: `/pages/service`,
+					2: `/pages/technician`,
+					3: `/pages/dynamic`,
+					4: `/pages/order?tab=${activeIndex}`,
+					5: `/pages/mine?type=${userPageType}`,
+					6: `/pages/shopstore`,
+					7: `/pages/map`
+				}
+				if (index == cur) return
+				this.$util.goUrl({
+					url: page[index],
+					openType: `reLaunch`
+				})
+			},
+		},
+	}
+</script>
+
+<style scoped lang="scss">
+	.custom-tabbar {
+		height: 98rpx;
+		bottom: 0;
+		height: calc(98rpx + env(safe-area-inset-bottom) / 2);
+		padding-bottom: calc(env(safe-area-inset-bottom) / 2);
+
+		.iconfont {
+			font-size: 40rpx;
+		}
+
+		.text {
+			font-size: 22rpx;
+			margin-top: 5rpx;
+			height: 32rpx;
+		}
+	}
+</style>
diff --git a/components/technician-list-item.vue b/components/technician-list-item.vue
new file mode 100644
index 0000000..5140120
--- /dev/null
+++ b/components/technician-list-item.vue
@@ -0,0 +1,306 @@
+<template>
+	<view class="technician-list-item">
+
+		<view class="list-item flex-center pd-lg fill-base radius-16 rel">
+			<image mode="aspectFill" class="king-img abs" src="https://lbqny.migugu.com/admin/anmo/mine/king.gif"
+				v-if="info.coach_type_status==1">
+			</image>
+			<view class="flex-center flex-column">
+				<view class="item-img rel">
+					<!-- #ifdef H5 -->
+					<view class="item-img radius">
+						<view @tap.stop="toPreviewImage('work_img')" class="h5-image item-img radius"
+							:style="{ backgroundImage : `url('${info.work_img}')`}">
+						</view>
+					</view>
+					<view @tap.stop="info.coach_type_status==1?toPreviewImage('work_img'):''" class="h5-image abs"
+						:class="[`${imgType[info.coach_type_status]}-img`]"
+						:style="{ backgroundImage :  info.coach_type_status === 3? `url('https://lbqny.migugu.com/admin/anmo/mine/${imgType[info.coach_type_status]}.png')` : `url('https://lbqny.migugu.com/admin/anmo/mine/${imgType[info.coach_type_status]}.gif')`}"
+						v-if="info.coach_type_status">
+					</view>
+					<!-- #endif -->
+					<!-- #ifndef H5 -->
+					<image @tap.stop="toPreviewImage('work_img')" mode="aspectFill" class="item-img radius"
+						:src="info.work_img">
+					</image>
+					<image @tap.stop="info.coach_type_status==1?toPreviewImage('work_img'):''" class="abs"
+						:class="[`${imgType[info.coach_type_status]}-img`]"
+						:src=" info.coach_type_status === 3 ? `https://lbqny.migugu.com/admin/anmo/mine/${imgType[info.coach_type_status]}.png` : `https://lbqny.migugu.com/admin/anmo/mine/${imgType[info.coach_type_status]}.gif`"
+						v-if="info.coach_type_status">
+					</image>
+					<!-- #endif -->
+				</view>
+				<view class="item-tag flex-center f-icontext c-base radius-20"
+					:style="{background: info.text_type === 1 ? service_btn_color : info.text_type == 3?primaryColor: info.text_type==4?'#e1493b':'',color:info.text_type === 1 ? service_font_color :[3,4].includes(info.text_type) ? '#fff' : ''}">
+					{{textType[info.text_type]}}
+				</view>
+			</view>
+			<view class="flex-1 ml-md max-510">
+				<view class="flex-between">
+					<view @tap.stop="goInfo">
+						<view class="flex-y-center f-title c-title">
+							<view class="text-bold max-200 ellipsis">{{info.coach_name}}</view>
+							<view @tap.stop="toPreviewImage('self_img')"
+								class="more-img flex-center ml-sm f-icontext ml-lg"
+								:style="{color:primaryColor,border:`1rpx solid ${primaryColor}`}">生活照</view>
+						</view>
+						<view class="flex-y-center f-icontext mt-sm">
+							<view class="flex-y-center"><i class="iconfont iconyduixingxingshixin icon-font-color"></i>
+								<view class="star-text">{{info.star}}</view>
+							</view>
+							<view class="order-num">
+								已服务 {{info.order_num > 9999 ? '9999+' : info.order_num}}单</view>
+						</view>
+						<view class="flex-y-center f-icontext mt-sm mb-sm">
+							<view class="flex-center">
+								<i class="iconfont iconjuli" :style="{color:primaryColor}"></i>
+								<view class="f-desc c-title ml-sm">{{info.distance}}</view>
+							</view>
+						</view>
+					</view>
+					<view class="can-service-btn f-caption c-base radius-10"
+						:style="{border:`2rpx solid ${primaryColor}`}" v-if="info.near_time">
+						<view class="text"
+							:style="{background: `linear-gradient(68deg, ${primaryColor}, ${subColor})`}">最早可约</view>
+						<view class="time" :style="{color:primaryColor}">{{'时间'+info.near_time+''}}</view>
+					</view>
+				</view>
+				<view class="flex-between">
+					<view class="flex-y-center f-desc c-caption">
+						<view @tap.stop="goInfo" class="flex-y-center">
+							<block v-if="from!='collect' && plugAuth.store && info.store && info.store.id">
+								<i class="iconfont iconshangjia_1 c-caption mr-sm"></i>
+								商家
+							</block>
+							<block v-else-if="from!='collect' && info.admin_id && info.admin_name && merchantAuth">
+								<i class="iconfont iconshangjia_1 c-caption mr-sm"></i>
+								{{info.admin_name}}
+							</block>
+							<block v-else>
+								<i class="iconfont iconxiangqing c-caption mr-sm"></i>
+								详情
+							</block>
+						</view>
+						<view @tap.stop="toEmit('comment')" class="flex-y-center ml-lg"><i
+								class="iconfont iconpinglun mr-sm"></i>{{info.comment_num > 9999 ? '9999+':info.comment_num}}
+						</view>
+						<view @tap.stop="toEmit('collect')" class="flex-y-center ml-lg"><i class="iconfont mr-sm"
+								:class="[{'iconshoucang1':!info.is_collect},{'iconshoucang2':info.is_collect}]"
+								:style="{color:info.is_collect ? primaryColor :''}"></i>{{info.collect_num > 9999 ? '9999+':info.collect_num}}
+						</view>
+					</view>
+					<auth @tap.stop.prevent :needAuth="userInfo && (!userInfo.phone || !userInfo.nickName)" :must="true"
+						:type="!userInfo.phone ? 'phone' : 'userInfo'" @go="toEmit('order')" style="width:130rpx;">
+						<view class="item-btn flex-center f-desc c-base"
+							:style="{background: `linear-gradient(68deg, ${primaryColor}, ${subColor})`}">
+							预约TA
+						</view>
+					</auth>
+				</view>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		props: {
+			from: {
+				type: String,
+				default () {
+					return 'list'
+				}
+			},
+			info: {
+				type: Object,
+				default () {
+					return {}
+				}
+			}
+		},
+		data() {
+			return {
+				imgType: {
+					1: 'top',
+					2: 'hot',
+					3: 'new'
+				},
+				textType: {
+					1: '可服务',
+					2: '服务中',
+					3: '可预约',
+					4: '不可预约'
+				}
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			plugAuth: state => state.config.configInfo.plugAuth,
+			merchantAuth: state => state.config.merchantAuth,
+			service_btn_color: state => state.config.configInfo.service_btn_color,
+			service_font_color: state => state.config.configInfo.service_font_color,
+			userInfo: state => state.user.userInfo,
+		}),
+		methods: {
+			toPreviewImage(key) {
+				let urls = this.info[key]
+				if (key == 'work_img') {
+					urls = [urls]
+				}
+				this.$util.previewImage({
+					current: urls[0],
+					urls
+				})
+			},
+			// 技-师详情
+			goInfo() {
+				let {
+					id,
+					store = {},
+					admin_id = 0,
+					admin_name
+				} = this.info
+				let {
+					from,
+					plugAuth = {},
+					merchantAuth = 0
+				} = this
+				this.$util.goUrl({
+					url: from != 'collect' && plugAuth.store && store && store.id ?
+						`/shopstore/pages/detail?id=${store.id}` : from != 'collect' && merchantAuth && admin_id &&
+						admin_name ? `/user/pages/merchant-info?id=${admin_id}` :
+						`/user/pages/technician-info?id=${id}`
+				})
+			},
+			toEmit(key) {
+				this.$emit(key)
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.technician-list-item {
+
+		.list-item {
+			.top-tag {
+				width: 40rpx;
+				height: 30rpx;
+				color: #B75E1D;
+				background: linear-gradient(90deg, #DFB885 0%, #FCE0AD 100%);
+				border-radius: 8rpx 0 8rpx 0;
+				top: 0;
+				left: 0;
+			}
+
+			.item-img {
+				width: 124rpx;
+				height: 124rpx;
+			}
+
+			.king-img {
+				width: 90rpx;
+				height: 90rpx;
+				top: 110rpx;
+				left: -15rpx;
+				z-index: 1;
+			}
+
+
+			.top-img {
+				width: 146rpx;
+				height: 140rpx;
+				top: -7rpx;
+				left: -11rpx;
+			}
+
+			.hot-img {
+				width: 75rpx;
+				height: 51rpx;
+				top: 77rpx;
+				left: 25rpx;
+			}
+
+			.new-img {
+				width: 38rpx;
+				height: 52rpx;
+				top: 83rpx;
+				left: 78rpx;
+			}
+
+			.item-tag {
+				width: 100rpx;
+				height: 32rpx;
+				color: #000;
+				background: rgba(216, 216, 216, 0.3);
+				margin-top: 19rpx;
+				margin-bottom: 6rpx;
+			}
+
+			.more-img {
+				width: 94rpx;
+				height: 33rpx;
+				border-radius: 3px;
+				transform: rotateZ(1turn);
+			}
+
+			.can-service-btn {
+				height: 80rpx;
+				margin-bottom: 30rpx;
+				width: 130rpx;
+
+				.bg {
+					width: 64rpx;
+					height: 28rpx;
+					opacity: 0.1;
+					border-radius: 3rpx;
+					top: 0;
+					left: 0;
+					z-index: 1;
+				}
+
+				.text {
+					height: 40rpx;
+					line-height: 40rpx;
+					text-align: center;
+					width: 100%;
+				}
+
+				.time {
+					height: 40rpx;
+					line-height: 40rpx;
+					text-align: center;
+					width: 100%;
+				}
+			}
+
+			.iconyduixingxingshixin {
+				font-size: 28rpx;
+				background-image: -webkit-linear-gradient(270deg, #FAD961 0%, #F76B1C 100%);
+			}
+
+			.star-text {
+				color: #FF9519;
+				margin-left: 6rpx;
+			}
+
+			.order-num {
+				color: #4D4D4D;
+				margin-left: 16rpx;
+			}
+
+			.item-btn {
+				width: 130rpx;
+				height: 52rpx;
+				border-radius: 100rpx;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/technician-list-popup.vue b/components/technician-list-popup.vue
new file mode 100644
index 0000000..c83d4bc
--- /dev/null
+++ b/components/technician-list-popup.vue
@@ -0,0 +1,331 @@
+<template>
+	<view class="technician-list-popup">
+		<uni-popup ref="technician_item" type="bottom" style="height: 600px;">
+			<view class="technician-popup fill-base">
+				<view class="pd-lg rel"
+					:class="[{'flex-center': from=='technician-info'&&showType == 'message' ||  showType == 'technician'},{'flex-warp': showType == 'message'}]">
+					<image mode="aspectFill" class="item-avatar radius" :src="info.work_img"></image>
+					<i @tap.stop="$refs.technician_item.close()" class="iconfont icon-close abs"></i>
+					<view class="flex-1 ml-md">
+						<view class="flex-between">
+							<view class="flex-y-baseline f-caption c-caption">
+								<view class="f-title c-title text-bold mr-sm max-350 ellipsis">
+									{{info.coach_name}}
+								</view>从业{{info.work_time}}年
+							</view>
+						</view>
+						<scroll-view scroll-y @touchmove.stop.prevent class="technician-text f-caption c-caption mt-sm"
+							v-if="from != 'technician-info' && showType == 'message'">
+							{{info.text}}
+						</scroll-view>
+					</view>
+				</view>
+				<view class="space-sm fill-body"></view>
+				<scroll-view scroll-y @touchmove.stop.prevent class="list-content">
+					<block v-if="showType == 'technician'">
+						<view class="list-item flex-center pd-lg fill-base radius-16" :class="[{'b-1px-t':index != 0}]"
+							v-for="(item,index) in serviceList" :key="index">
+							<image @tap.stop="goDetail(index)" mode="aspectFill" class="avatar lg radius-16"
+								:src="item.cover"></image>
+							<view class="flex-1 ml-md">
+								<view @tap.stop="goDetail(index)" class="f-sm-title c-title text-bold max-510 ellipsis">
+									{{item.title}}
+								</view>
+								<view class="f-caption c-caption mt-sm mb-sm ellipsis">超{{item.total_sale}}人选择</view>
+								<view class="flex-between">
+									<view class="flex-y-baseline flex-1">
+										<view class="flex-y-baseline f-icontext c-orange text-bold mr-sm">
+											<b class="f-paragraph c-orange">￥</b>
+											<view class="f-big-title">
+												{{item.price}}
+											</view>
+										</view>
+										<view class="text-delete mr-sm c-caption f-desc" v-if="item.init_price">
+											¥{{item.init_price}}</view>
+										<view class="flex-y-baseline flex-1 c-caption f-desc">
+											<i class="iconfont icon-shijian mr-sm" :style="{ color: primaryColor }"></i>
+											{{item.time_long}}分钟
+										</view>
+									</view>
+									<view class="flex-warp">
+										<block v-if="item.car_num">
+											<button @tap.stop="changeNum(-1,index)" class="reduce"
+												:style="{borderColor:primaryColor,color:primaryColor}"><i
+													class="iconfont icon-jian-bold"></i></button>
+											<button class="addreduce clear-btn">{{item.car_num || 0}}</button>
+										</block>
+										<button @tap.stop="changeNum(1,index)" class="add"
+											:style="{background:primaryColor,borderColor:primaryColor}"><i
+												class="iconfont icon-jia-bold"></i></button>
+									</view>
+								</view>
+							</view>
+						</view>
+					</block>
+					<block v-if="showType == 'message'">
+						<view class="list-message flex-warp pd-lg" :class="[{'b-1px-t':index!=0}]"
+							v-for="(item,index) in commentList.data" :key="index">
+							<image mode="aspectFill" class="item-avatar radius" :src="item.avatarUrl"></image>
+							<view class="flex-1 ml-md">
+								<view class="flex-between">
+									<view class="flex-y-center">
+										<view class="f-paragraph c-title mr-md">{{item.nickName}}</view>
+										<view class="flex-warp">
+											<i class="iconfont iconyduixingxingshixin icon-font-color"
+												:style="{backgroundImage: aindex< item.star?`-webkit-linear-gradient(270deg, #FAD961 0%, #F76B1C 100%)`:`-webkit-linear-gradient(270deg, #f4f6f8 0%, #ccc 100%)`}"
+												v-for="(aitem,aindex) in 5" :key="aindex"></i>
+										</view>
+									</view>
+									<view class="f-icontext c-caption">{{item.create_time}}</view>
+								</view>
+								<view class="flex-warp mt-sm">
+									<view class="pt-sm pb-sm pl-md pr-md mt-sm mr-sm radius fill-body f-caption c-desc"
+										v-for="(item,index) in item.lable_text" :key="index">{{item}}</view>
+								</view>
+								<view class="f-caption c-caption mt-md">
+									<text decode="emsp" style="word-break:break-all;">{{item.text}}</text>
+								</view>
+							</view>
+						</view>
+					</block>
+				</scroll-view>
+				<view style="margin: 0 100rpx;"
+					v-if="!loading&&((showType == 'technician' && serviceList&&serviceList.length<=0) || (showType == 'message' && commentList && commentList.data &&commentList.data.length<=0))">
+					<abnor></abnor>
+				</view>
+				<block v-if="showType == 'message' && commentList.last_page > 1">
+					<view class="space-lg b-1px-t"></view>
+					<view
+						@tap.stop="$refs.technician_item.close(),$util.goUrl({url:`/user/pages/comment?id=${info.id}`})"
+						class="more-btn flex-center f-paragraph c-base radius"
+						style="width:300rpx;height: 80rpx;margin:0 auto" :style="{background:primaryColor}">查看更多
+					</view>
+					<view class="space-lg"></view>
+				</block>
+				<view class="flex-between pd-lg b-1px-t" v-if="showType == 'technician' && car_info.car_count > 0">
+					<view class="flex-center">合计：<view class="f-title c-warning text-bold ml-sm">¥{{car_info.car_price}}
+						</view>
+					</view>
+					<view @tap.stop="toOrder" class="order-btn flex-center f-desc c-base radius"
+						:style="{background: `linear-gradient(68deg, ${primaryColor}, ${subColor})`}">提交订单
+					</view>
+				</view>
+				<view class="space-safe"></view>
+				<view style="height: 98rpx;"></view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		props: {
+			from: {
+				type: String,
+				default () {
+					return 'list'
+				}
+			},
+			sid: {
+				type: Number,
+				default () {
+					return 0
+				}
+			}
+		},
+		data() {
+			return {
+				info: {},
+				showType: '',
+				car_info: {},
+				serviceList: [],
+				commentList: [],
+				loading: true,
+				lockTap: false,
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			plugAuth: state => state.config.configInfo.plugAuth,
+			userInfo: state => state.user.userInfo,
+		}),
+		methods: {
+			...mapActions([]),
+			async toShowPopup(info, key) {
+				this.info = info
+				this.showType = key
+				if (key == 'technician') {
+					let {
+						is_work = 0,
+					} = this.info
+					if (!is_work) return
+					this.serviceList = []
+					await this.getServiceList()
+				} else {
+					await this.getCommentList()
+				}
+				this.$refs.technician_item.open()
+			},
+			async getCommentList() {
+				let {
+					id: coach_id
+				} = this.info
+				let param = {
+					coach_id,
+					page: 1,
+				}
+				this.commentList = await this.$api.service.commentList(param)
+				this.loading = false
+			},
+			async getServiceList(flag = false) {
+				let {
+					id: coach_id
+				} = this.info
+				let {
+					data,
+					car_count,
+					car_price
+				} = await this.$api.service.coachServiceList({
+					coach_id
+				})
+				if (!flag) {
+					this.serviceList = data
+				}
+				this.car_info = {
+					car_count,
+					car_price
+				}
+				this.loading = false
+			},
+			// 服务详情
+			goDetail(index) {
+				let {
+					id
+				} = this.serviceList[index]
+				let {
+					sid: store_id = 0
+				} = this
+				let url = `/user/pages/detail?id=${id}&store_id=${store_id}`
+				this.$util.goUrl({
+					url
+				})
+			},
+			// 加/减数量
+			async changeNum(mol, serInd) {
+				let {
+					id: coach_id
+				} = this.info
+				let {
+					id: service_id,
+					car_num = 0,
+					car_id = 0
+				} = this.serviceList[serInd]
+				if (this.lockTap) return;
+				this.lockTap = true;
+				let methodModel = mol > 0 ? 'addCar' : 'delCar'
+				let param = mol > 0 ? {
+					service_id,
+					coach_id,
+					num: 1
+				} : {
+					id: car_id,
+					num: 1
+				}
+				if (methodModel == 'delCar' && !param.id) {
+					this.lockTap = false
+					return
+				}
+				try {
+					let add_car_id = await this.$api.order[methodModel](param)
+					this.serviceList[serInd].car_num = car_num + mol
+					if (add_car_id && mol > 0 && !car_id) {
+						this.serviceList[serInd].car_id = add_car_id
+					}
+					if (this.serviceList[serInd].car_num < 1) {
+						this.serviceList[serInd].car_id = 0
+					}
+					await this.getServiceList(true)
+					this.lockTap = false
+				} catch (e) {
+					this.lockTap = false
+				}
+			},
+			// 下单
+			toOrder() {
+				if (this.car_info.car_count < 1) {
+					this.$util.showToast({
+						title: `请选择服务`
+					})
+					return
+				}
+				let {
+					id
+				} = this.info
+				this.$refs.technician_item.close()
+				this.$util.goUrl({
+					url: `/user/pages/order?id=${id}`
+				})
+			},
+			toEmit(key) {
+				this.$emit(key)
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.technician-list-popup {
+
+		.technician-popup {
+			border-radius: 20rpx 20rpx 0 0;
+
+			.item-avatar {
+				width: 88rpx;
+				height: 88rpx;
+				background: #f4f6f8;
+			}
+
+			.icon-close {
+				font-size: 50rpx;
+				top: 30rpx;
+				right: 30rpx;
+			}
+
+			.technician-text {
+				max-height: 150rpx;
+			}
+
+			.list-content {
+				max-height: 50vh;
+
+				.list-message {
+					.item-avatar {
+						width: 52rpx;
+						height: 52rpx;
+						background: #f4f6f8;
+					}
+
+					.iconyduixingxingshixin {
+						font-size: 28rpx;
+						margin-right: 5rpx;
+						font-size: 28rpx;
+					}
+				}
+			}
+
+			.order-btn {
+				width: 200rpx;
+				height: 72rpx;
+			}
+
+		}
+
+	}
+</style>
\ No newline at end of file
diff --git a/components/time-picker-popup/README.md b/components/time-picker-popup/README.md
new file mode 100644
index 0000000..91e3133
--- /dev/null
+++ b/components/time-picker-popup/README.md
@@ -0,0 +1,87 @@
+### 使用组件
+
+```html
+<time-picker-popup ref="TimePickerPopupRef" :value="value" @confirm="confirm"></time-picker-popup>
+```
+
+### 引入组件
+
+```javascript
+import TimePickerPopup from '@/components/time-picker-popup/time-picker-popup.vue';
+```
+
+### 注册组件
+
+```javascript
+export default {
+    components: { TimePickerPopup },
+    data() {
+        return {
+            value: ['00', '00', '00', '00']
+        }
+    },
+	onReady() {
+		this.open();
+	},
+    methods: {
+        confirm(data) {
+			uni.showToast({
+				title: `${data[0]}:${data[1]}-${data[2]}:${data[3]}`
+			})
+        },
+		open() {
+			this.$refs.TimePickerPopupRef.open();
+		}
+    }
+}
+```
+
+### 参数
+
+```javascript
+// 当前选中的值
+value: {
+	type: Array,
+	default: () => (['00', '00', '00', '00'])
+},
+// 标题
+title: {
+	type: String,
+	default: '时间'
+},
+// 取消按钮文字
+cancelText: {
+	type: String,
+	default: '取消'
+},
+// 取消按钮颜色
+canceColor: {
+	type: String,
+	default: '#666666'
+},
+// 确定按钮文字
+confirmText: {
+	type: String,
+	default: '确定'
+},
+// 确定按钮颜色
+confirmColor: {
+	type: String,
+	default: '#2bb781'
+},
+// 分割符
+segmentation: {
+	type: String,
+	default: '-'
+},
+// 设置选择器中间选中框的类名 注意页面或组件的style中写了scoped时，需要在类名前写/deep/
+indicatorClass: {
+	type: String,
+	default: 'picker-view__indicator'
+},
+// 设置选择器中间选中框的样式
+indicatorStyle: {
+	type: String,
+	default: ''
+},
+```
diff --git a/components/time-picker-popup/time-picker-popup.vue b/components/time-picker-popup/time-picker-popup.vue
new file mode 100644
index 0000000..44dafef
--- /dev/null
+++ b/components/time-picker-popup/time-picker-popup.vue
@@ -0,0 +1,163 @@
+<template>
+	<!-- 时间选择器弹窗 -->
+	<uni-popup ref="popup" type="bottom" :safe-area="false">
+		<view class="custom-picker">
+			<view class="custom-picker__header">
+				<view class="cancel" :style="{ color: canceColor }" @tap="onCancel">{{ cancelText }}</view>
+				<view class="title">{{ title }}</view>
+				<view class="confirm" :style="{ color: confirmColor }" @tap="onConfirm">{{ confirmText }}</view>
+			</view>
+			<picker-view :indicator-class="indicatorClass" :indicator-style="indicatorStyle" class="picker-view"
+				:value="value" @change="bindChange" @pickstart="pickstart" @pickend="pickend">
+				<picker-view-column>
+					<view class="picker-view__item" v-for="(item,index) in rangeList[0]" :key="index">{{item}}</view>
+				</picker-view-column>
+				<picker-view-column>
+					<view class="picker-view__item" v-for="(item,index) in rangeList[1]" :key="index">{{item}}</view>
+				</picker-view-column>
+				<!-- <view class="picker-view__segmentation">{{ segmentation }}</view> -->
+				<picker-view-column>
+					<view class="picker-view__item" v-for="(item,index) in rangeList[2]" :key="index">{{item}}</view>
+				</picker-view-column>
+				<picker-view-column>
+					<view class="picker-view__item" v-for="(item,index) in rangeList[3]" :key="index">{{item}}</view>
+				</picker-view-column>
+			</picker-view>
+		</view>
+	</uni-popup>
+</template>
+
+<script>
+	import utils from './utils.js'
+	export default {
+		name: 'TimePickerPopup',
+		props: utils.props,
+		data() {
+			return {
+				rangeList: utils.range,
+				pickerValue: [0, 0, 0, 0],
+				isScoll: false, // 是否正在滚动
+			}
+		},
+		mounted() {
+
+		},
+		methods: {
+			/**
+			 * 开启弹窗
+			 */
+			open() {
+				// 判断是否传入props -> value
+				if (Array.isArray(this.value) && this.value.length) {
+					this.pickerValue = this.value.map((item, index) => this.rangeList[index].findIndex(child =>
+						child == this.value[index]));
+					console.log(this.pickerValue)
+						
+				} else {
+					this.pickerValue = [0, 0, 0, 0];
+				}
+				this.$refs.popup.open();
+			},
+			/**
+			 * 关闭弹窗
+			 */
+			close() {
+				this.$refs.popup.close();
+				// 重置选中数据
+				this.pickerValue = [0, 0, 0, 0];
+			},
+			/**
+			 * 点击确定
+			 */
+			onConfirm() {
+				if (!this.isScoll) {
+					let data = this.value || ['00', '00', '00', '00'];
+					if (this.pickerValue && this.pickerValue.length) {
+						data = this.pickerValue.map((item, index) => String(this.rangeList[index][Number(item)]));
+					}
+					this.$emit('confirm', data);
+					this.close();
+				}
+			},
+			/**
+			 * 点击取消
+			 */
+			onCancel() {
+				this.close();
+			},
+			/**
+			 * 滚动开始
+			 */
+			pickstart() {
+				this.isScoll = true;
+			},
+			/**
+			 * 滚动结束
+			 */
+			pickend() {
+				this.isScoll = false;
+			},
+			/**
+			 * 选择器改变
+			 * @param {Object} e
+			 */
+			bindChange(e) {
+				this.pickerValue = e.detail.value;
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.custom-picker {
+		width: 100%;
+		height: 620rpx;
+		background-color: #fff;
+		padding-bottom: 0;
+		padding-bottom: constant(safe-area-inset-bottom);
+		padding-bottom: env(safe-area-inset-bottom);
+		position: relative;
+		z-index: 999;
+
+		&__header {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			padding: 30rpx 40rpx;
+
+			.cancel {
+				color: #666;
+			}
+
+			.title {
+				font-size: 32rpx;
+				color: #333;
+			}
+
+			.confirm {
+				color: #2bb781;
+			}
+		}
+	}
+
+	.picker-view {
+		width: 100%;
+		height: 100%;
+		margin-top: 20rpx;
+
+		&__item {
+			line-height: 100rpx;
+			text-align: center;
+		}
+
+		/deep/ &__indicator {
+			height: 100rpx;
+			color: #2bb781;
+		}
+
+		&__segmentation {
+			display: flex;
+			align-items: center;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/time-picker-popup/utils.js b/components/time-picker-popup/utils.js
new file mode 100644
index 0000000..e093659
--- /dev/null
+++ b/components/time-picker-popup/utils.js
@@ -0,0 +1,69 @@
+// 组件props
+const props = {
+	// 当前选中的值
+	value: {
+		type: Array,
+		default: () => (['00', '00', '00', '00'])
+	},
+	// 标题
+	title: {
+		type: String,
+		default: '时间'
+	},
+	// 取消按钮文字
+	cancelText: {
+		type: String,
+		default: '取消'
+	},
+	// 取消按钮颜色
+	canceColor: {
+		type: String,
+		default: '#666666'
+	},
+	// 确定按钮文字
+	confirmText: {
+		type: String,
+		default: '确定'
+	},
+	// 确定按钮颜色
+	confirmColor: {
+		type: String,
+		default: '#2bb781'
+	},
+	// 分割符
+	segmentation: {
+		type: String,
+		default: '-'
+	},
+	// 设置选择器中间选中框的类名 注意页面或组件的style中写了scoped时，需要在类名前写/deep/
+	indicatorClass: {
+		type: String,
+		default: 'picker-view__indicator'
+	},
+	// 设置选择器中间选中框的样式
+	indicatorStyle: {
+		type: String,
+		default: ''
+	},
+}
+
+// 滚动数据
+let range = [
+	[],
+	[],
+	[],
+	[]
+];
+for (let i = 0; i < 24; i++) {
+	range[0].push(i >= 10 ? String(i) : `0${i}`);
+	range[2].push(i >= 10 ? String(i) : `0${i}`);
+}
+for (let i = 0; i < 60; i++) {
+	range[1].push(i >= 10 ? String(i) : `0${i}`);
+	range[3].push(i >= 10 ? String(i) : `0${i}`);
+}
+
+export default {
+	props,
+	range
+}
\ No newline at end of file
diff --git a/components/timeline.vue b/components/timeline.vue
new file mode 100644
index 0000000..14f4666
--- /dev/null
+++ b/components/timeline.vue
@@ -0,0 +1,210 @@
+<template>
+	<view>
+		<view class='record-box fill-base'>
+			<view class='record-item rel ml-sm b-1px-l' :style="{padding:index==list.length -1?'0 0 0 30rpx':''}"
+				v-for="(item,index) in list" :key="index">
+
+				<text class="item-tag abs" :class="[{'cur':info.pay_type > item.pay_type -1 && info.pay_type != 8}]"
+					:style="{border:`2rpx solid ${primaryColor}`,background: info.pay_type > item.pay_type -1 && info.pay_type != 8 ? primaryColor : ''}"></text>
+
+				<view class='c-title'>
+					<view class="item-text f-paragraph flex-y-baseline">
+						{{item.title}}
+						<view class="ml-md f-caption c-caption"
+							:style="{color:item.title == '签字确认' && !info.sign_img ? '' : info.pay_type > item.pay_type -1 && info.pay_type != 8 ? primaryColor : ''}">
+							{{item.title == '签字确认' && !info.sign_img ? '暂未签字确认' : info.pay_type > item.pay_type -1  && info.pay_type != 8? '' : '状态未开始' }}
+						</view>
+					</view>
+					<view class="c-caption" v-if="info.pay_type > item.pay_type*1-1 && info[item.time]">
+						{{info[item.time]}}
+					</view>
+				</view>
+				<block v-if="item.pay_type == 4 && !info.is_add && info.pay_type > 3">
+					<view @tap.stop="toMap('serout')" class="flex-y-center mt-md f-caption c-title"
+						v-if="info.serout_address">
+						<i class="iconfont iconjuli mr-sm" :style="{color:primaryColor}"></i>{{info.serout_address}}
+					</view>
+				</block>
+				<block
+					v-if="item.pay_type == 5 && !info.is_add && info.pay_type > 4 && (info.arrive_img || info.arr_address)">
+					<block v-if="info.arrive_img">
+						<!-- #ifdef H5 -->
+						<view @tap.stop="toPreviewImage('arrive_img')" class="item-img mt-md radius-5"
+							v-if="info.arrive_img">
+							<view class="h5-image item-img mt-md radius-5"
+								:style="{ backgroundImage : `url('${info.arrive_img}')`}">
+							</view>
+						</view>
+						<!-- #endif -->
+						<!-- #ifndef H5 -->
+						<image @tap.stop="toPreviewImage('arrive_img')" mode="widthFix" class="item-img mt-md radius-5"
+							:src="info.arrive_img" v-if="info.arrive_img">
+						</image>
+						<!-- #endif -->
+					</block>
+					<view @tap.stop="toMap('arr')" class="flex-y-center mt-md f-caption c-title"
+						v-if="info.arr_address">
+						<i class="iconfont iconjuli mr-sm" :style="{color:primaryColor}"></i>{{info.arr_address}}
+					</view>
+				</block>
+				<block v-if="item.title== '服务完成' && info.pay_type == 7 && (info.end_img || info.end_address)">
+					<block v-if="info.end_img">
+						<!-- #ifdef H5 -->
+						<view @tap.stop="toPreviewImage('end_img')" class="item-img mt-md radius-5">
+							<view class="h5-image item-img mt-md radius-5"
+								:style="{ backgroundImage : `url('${info.end_img}')`}">
+							</view>
+						</view>
+						<!-- #endif -->
+						<!-- #ifndef H5 -->
+						<image @tap.stop="toPreviewImage('end_img')" mode="widthFix" class="item-img mt-md radius-5"
+							:src="info.end_img">
+						</image>
+						<!-- #endif -->
+					</block>
+					<view @tap.stop="toMap('end')" class="flex-y-center mt-md f-caption c-title"
+						v-if="info.end_address">
+						<i class="iconfont iconjuli mr-sm" :style="{color:primaryColor}"></i>{{info.end_address}}
+					</view>
+				</block>
+				<block v-if="item.title== '签字确认' && info.pay_type == 7">
+					<block v-if="info.sign_img">
+						<!-- #ifdef H5 -->
+						<view @tap.stop="toPreviewImage('sign_img')" class="item-img mt-md radius-5">
+							<view class="h5-image item-img mt-md radius-5"
+								:style="{ backgroundImage : `url('${info.sign_img}')`}">
+							</view>
+						</view>
+						<!-- #endif -->
+						<!-- #ifndef H5 -->
+						<image @tap.stop="toPreviewImage('sign_img')" mode="widthFix" class="item-img mt-md radius-5"
+							:src="info.sign_img">
+						</image>
+						<!-- #endif -->
+					</block>
+					<view class="flex-between" v-if="type==1 && !info.is_add && !info.sign_img">
+						<view @tap.stop="toSign" class="item-btn flex-center mt-md c-base radius"
+							:style="{background:primaryColor}">
+							签字确认
+						</view>
+						<view></view>
+					</view>
+				</block>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState
+	} from "vuex"
+	export default {
+		name: 'timeline',
+		props: {
+			list: {
+				type: Array,
+				default () {
+					return {}
+				}
+			},
+			info: {
+				type: Object,
+				default () {
+					return {}
+				}
+			},
+			type: {
+				type: Number,
+				default () {
+					return 0
+				}
+			}
+		},
+		data() {
+			return {
+
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+		}),
+		methods: {
+			toPreviewImage(key) {
+				let curent = this.info[key]
+				this.$util.previewImage({
+					curent,
+					urls: [curent]
+				})
+			},
+			// 查看定位
+			async toMap(key) {
+				let {
+					info
+				} = this
+				await this.$util.checkAuth({
+					type: 'userLocation'
+				})
+				await uni.getLocation({
+					type: 'gcj02',
+				})
+				await uni.openLocation({
+					latitude: info[`${key}_lat`] * 1,
+					longitude: info[`${key}_lng`] * 1,
+					name: info[`${key}_address`],
+					scale: 28
+				})
+			},
+			toSign() {
+				let {
+					id
+				} = this.info
+				let url = `/user/pages/order/sign?id=${id}`
+				this.$util.goUrl({
+					url
+				})
+			}
+		},
+	}
+</script>
+
+<style lang="scss">
+	.record-item {
+		padding: 0 0 30rpx 30rpx;
+
+		.item-tag {
+			width: 14px;
+			height: 14px;
+			display: block;
+			background: #fff;
+			border-radius: 50%;
+			top: 0;
+			left: -7px;
+			transform: rotateZ(360deg);
+		}
+
+		.item-text {
+			line-height: 34rpx;
+		}
+
+		.item-img {
+			width: 180rpx;
+			min-height: 118rpx;
+		}
+
+		.item-btn {
+			width: 160rpx;
+			height: 64rpx;
+			background: #EEEEEE;
+		}
+	}
+
+	.record-item.b-1px-l::before {
+		border-left: 2px solid #ccc;
+	}
+
+	.record-item:last-child {
+		padding-bottom: 0;
+	}
+</style>
diff --git a/components/uni-nav-bar.vue b/components/uni-nav-bar.vue
new file mode 100644
index 0000000..baca195
--- /dev/null
+++ b/components/uni-nav-bar.vue
@@ -0,0 +1,247 @@
+<template>
+	<view class="uni-navbar" :class="{'uni-navbar-fixed':isFixed,'uni-navbar-shadow':hasShadow}"
+		:style="{backgroundColor:backgroundColor,height:navBarHeight+'px'}">
+		<uni-status-bar v-if="insertStatusBar"></uni-status-bar>
+		<view class="uni-navbar-header" :style="{color:color}">
+			<view class="uni-navbar-header-btns left" @tap="onClickLeft">
+				<slot name="left"></slot>
+				<view v-if="leftIcon || leftText" class="uni-navbar-btn-text"><i class="iconfont" :class="leftIcon"
+						v-if="leftIcon"></i>{{leftText || ''}}</view>
+			</view>
+			<block v-if="!onlyLeft">
+				<view class="uni-navbar-container">
+					<view v-if="title.length" class="uni-navbar-container-title">{{title}}</view>
+					<!-- 标题插槽 -->
+					<slot></slot>
+				</view>
+				<view class="uni-navbar-header-btns right" @tap="onClickRight">
+					<view v-if="rightText.length" class="uni-navbar-btn-text">{{rightText}}</view>
+					<slot name="right"></slot>
+				</view>
+			</block>
+		</view>
+	</view>
+</template>
+
+<script>
+	import uniStatusBar from '@/components/uni-status-bar.vue';
+	export default {
+		components: {
+			uniStatusBar
+		},
+		props: {
+			/**
+			 * 标题文字
+			 */
+			title: {
+				type: String,
+				default: ''
+			},
+			/**
+			 * 左侧按钮图标
+			 */
+			leftIcon: {
+				type: String,
+				default: ''
+			},
+			/**
+			 * 左侧按钮文本
+			 */
+			leftText: {
+				type: String,
+				default: ''
+			},
+			/**
+			 * 右侧按钮文本
+			 */
+			rightText: {
+				type: String,
+				default: ''
+			},
+			/**
+			 * 是否固定在顶部
+			 */
+			fixed: {
+				type: [Boolean, String],
+				default: false
+			},
+			/**
+			 * 按钮图标和文字颜色
+			 */
+			color: {
+				type: String,
+				default: '#000000'
+			},
+			/**
+			 * 背景颜色
+			 */
+			backgroundColor: {
+				type: String,
+				default: '#FFFFFF'
+			},
+			/**
+			 * 是否仅有左侧
+			 */
+			onlyLeft: {
+				type: [Boolean],
+				default: false
+			},
+			/**
+			 * 是否包含状态栏，默认固定在顶部时包含
+			 */
+			statusBar: {
+				type: [Boolean, String],
+				default: ''
+			},
+			/**
+			 * 是否使用阴影，默认根据背景色判断
+			 */
+			shadow: {
+				type: Boolean,
+				default () {
+					return false
+				}
+			},
+		},
+		computed: {
+			isFixed() {
+				return String(this.fixed) === 'true'
+			},
+			insertStatusBar() {
+				switch (String(this.statusBar)) {
+					case 'true':
+						return true
+					case 'false':
+						return false
+					default:
+						return this.isFixed
+				}
+			},
+			hasShadow() {
+				var backgroundColor = this.backgroundColor
+				switch (this.shadow) {
+					case true:
+						return true
+					case false:
+						return false
+					default:
+						return backgroundColor !== 'transparent' && backgroundColor.indexOf('rgba') < 0
+				}
+			}
+		},
+		data() {
+			return {
+				navBarHeight: uni.getSystemInfoSync().statusBarHeight * 1 + 44
+			}
+		},
+		methods: {
+			/**
+			 * 左侧按钮点击事件
+			 */
+			onClickLeft() {
+				let {
+					leftIcon = ''
+				} = this
+				if (leftIcon == 'icon-left') {
+					this.$util.goUrl({
+						url: 1,
+						openType: `navigateBack`
+					})
+				} else if (leftIcon == 'iconshouye11') {
+					this.$util.goUrl({
+						url: `/pages/service`,
+						openType: 'reLaunch'
+					})
+				} else {
+					this.$emit('clickLeft')
+					this.$emit('click-left')
+				}
+			},
+			/**
+			 * 右侧按钮点击事件
+			 */
+			onClickRight() {
+				this.$emit('clickRight')
+				this.$emit('click-right')
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.uni-navbar {
+		display: block;
+		position: relative;
+		width: 100%;
+		/* background-color: #FFFFFF; */
+		overflow: hidden;
+	}
+
+	.uni-navbar-shadow {
+		box-shadow: 0 1px 6px #ccc;
+	}
+
+	.uni-navbar.uni-navbar-fixed {
+		position: fixed;
+		z-index: 9999;
+	}
+
+	.uni-navbar-header {
+		display: flex;
+		flex-direction: row;
+		width: 100%;
+		/* #ifdef MP-BAIDU */
+		height: 38px;
+		line-height: 38px;
+		font-size: 15px;
+		/* #endif */
+		/* #ifndef MP-BAIDU */
+		height: 44px;
+		line-height: 44px;
+		font-size: 16px;
+		/* #endif */
+	}
+
+	.uni-navbar-header-btns {
+		display: inline-flex;
+		flex-wrap: nowrap;
+		flex-shrink: 0;
+		width: 100px;
+	}
+
+	.uni-navbar-header-btns.left {
+		padding-left: 30rpx;
+		display: flex;
+		align-items: center;
+
+		.iconfont {
+			font-size: 36rpx;
+		}
+	}
+
+	.uni-navbar-header-btns.right {
+		padding-right: 30rpx;
+	}
+
+	.uni-navbar-container {
+		width: 100%;
+		margin: 0 5px;
+	}
+
+	.uni-navbar-container-title {
+		/* #ifdef MP-BAIDU */
+		height: 38px;
+		line-height: 38px;
+		/* #endif */
+		/* #ifndef MP-BAIDU */
+		height: 44px;
+		line-height: 44px;
+		/* #endif */
+		font-size: 15px;
+		text-align: center;
+		/* #ifndef H5 */
+		padding-right: 30px;
+		/* #endif */
+		max-width: 360rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/components/uni-popup.vue b/components/uni-popup.vue
new file mode 100644
index 0000000..32004f6
--- /dev/null
+++ b/components/uni-popup.vue
@@ -0,0 +1,209 @@
+<template>
+	<view v-if="showPopup" class="uni-popup" :style="{top: top,zIndex: zIndex}">
+		<view @click="close(true)" :class="[ani, animation ? 'ani' : '', !custom ? 'uni-custom' : '']"
+			class="uni-popup__mask" :style="{zIndex: zIndex}" />
+		<view @click="close(true)" :class="[type, ani, animation ? 'ani' : '', !custom ? 'uni-custom' : '']"
+			class="uni-popup__wrapper" :style="{zIndex: zIndex+1,left: type!='center'?left:''}">
+			<view class="uni-popup__wrapper-box" @click.stop="clear">
+				<slot />
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'UniPopup',
+		props: {
+			// 开启动画
+			animation: {
+				type: Boolean,
+				default: true
+			},
+			// 弹出层类型，可选值，top: 顶部弹出层；bottom：底部弹出层；center：全屏弹出层
+			type: {
+				type: String,
+				default: 'center'
+			},
+			// 是否开启自定义
+			custom: {
+				type: Boolean,
+				default: false
+			},
+			maskClick: {
+				type: Boolean,
+				default: true
+			},
+			show: {
+				type: Boolean,
+				default: true
+			},
+			top: {
+				type: String,
+				default: '0rpx'
+			},
+			left: {
+				type: String,
+				default: '0rpx'
+			},
+			zIndex: {
+				type: [Number],
+				default () {
+					return 998
+				}
+			},
+		},
+		data() {
+			return {
+				ani: '',
+				showPopup: false
+			}
+		},
+		watch: {
+			show(newValue) {
+				if (newValue) {
+					this.open()
+				} else {
+					this.close()
+				}
+			}
+		},
+		created() {},
+		methods: {
+			clear() {
+				this.$emit('clear', {
+					show: false
+				})
+			},
+			open() {
+				this.$emit('change', {
+					show: true
+				})
+				this.showPopup = true
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.ani = 'uni-' + this.type
+					}, 30)
+				})
+			},
+			close(type) {
+				if (!this.maskClick && type) return
+				this.$emit('change', {
+					show: false
+				})
+				this.ani = ''
+				this.$nextTick(() => {
+					setTimeout(() => {
+						this.showPopup = false
+					}, 300)
+				})
+			}
+		}
+	}
+</script>
+<style lang="scss">
+	@charset "UTF-8";
+
+	.uni-popup {
+		position: fixed;
+		top: 0;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		overflow: hidden
+	}
+
+	.uni-popup__mask {
+		position: absolute;
+		top: 0;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		background: rgba(0, 0, 0, .4);
+		opacity: 0
+	}
+
+	.uni-popup__mask.ani {
+		transition: all .3s
+	}
+
+	.uni-popup__mask.uni-bottom,
+	.uni-popup__mask.uni-center,
+	.uni-popup__mask.uni-top {
+		opacity: 1
+	}
+
+	.uni-popup__wrapper {
+		position: absolute;
+		box-sizing: border-box
+	}
+
+	.uni-popup__wrapper.ani {
+		transition: all .3s
+	}
+
+	.uni-popup__wrapper.top {
+		top: 0;
+		width: 100%;
+		transform: translateY(-100%)
+	}
+
+	.uni-popup__wrapper.bottom {
+		bottom: 0;
+		width: 100%;
+		transform: translateY(100%)
+	}
+
+	.uni-popup__wrapper.center {
+		width: 100%;
+		height: 100%;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+		transform: scale(1.2);
+		opacity: 0
+	}
+
+	.uni-popup__wrapper-box {
+		position: relative;
+		box-sizing: border-box
+	}
+
+	.uni-popup__wrapper.uni-custom .uni-popup__wrapper-box {
+		/* padding: 30upx; */
+		// background: #fff
+	}
+
+	.uni-popup__wrapper.uni-custom.center .uni-popup__wrapper-box {
+		position: relative;
+		/* 		max-width: 80%;
+		max-height: 80%; */
+		overflow-y: scroll;
+		border-radius: 25rpx;
+	}
+
+	.uni-popup__wrapper.uni-custom.bottom .uni-popup__wrapper-box {
+		width: 100%;
+		// max-height: 500px;
+		overflow-y: scroll;
+		border-radius: 25rpx 25rpx 0 0;
+	}
+
+	.uni-popup__wrapper.uni-custom.top .uni-popup__wrapper-box {
+		width: 100%;
+		// max-height: 500px;
+		overflow-y: scroll;
+		border-radius: 0 0 25rpx 25rpx;
+	}
+
+	.uni-popup__wrapper.uni-bottom,
+	.uni-popup__wrapper.uni-top {
+		transform: translateY(0)
+	}
+
+	.uni-popup__wrapper.uni-center {
+		transform: scale(1);
+		opacity: 1
+	}
+</style>
\ No newline at end of file
diff --git a/components/uni-segmented-control.vue b/components/uni-segmented-control.vue
new file mode 100644
index 0000000..73d07c7
--- /dev/null
+++ b/components/uni-segmented-control.vue
@@ -0,0 +1,160 @@
+<template>
+	<view class="segmented-control" :class="styleType" :style="wrapStyle">
+		<view v-for="(item, index) in values" class="segmented-control-item" :class="styleType" :key="index"
+			:style="index === currentIndex ? activeStyle : itemStyle" @click="onClick(index)">
+			{{item.title}}
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'uni-segmented-control',
+		props: {
+			current: {
+				type: Number,
+				default: 0
+			},
+			values: {
+				type: Array,
+				default () {
+					return [];
+				}
+			},
+			activeColor: {
+				type: String,
+				default: '#007aff'
+			},
+			styleType: {
+				type: String,
+				default: 'button'
+			},
+			haveBorder: {
+				type: Boolean,
+				default () {
+					return false
+				}
+			},
+			lockTap: {
+				type: Boolean,
+				default () {
+					return true
+				}
+			}
+		},
+		data() {
+			return {
+				currentIndex: this.current
+			}
+		},
+		watch: {
+			current(val) {
+				if (val !== this.currentIndex) {
+					this.currentIndex = val;
+				}
+			}
+		},
+		computed: {
+			wrapStyle() {
+				let styleString = '';
+				switch (this.styleType) {
+					case 'text':
+						styleString = `border:0;`;
+						break;
+					default:
+						styleString = this.haveBorder ? `border: 1rpx solid ${this.activeColor};` : ``;
+						break;
+				}
+				return styleString;
+			},
+			itemStyle() {
+				let styleString = '';
+				switch (this.styleType) {
+					case 'text':
+						styleString = `color:#000;border-left:0;`;
+						break;
+					default:
+						styleString = `color:#222;background:#eddbba;border-color:#fff;`;
+						break;
+				}
+				return styleString;
+			},
+			activeStyle() {
+				let styleString = '';
+				switch (this.styleType) {
+					case 'text':
+						styleString = `color:${this.activeColor};border-left:0;border-bottom-style:solid;`;
+						break;
+					default:
+						styleString = `color:#fff;border-color:${this.activeColor};background-color:${this.activeColor}`;
+						break;
+				}
+				return styleString;
+			}
+		},
+		methods: {
+			onClick(index) {
+				let {
+					lockTap,
+					currentIndex
+				} = this
+				console.log(lockTap, currentIndex);
+				if (currentIndex !== index || !lockTap) {
+					this.currentIndex = index;
+					this.$emit('clickItem', index);
+				}
+			}
+		},
+	}
+</script>
+
+<style>
+	.segmented-control {
+		display: flex;
+		flex-direction: row;
+		justify-content: center;
+		font-size: 26rpx;
+		border-radius: 5rpx;
+		box-sizing: border-box;
+		margin: 0 auto;
+		overflow: hidden;
+	}
+
+	.segmented-control.button {
+		border-radius: 54rpx;
+		box-sizing: border-box;
+	}
+
+	.segmented-control.text {
+		border: 0;
+		border-radius: 0rpx;
+	}
+
+
+	.segmented-control-item {
+		flex: 1;
+		text-align: center;
+		line-height: 54rpx;
+		box-sizing: border-box;
+	}
+
+	.segmented-control-item.button {
+		border-left: 1upx solid;
+	}
+
+	.segmented-control-item.button:first-child {
+		border-radius: 54rpx 0 0 54rpx;
+	}
+
+	.segmented-control-item.button:last-child {
+		border-radius: 0 54rpx 54rpx 0;
+	}
+
+	.segmented-control-item.text {
+		border-left: 0;
+	}
+
+	.segmented-control-item:first-child {
+		border-left-width: 0;
+	}
+</style>
diff --git a/components/uni-status-bar.vue b/components/uni-status-bar.vue
new file mode 100644
index 0000000..f35d1dc
--- /dev/null
+++ b/components/uni-status-bar.vue
@@ -0,0 +1,29 @@
+<template>
+	<view class="uni-status-bar" :style="style">
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	export default {
+		computed: {
+			style() {
+				//#ifdef APP-PLUS
+				return ''
+				//#endif
+				//#ifndef APP-PLUS
+				return `height:${uni.getSystemInfoSync().statusBarHeight}px`
+				//#endif
+			}
+		}
+	}
+</script>
+
+<style>
+	.uni-status-bar {
+		display: block;
+		width: 100%;
+		height: 20px;
+		height: var(--status-bar-height);
+	}
+</style>
diff --git a/components/upload.vue b/components/upload.vue
new file mode 100644
index 0000000..64c66ac
--- /dev/null
+++ b/components/upload.vue
@@ -0,0 +1,353 @@
+<template>
+	<view
+		:class="[{'flex-warp':!imgclass || imgclass =='mini'},{'flex-center flex-column':imgclass && imgclass != 'mini'}]">
+		<block v-for="(item,index) in imagelist" :key="index">
+			<view class="rel item-child radius-16" :class="[imgclass,{'margin': imgsize > 1}]"
+				:style="{border:imgclass=='apply'?`4rpx solid ${primaryColor}`:''}">
+				<!-- #ifdef H5 -->
+				<view class="upload-img radius-16" v-if="filetype == 'picture'">
+					<view @tap.stop="previewImage(item,imagelist)" class="h5-image upload-img radius-16"
+						:style="{ backgroundImage : `url('${item.path}')`}">
+					</view>
+				</view>
+				<!-- #endif -->
+				<!-- #ifndef H5 -->
+				<image mode="aspectFill" @tap.stop="previewImage(item,imagelist)" class="upload-img radius-16"
+					:src="item.path" v-if="filetype == 'picture'"></image>
+				<!-- #endif -->
+
+				<video :id="`video_${index}`" class="upload-video rel radius-16" :loop="false" enable-play-gesture
+					enable-progress-gesture :show-center-play-btn="true" :controls="true" :src="item.path"
+					:data-id="item.id" objectFit="cover" :data-index="index" @play="onPlay" @pause="onPause"
+					@ended="onEnded" @timeupdate="onTimeUpdate" @waiting="onWaiting" @progress="onProgress"
+					@loadedmetadata="onLoadedMetaData" v-if="filetype == 'video'">
+					<cover-view @tap="toDel(index)" class="item-delete abs flex-center f-icontext c-base"
+						:style="{background:primaryColor}">
+						删除
+					</cover-view>
+				</video>
+
+				<block v-if="filetype == 'picture'">
+					<view @tap="toDel(index)" class="guanbi abs flex-center" :class="[imgclass]" style="z-index: 1;"
+						v-if="imgsize>1"><i class="iconfont icon-add rotate-45 c-base"></i></view>
+					<view @tap="chooseImage" class="flex-center flex-column item-child upload-item radius-16 abs"
+						:class="[imgclass]" style="top:0;margin-top:0;background:rgba(0,0,0,0.5);" v-else>
+						<view class="upload-icon flex-center c-title radius-10">
+							<i class="iconfont icon-camera"></i>
+						</view>
+						<view class="f-caption c-base mt-sm">重新上传</view>
+					</view>
+				</block>
+			</view>
+		</block>
+		<view @tap="chooseImage" class="radius-16 flex-center flex-column item-child upload-item fill-body radius-16"
+			:class="[imgclass,{'margin': imgsize > 1}]"
+			:style="{border:imgclass=='apply'?`4rpx solid ${primaryColor}`:''}" v-if="imagelist.length < imgsize">
+			<view class="upload-icon flex-center c-title radius-10">
+				<i class="iconfont icon-camera"></i>
+			</view>
+			<view class="f-caption c-caption mt-sm" v-if="text">{{text}}</view>
+			<view class="cur-imgsize f-caption c-caption" v-if="imgsize>1">{{`${imagelist.length}/${imgsize}`}}</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+	} from 'vuex';
+	export default {
+		props: {
+			// 图片列表
+			imagelist: {
+				type: Array,
+				default () {
+					return []
+				}
+			},
+			// 图片参数名
+			imgtype: {
+				type: String,
+				default () {
+					return ''
+				}
+			},
+			// 图片张数
+			imgsize: {
+				type: Number,
+				default () {
+					return 9
+				}
+			},
+			// 上传类型
+			filetype: {
+				type: String,
+				default () {
+					return 'picture'
+				}
+			},
+			// 图片样式
+			imgclass: {
+				type: String,
+				default () {
+					return ''
+				}
+			},
+			// 备注信息
+			text: {
+				type: String,
+				default () {
+					return ''
+				}
+			},
+			// 视频大小限制
+			videoSize: {
+				type: Number,
+				default () {
+					return 50
+				}
+			},
+			// 上传类型
+			sourceType: {
+				type: Number,
+				default () {
+					return 1
+				}
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			userInfo: state => state.user.userInfo
+		}),
+		methods: {
+			previewImage(current, urls) {
+				let res_urls = [];
+				urls = this.$util.deepCopy(urls);
+				urls.forEach((item, index) => {
+					res_urls.push(item.path)
+				})
+				uni.previewImage({
+					current: current.path,
+					urls: res_urls,
+				})
+			},
+			async toDel(index) {
+				let fileName = this.filetype == 'picture' ? '图片' : '视频'
+				let [res_del, {
+					confirm
+				}] = await uni.showModal({
+					content: `请确认是否要删除${fileName}`,
+				})
+				if (!confirm) return;
+				this.imagelist.splice(index, 1);
+				this.$emit('del', {
+					imgtype: this.imgtype,
+					imagelist: this.imagelist
+				});
+			},
+			async chooseImage() {
+				let {
+					imgtype,
+					imgsize,
+					filetype,
+					videoSize,
+					sourceType
+				} = this;
+				let imagelist = this.$util.deepCopy(this.imagelist)
+				let is_upload_img = filetype == 'picture'
+				let chooseModel = is_upload_img ? 'chooseImage' : 'chooseVideo'
+				let count = 1
+				// #ifndef H5
+				count = imgsize == 1 ? 1 : imgsize - imagelist.length * 1
+				// #endif
+				let param = {
+					count
+				}
+				if (is_upload_img) {
+					param.sizeType = ['compressed']
+				}
+				param.sourceType = sourceType == 1 ? ['camera', 'album'] : ['camera']
+				let [res_upload, res_info] = await uni[chooseModel](param)
+				if (res_upload) return
+				let {
+					size = 0,
+						tempFiles,
+						tempFilePath = ''
+				} = res_info
+				console.log(is_upload_img, size, size / 1024 / 1024, "=====size")
+				if (filetype == 'video' && size / 1024 / 1024 > videoSize) {
+					this.$util.showToast({
+						title: `上传视频大小超过限制${videoSize}M`
+					})
+					return
+				}
+				let filePath = [];
+				// 格式化图片参数
+				this.$util.showLoading({
+					title: "上传中"
+				});
+				console.log("======tempFiles==tempFilePath", tempFiles, tempFilePath)
+				if (is_upload_img) {
+					for (let i = 0; i < tempFiles.length; i++) {
+						let {
+							attachment_path: path
+						} = await this.$api.base.uploadFile({
+							filePath: tempFiles[i].path,
+							formData: {
+								type: this.filetype
+							}
+						})
+						if (imgsize > 1) {
+							imagelist.push({
+								path
+							})
+						} else {
+							imagelist = [{
+								path
+							}]
+						}
+					}
+				} else {
+					let {
+						attachment_path: path
+					} = await this.$api.base.uploadFile({
+						filePath: tempFilePath,
+						formData: {
+							type: this.filetype
+						}
+					})
+					imagelist.push({
+						path
+					})
+				}
+				this.$util.hideAll()
+				this.$emit('upload', {
+					imgtype,
+					imagelist
+				});
+			},
+			onPlay(e) {},
+			onPause(e) {},
+			onEnded(e) {},
+			onTimeUpdate(e) {},
+			onWaiting(e) {},
+			onProgress(e) {},
+			onLoadedMetaData(e) {},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.item-child {
+		width: 216rpx;
+		height: 216rpx;
+		background: #F7F7F7;
+		margin-bottom: 20rpx;
+	}
+
+	.margin {
+		margin: 0 21rpx 21rpx 0;
+	}
+
+	.item-child:nth-child(3n) {
+		margin-right: 0rpx;
+	}
+
+	.item-child.sm {
+		width: 140rpx;
+		height: 140rpx;
+	}
+
+	.item-child.apply {
+		width: 176rpx;
+		height: 176rpx;
+	}
+
+	.item-child.mini {
+		width: 196rpx;
+		height: 196rpx;
+	}
+
+	.item-child.md {
+		width: 335rpx;
+		height: 210rpx;
+		margin: 0rpx;
+	}
+
+	.item-child.lg {
+		width: 686rpx;
+		height: 400rpx;
+	}
+
+	.upload-img,
+	.upload-video {
+		width: 100%;
+		height: 100%;
+	}
+
+
+	.upload-video {
+		.item-delete {
+			width: 60rpx;
+			height: 32rpx;
+			top: 0;
+			right: 0;
+			z-index: 2;
+		}
+	}
+
+	.upload-item {
+
+		.upload-icon {
+			width: 80rpx;
+			height: 76rpx;
+			background: #FFFFFF;
+
+			.iconfont {
+				font-size: 40rpx;
+				display: block;
+			}
+		}
+
+		.cur-imgsize {
+			line-height: 1.1;
+		}
+
+	}
+
+	.upload-item.margin {
+		margin-bottom: 0;
+	}
+
+	.item-child.apply {
+		.upload-item {
+			width: 168rpx;
+			height: 168rpx;
+		}
+	}
+
+	.guanbi {
+		width: 32rpx;
+		height: 32rpx;
+		background: rgba(0, 0, 0, 0.2);
+		border-radius: 0 15rpx 0 0;
+		top: 0rpx;
+		right: 0rpx;
+		z-index: 1;
+
+		.iconfont {
+			font-size: 28rpx;
+		}
+	}
+
+	.guanbi.lg {
+		width: 50rpx;
+		height: 50rpx;
+
+		.iconfont {
+			font-size: 38rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/components/w-picker/areadata/areadata.js b/components/w-picker/areadata/areadata.js
new file mode 100644
index 0000000..b07228c
--- /dev/null
+++ b/components/w-picker/areadata/areadata.js
@@ -0,0 +1 @@
+const cityData=[{value:'110000',label:'北京市',children:[{value:"110100",label:"北京市",children:[{value:"110101",label:"东城区"},{value:"110102",label:"西城区"},{value:"110105",label:"朝阳区"},{value:"110106",label:"丰台区"},{value:"110107",label:"石景山区"},{value:"110108",label:"海淀区"},{value:"110109",label:"门头沟区"},{value:"110111",label:"房山区"},{value:"110112",label:"通州区"},{value:"110113",label:"顺义区"},{value:"110114",label:"昌平区"},{value:"110115",label:"大兴区"},{value:"110116",label:"怀柔区"},{value:"110117",label:"平谷区"},{value:"110118",label:"密云区"},{value:"110119",label:"延庆区"}]}]},{value:'120000',label:'天津市',children:[{value:"120100",label:"天津市",children:[{value:"120101",label:"和平区"},{value:"120102",label:"河东区"},{value:"120103",label:"河西区"},{value:"120104",label:"南开区"},{value:"120105",label:"河北区"},{value:"120106",label:"红桥区"},{value:"120110",label:"东丽区"},{value:"120111",label:"西青区"},{value:"120112",label:"津南区"},{value:"120113",label:"北辰区"},{value:"120114",label:"武清区"},{value:"120115",label:"宝坻区"},{value:"120116",label:"滨海新区"},{value:"120117",label:"宁河区"},{value:"120118",label:"静海区"},{value:"120119",label:"蓟州区"}]}]},{value:'130000',label:'河北省',children:[{value:"130100",label:"石家庄市",children:[{value:"130102",label:"长安区"},{value:"130104",label:"桥西区"},{value:"130105",label:"新华区"},{value:"130107",label:"井陉矿区"},{value:"130108",label:"裕华区"},{value:"130109",label:"藁城区"},{value:"130110",label:"鹿泉区"},{value:"130111",label:"栾城区"},{value:"130121",label:"井陉县"},{value:"130123",label:"正定县"},{value:"130125",label:"行唐县"},{value:"130126",label:"灵寿县"},{value:"130127",label:"高邑县"},{value:"130128",label:"深泽县"},{value:"130129",label:"赞皇县"},{value:"130130",label:"无极县"},{value:"130131",label:"平山县"},{value:"130132",label:"元氏县"},{value:"130133",label:"赵县"},{value:"130181",label:"辛集市"},{value:"130183",label:"晋州市"},{value:"130184",label:"新乐市"},{value:"130172",label:"石家庄循环化工园区"},{value:"130171",label:"石家庄高新技术产业开发区"}]},{value:"130200",label:"唐山市",children:[{value:"130202",label:"路南区"},{value:"130203",label:"路北区"},{value:"130204",label:"古冶区"},{value:"130205",label:"开平区"},{value:"130207",label:"丰南区"},{value:"130208",label:"丰润区"},{value:"130209",label:"曹妃甸区"},{value:"130223",label:"滦县"},{value:"130224",label:"滦南县"},{value:"130225",label:"乐亭县"},{value:"130227",label:"迁西县"},{value:"130229",label:"玉田县"},{value:"130281",label:"遵化市"},{value:"130283",label:"迁安市"},{value:"130271",label:"唐山市芦台经济技术开发区"},{value:"130272",label:"唐山市汉沽管理区"},{value:"130273",label:"唐山高新技术产业开发区"},{value:"130274",label:"河北唐山海港经济开发区"}]},{value:"130300",label:"秦皇岛市",children:[{value:"130302",label:"海港区"},{value:"130303",label:"山海关区"},{value:"130304",label:"北戴河区"},{value:"130321",label:"青龙满族自治县"},{value:"130322",label:"昌黎县"},{value:"130306",label:"抚宁区"},{value:"130324",label:"卢龙县"},{value:"130371",label:"秦皇岛市经济技术开发区"},{value:"130372",label:"北戴河新区"}]},{value:"130400",label:"邯郸市",children:[{value:"130402",label:"邯山区"},{value:"130403",label:"丛台区"},{value:"130404",label:"复兴区"},{value:"130406",label:"峰峰矿区"},{value:"130421",label:"邯郸县"},{value:"130423",label:"临漳县"},{value:"130424",label:"成安县"},{value:"130425",label:"大名县"},{value:"130426",label:"涉县"},{value:"130427",label:"磁县"},{value:"130407",label:"肥乡区"},{value:"130408",label:"永年区"},{value:"130430",label:"邱县"},{value:"130431",label:"鸡泽县"},{value:"130432",label:"广平县"},{value:"130433",label:"馆陶县"},{value:"130434",label:"魏县"},{value:"130435",label:"曲周县"},{value:"130481",label:"武安市"},{value:"130471",label:"邯郸经济技术开发区"},{value:"130473",label:"邯郸冀南新区"}]},{value:"130500",label:"邢台市",children:[{value:"130502",label:"桥东区"},{value:"130503",label:"桥西区"},{value:"130521",label:"邢台县"},{value:"130522",label:"临城县"},{value:"130523",label:"内丘县"},{value:"130524",label:"柏乡县"},{value:"130525",label:"隆尧县"},{value:"130526",label:"任县"},{value:"130527",label:"南和县"},{value:"130528",label:"宁晋县"},{value:"130529",label:"巨鹿县"},{value:"130530",label:"新河县"},{value:"130531",label:"广宗县"},{value:"130532",label:"平乡县"},{value:"130533",label:"威县"},{value:"130534",label:"清河县"},{value:"130535",label:"临西县"},{value:"130581",label:"南宫市"},{value:"130582",label:"沙河市"},{value:"130571",label:"河北邢台经济开发区"}]},{value:"130600",label:"保定市",children:[{value:"130602",label:"竞秀区"},{value:"130606",label:"莲池区"},{value:"130607",label:"满城区"},{value:"130608",label:"清苑区"},{value:"130623",label:"涞水县"},{value:"130624",label:"阜平县"},{value:"130609",label:"徐水区"},{value:"130626",label:"定兴县"},{value:"130627",label:"唐县"},{value:"130628",label:"高阳县"},{value:"130629",label:"容城县"},{value:"130630",label:"涞源县"},{value:"130631",label:"望都县"},{value:"130632",label:"安新县"},{value:"130633",label:"易县"},{value:"130634",label:"曲阳县"},{value:"130635",label:"蠡县"},{value:"130636",label:"顺平县"},{value:"130637",label:"博野县"},{value:"130638",label:"雄县"},{value:"130681",label:"涿州市"},{value:"130682",label:"定州市"},{value:"130683",label:"安国市"},{value:"130684",label:"高碑店市"},{value:"130671",label:"保定高新技术产业开发区"},{value:"130672",label:"保定白沟新城"}]},{value:"130700",label:"张家口市",children:[{value:"130702",label:"桥东区"},{value:"130703",label:"桥西区"},{value:"130705",label:"宣化区"},{value:"130706",label:"下花园区"},{value:"130708",label:"万全区"},{value:"130709",label:"崇礼区"},{value:"130722",label:"张北县"},{value:"130723",label:"康保县"},{value:"130724",label:"沽源县"},{value:"130725",label:"尚义县"},{value:"130726",label:"蔚县"},{value:"130727",label:"阳原县"},{value:"130728",label:"怀安县"},{value:"130730",label:"怀来县"},{value:"130731",label:"涿鹿县"},{value:"130732",label:"赤城县"},{value:"130733",label:"崇礼县"},{value:"130771",label:"张家口市高新技术产业开发区"},{value:"130772",label:"张家口市察北管理区"},{value:"130773",label:"张家口市塞北管理区"}]},{value:"130800",label:"承德市",children:[{value:"130802",label:"双桥区"},{value:"130803",label:"双滦区"},{value:"130804",label:"鹰手营子矿区"},{value:"130821",label:"承德县"},{value:"130822",label:"兴隆县"},{value:"130881",label:"平泉市"},{value:"130824",label:"滦平县"},{value:"130825",label:"隆化县"},{value:"130826",label:"丰宁满族自治县"},{value:"130827",label:"宽城满族自治县"},{value:"130828",label:"围场满族蒙古族自治县"},{value:"130871",label:"承德高新技术产业开发区"}]},{value:"130900",label:"沧州市",children:[{value:"130902",label:"新华区"},{value:"130903",label:"运河区"},{value:"130921",label:"沧县"},{value:"130922",label:"青县"},{value:"130923",label:"东光县"},{value:"130924",label:"海兴县"},{value:"130925",label:"盐山县"},{value:"130926",label:"肃宁县"},{value:"130927",label:"南皮县"},{value:"130928",label:"吴桥县"},{value:"130929",label:"献县"},{value:"130930",label:"孟村回族自治县"},{value:"130981",label:"泊头市"},{value:"130982",label:"任丘市"},{value:"130983",label:"黄骅市"},{value:"130984",label:"河间市"},{value:"130971",label:"河北沧州经济开发区"},{value:"130972",label:"沧州高新技术产业开发区"},{value:"130973",label:"沧州渤海新区"}]},{value:"131000",label:"廊坊市",children:[{value:"131002",label:"安次区"},{value:"131003",label:"广阳区"},{value:"131022",label:"固安县"},{value:"131023",label:"永清县"},{value:"131024",label:"香河县"},{value:"131025",label:"大城县"},{value:"131026",label:"文安县"},{value:"131028",label:"大厂回族自治县"},{value:"131071",label:"廊坊经济技术开发区"},{value:"131081",label:"霸州市"},{value:"131082",label:"三河市"}]},{value:"131100",label:"衡水市",children:[{value:"131102",label:"桃城区"},{value:"131121",label:"枣强县"},{value:"131122",label:"武邑县"},{value:"131123",label:"武强县"},{value:"131124",label:"饶阳县"},{value:"131125",label:"安平县"},{value:"131126",label:"故城县"},{value:"131127",label:"景县"},{value:"131128",label:"阜城县"},{value:"131103",label:"冀州区"},{value:"131182",label:"深州市"},{value:"131172",label:"衡水滨湖新区"},{value:"131171",label:"河北衡水经济开发区"}]}]},{value:'140000',label:'山西省',children:[{value:"140100",label:"太原市",children:[{value:"140105",label:"小店区"},{value:"140106",label:"迎泽区"},{value:"140107",label:"杏花岭区"},{value:"140108",label:"尖草坪区"},{value:"140109",label:"万柏林区"},{value:"140110",label:"晋源区"},{value:"140121",label:"清徐县"},{value:"140122",label:"阳曲县"},{value:"140123",label:"娄烦县"},{value:"140181",label:"古交市"},{value:"140171",label:"山西转型综合改革示范区"}]},{value:"140200",label:"大同市",children:[{value:"140202",label:"城区"},{value:"140203",label:"矿区"},{value:"140211",label:"南郊区"},{value:"140212",label:"新荣区"},{value:"140221",label:"阳高县"},{value:"140222",label:"天镇县"},{value:"140223",label:"广灵县"},{value:"140224",label:"灵丘县"},{value:"140225",label:"浑源县"},{value:"140226",label:"左云县"},{value:"140227",label:"大同县"},{value:"140271",label:"山西大同经济开发区"}]},{value:"140300",label:"阳泉市",children:[{value:"140302",label:"城区"},{value:"140303",label:"矿区"},{value:"140311",label:"郊区"},{value:"140321",label:"平定县"},{value:"140322",label:"盂县"},{value:"140371",label:"山西阳泉经济开发区"}]},{value:"140400",label:"长治市",children:[{value:"140421",label:"长治县"},{value:"140423",label:"襄垣县"},{value:"140424",label:"屯留县"},{value:"140425",label:"平顺县"},{value:"140426",label:"黎城县"},{value:"140427",label:"壶关县"},{value:"140428",label:"长子县"},{value:"140429",label:"武乡县"},{value:"140430",label:"沁县"},{value:"140431",label:"沁源县"},{value:"140481",label:"潞城市"},{value:"140402",label:"城区"},{value:"140411",label:"郊区"},{value:"140471",label:"山西长治高新技术产业园区"}]},{value:"140500",label:"晋城市",children:[{value:"140502",label:"城区"},{value:"140521",label:"沁水县"},{value:"140522",label:"阳城县"},{value:"140524",label:"陵川县"},{value:"140525",label:"泽州县"},{value:"140581",label:"高平市"}]},{value:"140600",label:"朔州市",children:[{value:"140602",label:"朔城区"},{value:"140603",label:"平鲁区"},{value:"140621",label:"山阴县"},{value:"140622",label:"应县"},{value:"140623",label:"右玉县"},{value:"140624",label:"怀仁县"},{value:"140671",label:"山西朔州经济开发区"}]},{value:"140700",label:"晋中市",children:[{value:"140702",label:"榆次区"},{value:"140721",label:"榆社县"},{value:"140722",label:"左权县"},{value:"140723",label:"和顺县"},{value:"140724",label:"昔阳县"},{value:"140725",label:"寿阳县"},{value:"140726",label:"太谷县"},{value:"140727",label:"祁县"},{value:"140728",label:"平遥县"},{value:"140729",label:"灵石县"},{value:"140781",label:"介休市"}]},{value:"140800",label:"运城市",children:[{value:"140802",label:"盐湖区"},{value:"140821",label:"临猗县"},{value:"140822",label:"万荣县"},{value:"140823",label:"闻喜县"},{value:"140824",label:"稷山县"},{value:"140825",label:"新绛县"},{value:"140826",label:"绛县"},{value:"140827",label:"垣曲县"},{value:"140828",label:"夏县"},{value:"140829",label:"平陆县"},{value:"140830",label:"芮城县"},{value:"140881",label:"永济市"},{value:"140882",label:"河津市"}]},{value:"140900",label:"忻州市",children:[{value:"140902",label:"忻府区"},{value:"140921",label:"定襄县"},{value:"140922",label:"五台县"},{value:"140923",label:"代县"},{value:"140924",label:"繁峙县"},{value:"140925",label:"宁武县"},{value:"140926",label:"静乐县"},{value:"140927",label:"神池县"},{value:"140928",label:"五寨县"},{value:"140929",label:"岢岚县"},{value:"140930",label:"河曲县"},{value:"140931",label:"保德县"},{value:"140932",label:"偏关县"},{value:"140981",label:"原平市"},{value:"140971",label:"五台山风景名胜区"}]},{value:"141000",label:"临汾市",children:[{value:"141002",label:"尧都区"},{value:"141021",label:"曲沃县"},{value:"141022",label:"翼城县"},{value:"141023",label:"襄汾县"},{value:"141024",label:"洪洞县"},{value:"141025",label:"古县"},{value:"141026",label:"安泽县"},{value:"141027",label:"浮山县"},{value:"141028",label:"吉县"},{value:"141029",label:"乡宁县"},{value:"141030",label:"大宁县"},{value:"141031",label:"隰县"},{value:"141032",label:"永和县"},{value:"141033",label:"蒲县"},{value:"141034",label:"汾西县"},{value:"141081",label:"侯马市"},{value:"141082",label:"霍州市"}]},{value:"141100",label:"吕梁市",children:[{value:"141102",label:"离石区"},{value:"141121",label:"文水县"},{value:"141122",label:"交城县"},{value:"141123",label:"兴县"},{value:"141124",label:"临县"},{value:"141125",label:"柳林县"},{value:"141126",label:"石楼县"},{value:"141127",label:"岚县"},{value:"141128",label:"方山县"},{value:"141129",label:"中阳县"},{value:"141130",label:"交口县"},{value:"141181",label:"孝义市"},{value:"141182",label:"汾阳市"}]}]},{value:'150000',label:'内蒙古',children:[{value:"150100",label:"呼和浩特市",children:[{value:"150102",label:"新城区"},{value:"150103",label:"回民区"},{value:"150104",label:"玉泉区"},{value:"150105",label:"赛罕区"},{value:"150121",label:"土默特左旗"},{value:"150122",label:"托克托县"},{value:"150123",label:"和林格尔县"},{value:"150124",label:"清水河县"},{value:"150125",label:"武川县"},{value:"150171",label:"呼和浩特金海工业园区"},{value:"150172",label:"呼和浩特经济技术开发区"}]},{value:"150200",label:"包头市",children:[{value:"150202",label:"东河区"},{value:"150203",label:"昆都仑区"},{value:"150204",label:"青山区"},{value:"150205",label:"石拐区"},{value:"150206",label:"白云矿区"},{value:"150207",label:"九原区"},{value:"150221",label:"土默特右旗"},{value:"150222",label:"固阳县"},{value:"150223",label:"达尔罕茂明安联合旗"},{value:"150271",label:"包头稀土高新技术产业开发区"}]},{value:"150300",label:"乌海市",children:[{value:"150302",label:"海勃湾区"},{value:"150303",label:"海南区"},{value:"150304",label:"乌达区"}]},{value:"150400",label:"赤峰市",children:[{value:"150402",label:"红山区"},{value:"150403",label:"元宝山区"},{value:"150404",label:"松山区"},{value:"150421",label:"阿鲁科尔沁旗"},{value:"150422",label:"巴林左旗"},{value:"150423",label:"巴林右旗"},{value:"150424",label:"林西县"},{value:"150425",label:"克什克腾旗"},{value:"150426",label:"翁牛特旗"},{value:"150428",label:"喀喇沁旗"},{value:"150429",label:"宁城县"},{value:"150430",label:"敖汉旗"}]},{value:"150500",label:"通辽市",children:[{value:"150502",label:"科尔沁区"},{value:"150521",label:"科尔沁左翼中旗"},{value:"150522",label:"科尔沁左翼后旗"},{value:"150523",label:"开鲁县"},{value:"150524",label:"库伦旗"},{value:"150525",label:"奈曼旗"},{value:"150526",label:"扎鲁特旗"},{value:"150581",label:"霍林郭勒市"},{value:"150571",label:"通辽经济技术开发区"}]},{value:"150600",label:"鄂尔多斯市",children:[{value:"150602",label:"东胜区"},{value:"150621",label:"达拉特旗"},{value:"150622",label:"准格尔旗"},{value:"150623",label:"鄂托克前旗"},{value:"150624",label:"鄂托克旗"},{value:"150625",label:"杭锦旗"},{value:"150626",label:"乌审旗"},{value:"150627",label:"伊金霍洛旗"},{value:"150603",label:"康巴什区"}]},{value:"150700",label:"呼伦贝尔市",children:[{value:"150702",label:"海拉尔区"},{value:"150721",label:"阿荣旗"},{value:"150722",label:"莫力达瓦达斡尔族自治旗"},{value:"150723",label:"鄂伦春自治旗"},{value:"150724",label:"鄂温克族自治旗"},{value:"150725",label:"陈巴尔虎旗"},{value:"150726",label:"新巴尔虎左旗"},{value:"150727",label:"新巴尔虎右旗"},{value:"150781",label:"满洲里市"},{value:"150782",label:"牙克石市"},{value:"150783",label:"扎兰屯市"},{value:"150784",label:"额尔古纳市"},{value:"150785",label:"根河市"},{value:"150703",label:"扎赉诺尔区"}]},{value:"150800",label:"巴彦淖尔市",children:[{value:"150802",label:"临河区"},{value:"150821",label:"五原县"},{value:"150822",label:"磴口县"},{value:"150823",label:"乌拉特前旗"},{value:"150824",label:"乌拉特中旗"},{value:"150825",label:"乌拉特后旗"},{value:"150826",label:"杭锦后旗"}]},{value:"150900",label:"乌兰察布市",children:[{value:"150902",label:"集宁区"},{value:"150921",label:"卓资县"},{value:"150922",label:"化德县"},{value:"150923",label:"商都县"},{value:"150924",label:"兴和县"},{value:"150925",label:"凉城县"},{value:"150926",label:"察哈尔右翼前旗"},{value:"150927",label:"察哈尔右翼中旗"},{value:"150928",label:"察哈尔右翼后旗"},{value:"150929",label:"四子王旗"},{value:"150981",label:"丰镇市"}]},{value:"152200",label:"兴安盟",children:[{value:"152201",label:"乌兰浩特市"},{value:"152202",label:"阿尔山市"},{value:"152221",label:"科尔沁右翼前旗"},{value:"152222",label:"科尔沁右翼中旗"},{value:"152223",label:"扎赉特旗"},{value:"152224",label:"突泉县"}]},{value:"152500",label:"锡林郭勒盟",children:[{value:"152501",label:"二连浩特市"},{value:"152502",label:"锡林浩特市"},{value:"152522",label:"阿巴嘎旗"},{value:"152523",label:"苏尼特左旗"},{value:"152524",label:"苏尼特右旗"},{value:"152525",label:"东乌珠穆沁旗"},{value:"152526",label:"西乌珠穆沁旗"},{value:"152527",label:"太仆寺旗"},{value:"152528",label:"镶黄旗"},{value:"152529",label:"正镶白旗"},{value:"152530",label:"正蓝旗"},{value:"152531",label:"多伦县"},{value:"152571",label:"乌拉盖管委会"}]},{value:"152900",label:"阿拉善盟",children:[{value:"152921",label:"阿拉善左旗"},{value:"152922",label:"阿拉善右旗"},{value:"152923",label:"额济纳旗"},{value:"152971",label:"内蒙古阿拉善经济开发区"}]}]},{value:'210000',label:'辽宁省',children:[{value:"210100",label:"沈阳市",children:[{value:"210102",label:"和平区"},{value:"210103",label:"沈河区"},{value:"210104",label:"大东区"},{value:"210105",label:"皇姑区"},{value:"210106",label:"铁西区"},{value:"210111",label:"苏家屯区"},{value:"210112",label:"东陵区"},{value:"210113",label:"新城子区"},{value:"210114",label:"于洪区"},{value:"210115",label:"辽中区"},{value:"210123",label:"康平县"},{value:"210124",label:"法库县"},{value:"210181",label:"新民市"},{value:"210112",label:"浑南区"},{value:"210113",label:"沈北新区"}]},{value:"210200",label:"大连市",children:[{value:"210202",label:"中山区"},{value:"210203",label:"西岗区"},{value:"210204",label:"沙河口区"},{value:"210211",label:"甘井子区"},{value:"210212",label:"旅顺口区"},{value:"210213",label:"金州区"},{value:"210224",label:"长海县"},{value:"210251",label:"开发区"},{value:"210281",label:"瓦房店市"},{value:"210214",label:"普兰店区"},{value:"210283",label:"庄河市"}]},{value:"210300",label:"鞍山市",children:[{value:"210302",label:"铁东区"},{value:"210303",label:"铁西区"},{value:"210304",label:"立山区"},{value:"210311",label:"千山区"},{value:"210321",label:"台安县"},{value:"210323",label:"岫岩满族自治县"},{value:"210381",label:"海城市"}]},{value:"210400",label:"抚顺市",children:[{value:"210402",label:"新抚区"},{value:"210403",label:"东洲区"},{value:"210404",label:"望花区"},{value:"210411",label:"顺城区"},{value:"210421",label:"抚顺县"},{value:"210422",label:"新宾满族自治县"},{value:"210423",label:"清原满族自治县"}]},{value:"210500",label:"本溪市",children:[{value:"210502",label:"平山区"},{value:"210503",label:"溪湖区"},{value:"210504",label:"明山区"},{value:"210505",label:"南芬区"},{value:"210521",label:"本溪满族自治县"},{value:"210522",label:"桓仁满族自治县"}]},{value:"210600",label:"丹东市",children:[{value:"210602",label:"元宝区"},{value:"210603",label:"振兴区"},{value:"210604",label:"振安区"},{value:"210624",label:"宽甸满族自治县"},{value:"210681",label:"东港市"},{value:"210682",label:"凤城市"}]},{value:"210700",label:"锦州市",children:[{value:"210702",label:"古塔区"},{value:"210703",label:"凌河区"},{value:"210711",label:"太和区"},{value:"210726",label:"黑山县"},{value:"210727",label:"义县"},{value:"210781",label:"凌海市"},{value:"210782",label:"北镇市"}]},{value:"210800",label:"营口市",children:[{value:"210802",label:"站前区"},{value:"210803",label:"西市区"},{value:"210804",label:"鲅鱼圈区"},{value:"210811",label:"老边区"},{value:"210881",label:"盖州市"},{value:"210882",label:"大石桥市"}]},{value:"210900",label:"阜新市",children:[{value:"210902",label:"海州区"},{value:"210903",label:"新邱区"},{value:"210904",label:"太平区"},{value:"210905",label:"清河门区"},{value:"210911",label:"细河区"},{value:"210921",label:"阜新蒙古族自治县"},{value:"210922",label:"彰武县"}]},{value:"211000",label:"辽阳市",children:[{value:"211002",label:"白塔区"},{value:"211003",label:"文圣区"},{value:"211004",label:"宏伟区"},{value:"211005",label:"弓长岭区"},{value:"211011",label:"太子河区"},{value:"211021",label:"辽阳县"},{value:"211081",label:"灯塔市"}]},{value:"211100",label:"盘锦市",children:[{value:"211102",label:"双台子区"},{value:"211103",label:"兴隆台区"},{value:"211121",label:"大洼县"},{value:"211122",label:"盘山县"}]},{value:"211200",label:"铁岭市",children:[{value:"211202",label:"银州区"},{value:"211204",label:"清河区"},{value:"211221",label:"铁岭县"},{value:"211223",label:"西丰县"},{value:"211224",label:"昌图县"},{value:"211281",label:"调兵山市"},{value:"211282",label:"开原市"}]},{value:"211300",label:"朝阳市",children:[{value:"211302",label:"双塔区"},{value:"211303",label:"龙城区"},{value:"211321",label:"朝阳县"},{value:"211322",label:"建平县"},{value:"211324",label:"喀喇沁左翼蒙古族自治县"},{value:"211381",label:"北票市"},{value:"211382",label:"凌源市"}]},{value:"211400",label:"葫芦岛市",children:[{value:"211402",label:"连山区"},{value:"211403",label:"龙港区"},{value:"211404",label:"南票区"},{value:"211421",label:"绥中县"},{value:"211422",label:"建昌县"},{value:"211481",label:"兴城市"}]}]},{value:'220000',label:'吉林省',children:[{value:"220100",label:"长春市",children:[{value:"220102",label:"南关区"},{value:"220103",label:"宽城区"},{value:"220104",label:"朝阳区"},{value:"220105",label:"二道区"},{value:"220106",label:"绿园区"},{value:"220112",label:"双阳区"},{value:"220122",label:"农安县"},{value:"220181",label:"九台市"},{value:"220182",label:"榆树市"},{value:"220183",label:"德惠市"},{value:"220171",label:"长春经济技术开发区"},{value:"220172",label:"长春净月高新技术产业开发区"},{value:"220173",label:"长春高新技术产业开发区"},{value:"220174",label:"长春汽车经济技术开发区"}]},{value:"220200",label:"吉林市",children:[{value:"220202",label:"昌邑区"},{value:"220203",label:"龙潭区"},{value:"220204",label:"船营区"},{value:"220211",label:"丰满区"},{value:"220221",label:"永吉县"},{value:"220281",label:"蛟河市"},{value:"220282",label:"桦甸市"},{value:"220283",label:"舒兰市"},{value:"220284",label:"磐石市"},{value:"220271",label:"吉林经济开发区"},{value:"220272",label:"吉林高新技术产业开发区"},{value:"220273",label:"吉林中国新加坡食品区"}]},{value:"220300",label:"四平市",children:[{value:"220302",label:"铁西区"},{value:"220303",label:"铁东区"},{value:"220322",label:"梨树县"},{value:"220323",label:"伊通满族自治县"},{value:"220381",label:"公主岭市"},{value:"220382",label:"双辽市"}]},{value:"220400",label:"辽源市",children:[{value:"220402",label:"龙山区"},{value:"220403",label:"西安区"},{value:"220421",label:"东丰县"},{value:"220422",label:"东辽县"}]},{value:"220500",label:"通化市",children:[{value:"220502",label:"东昌区"},{value:"220503",label:"二道江区"},{value:"220521",label:"通化县"},{value:"220523",label:"辉南县"},{value:"220524",label:"柳河县"},{value:"220581",label:"梅河口市"},{value:"220582",label:"集安市"}]},{value:"220600",label:"白山市",children:[{value:"220602",label:"八道江区"},{value:"220621",label:"抚松县"},{value:"220622",label:"靖宇县"},{value:"220623",label:"长白朝鲜族自治县"},{value:"220605",label:"江源区"},{value:"220681",label:"临江市"},{value:"220602",label:"浑江区"}]},{value:"220700",label:"松原市",children:[{value:"220702",label:"宁江区"},{value:"220721",label:"前郭尔罗斯蒙古族自治县"},{value:"220722",label:"长岭县"},{value:"220723",label:"乾安县"},{value:"220781",label:"扶余市"},{value:"220771",label:"吉林松原经济开发区"}]},{value:"220800",label:"白城市",children:[{value:"220802",label:"洮北区"},{value:"220821",label:"镇赉县"},{value:"220822",label:"通榆县"},{value:"220881",label:"洮南市"},{value:"220882",label:"大安市"},{value:"220871",label:"吉林白城经济开发区"}]},{value:"222400",label:"延边朝鲜族自治州",children:[{value:"222401",label:"延吉市"},{value:"222402",label:"图们市"},{value:"222403",label:"敦化市"},{value:"222404",label:"珲春市"},{value:"222405",label:"龙井市"},{value:"222406",label:"和龙市"},{value:"222424",label:"汪清县"},{value:"222426",label:"安图县"}]}]},{value:'230000',label:'黑龙江省',children:[{value:"230100",label:"哈尔滨市",children:[{value:"230102",label:"道里区"},{value:"230103",label:"南岗区"},{value:"230104",label:"道外区"},{value:"230110",label:"香坊区"},{value:"230107",label:"动力区"},{value:"230108",label:"平房区"},{value:"230109",label:"松北区"},{value:"230111",label:"呼兰区"},{value:"230123",label:"依兰县"},{value:"230124",label:"方正县"},{value:"230125",label:"宾县"},{value:"230126",label:"巴彦县"},{value:"230127",label:"木兰县"},{value:"230128",label:"通河县"},{value:"230129",label:"延寿县"},{value:"230112",label:"阿城区"},{value:"230113",label:"双城区"},{value:"230183",label:"尚志市"},{value:"230184",label:"五常市"}]},{value:"230200",label:"齐齐哈尔市",children:[{value:"230202",label:"龙沙区"},{value:"230203",label:"建华区"},{value:"230204",label:"铁锋区"},{value:"230205",label:"昂昂溪区"},{value:"230206",label:"富拉尔基区"},{value:"230207",label:"碾子山区"},{value:"230208",label:"梅里斯达斡尔族区"},{value:"230221",label:"龙江县"},{value:"230223",label:"依安县"},{value:"230224",label:"泰来县"},{value:"230225",label:"甘南县"},{value:"230227",label:"富裕县"},{value:"230229",label:"克山县"},{value:"230230",label:"克东县"},{value:"230231",label:"拜泉县"},{value:"230281",label:"讷河市"}]},{value:"230300",label:"鸡西市",children:[{value:"230302",label:"鸡冠区"},{value:"230303",label:"恒山区"},{value:"230304",label:"滴道区"},{value:"230305",label:"梨树区"},{value:"230306",label:"城子河区"},{value:"230307",label:"麻山区"},{value:"230321",label:"鸡东县"},{value:"230381",label:"虎林市"},{value:"230382",label:"密山市"}]},{value:"230400",label:"鹤岗市",children:[{value:"230402",label:"向阳区"},{value:"230403",label:"工农区"},{value:"230404",label:"南山区"},{value:"230405",label:"兴安区"},{value:"230406",label:"东山区"},{value:"230407",label:"兴山区"},{value:"230421",label:"萝北县"},{value:"230422",label:"绥滨县"}]},{value:"230500",label:"双鸭山市",children:[{value:"230502",label:"尖山区"},{value:"230503",label:"岭东区"},{value:"230505",label:"四方台区"},{value:"230506",label:"宝山区"},{value:"230521",label:"集贤县"},{value:"230522",label:"友谊县"},{value:"230523",label:"宝清县"},{value:"230524",label:"饶河县"}]},{value:"230600",label:"大庆市",children:[{value:"230602",label:"萨尔图区"},{value:"230603",label:"龙凤区"},{value:"230604",label:"让胡路区"},{value:"230605",label:"红岗区"},{value:"230606",label:"大同区"},{value:"230621",label:"肇州县"},{value:"230622",label:"肇源县"},{value:"230623",label:"林甸县"},{value:"230624",label:"杜尔伯特蒙古族自治县"},{value:"230671",label:"大庆高新技术产业开发区"}]},{value:"230700",label:"伊春市",children:[{value:"230702",label:"伊春区"},{value:"230703",label:"南岔区"},{value:"230704",label:"友好区"},{value:"230705",label:"西林区"},{value:"230706",label:"翠峦区"},{value:"230707",label:"新青区"},{value:"230708",label:"美溪区"},{value:"230709",label:"金山屯区"},{value:"230710",label:"五营区"},{value:"230711",label:"乌马河区"},{value:"230712",label:"汤旺河区"},{value:"230713",label:"带岭区"},{value:"230714",label:"乌伊岭区"},{value:"230715",label:"红星区"},{value:"230716",label:"上甘岭区"},{value:"230722",label:"嘉荫县"},{value:"230781",label:"铁力市"}]},{value:"230800",label:"佳木斯市",children:[{value:"230803",label:"向阳区"},{value:"230804",label:"前进区"},{value:"230805",label:"东风区"},{value:"230811",label:"郊区"},{value:"230822",label:"桦南县"},{value:"230826",label:"桦川县"},{value:"230828",label:"汤原县"},{value:"230833",label:"抚远市"},{value:"230881",label:"同江市"},{value:"230882",label:"富锦市"}]},{value:"230900",label:"七台河市",children:[{value:"230902",label:"新兴区"},{value:"230903",label:"桃山区"},{value:"230904",label:"茄子河区"},{value:"230921",label:"勃利县"}]},{value:"231000",label:"牡丹江市",children:[{value:"231002",label:"东安区"},{value:"231003",label:"阳明区"},{value:"231004",label:"爱民区"},{value:"231005",label:"西安区"},{value:"231086",label:"东宁市"},{value:"231025",label:"林口县"},{value:"231081",label:"绥芬河市"},{value:"231083",label:"海林市"},{value:"231084",label:"宁安市"},{value:"231085",label:"穆棱市"},{value:"231071",label:"牡丹江经济技术开发区"}]},{value:"231100",label:"黑河市",children:[{value:"231102",label:"爱辉区"},{value:"231121",label:"嫩江县"},{value:"231123",label:"逊克县"},{value:"231124",label:"孙吴县"},{value:"231181",label:"北安市"},{value:"231182",label:"五大连池市"}]},{value:"231200",label:"绥化市",children:[{value:"231202",label:"北林区"},{value:"231221",label:"望奎县"},{value:"231222",label:"兰西县"},{value:"231223",label:"青冈县"},{value:"231224",label:"庆安县"},{value:"231225",label:"明水县"},{value:"231226",label:"绥棱县"},{value:"231281",label:"安达市"},{value:"231282",label:"肇东市"},{value:"231283",label:"海伦市"}]},{value:"232700",label:"大兴安岭地区",children:[{value:"232721",label:"呼玛县"},{value:"232722",label:"塔河县"},{value:"232723",label:"漠河县"},{value:"232701",label:"加格达奇区"},{value:"232704",label:"呼中区"},{value:"232703",label:"新林区"}]}]},{value:'310000',label:'上海市',children:[{value:'310100',label:'上海市',children:[{value:"310101",label:"黄浦区"},{value:"310104",label:"徐汇区"},{value:"310105",label:"长宁区"},{value:"310106",label:"静安区"},{value:"310107",label:"普陀区"},{value:"310109",label:"虹口区"},{value:"310110",label:"杨浦区"},{value:"310112",label:"闵行区"},{value:"310113",label:"宝山区"},{value:"310114",label:"嘉定区"},{value:"310115",label:"浦东新区"},{value:"310116",label:"金山区"},{value:"310117",label:"松江区"},{value:"310118",label:"青浦区"},{value:"310120",label:"奉贤区"},{value:"310151",label:"崇明区"}]}]},{value:'320000',label:'江苏省',children:[{value:"320100",label:"南京市",children:[{value:"320102",label:"玄武区"},{value:"320104",label:"秦淮区"},{value:"320105",label:"建邺区"},{value:"320106",label:"鼓楼区"},{value:"320111",label:"浦口区"},{value:"320113",label:"栖霞区"},{value:"320114",label:"雨花台区"},{value:"320115",label:"江宁区"},{value:"320116",label:"六合区"},{value:"320117",label:"溧水区"},{value:"320118",label:"高淳区"}]},{value:"320200",label:"无锡市",children:[{value:"320205",label:"锡山区"},{value:"320206",label:"惠山区"},{value:"320211",label:"滨湖区"},{value:"320281",label:"江阴市"},{value:"320282",label:"宜兴市"},{value:"320213",label:"梁溪区"},{value:"320214",label:"新吴区"}]},{value:"320300",label:"徐州市",children:[{value:"320302",label:"鼓楼区"},{value:"320303",label:"云龙区"},{value:"320305",label:"贾汪区"},{value:"320311",label:"泉山区"},{value:"320321",label:"丰县"},{value:"320322",label:"沛县"},{value:"320324",label:"睢宁县"},{value:"320381",label:"新沂市"},{value:"320382",label:"邳州市"},{value:"320371",label:"徐州经济技术开发区"}]},{value:"320400",label:"常州市",children:[{value:"320402",label:"天宁区"},{value:"320404",label:"钟楼区"},{value:"320411",label:"新北区"},{value:"320412",label:"武进区"},{value:"320481",label:"溧阳市"},{value:"320413",label:"金坛区"}]},{value:"320500",label:"苏州市",children:[{value:"320505",label:"虎丘区"},{value:"320506",label:"吴中区"},{value:"320507",label:"相城区"},{value:"320581",label:"常熟市"},{value:"320582",label:"张家港市"},{value:"320583",label:"昆山市"},{value:"320509",label:"吴江区"},{value:"320585",label:"太仓市"},{value:"320508",label:"姑苏区"},{value:"320571",label:"苏州工业园区"}]},{value:"320600",label:"南通市",children:[{value:"320602",label:"崇川区"},{value:"320611",label:"港闸区"},{value:"320612",label:"通州区"},{value:"320621",label:"海安县"},{value:"320623",label:"如东县"},{value:"320681",label:"启东市"},{value:"320682",label:"如皋市"},{value:"320684",label:"海门市"},{value:"320671",label:"南通经济技术开发区"}]},{value:"320700",label:"连云港市",children:[{value:"320703",label:"连云区"},{value:"320706",label:"海州区"},{value:"320707",label:"赣榆区"},{value:"320722",label:"东海县"},{value:"320723",label:"灌云县"},{value:"320724",label:"灌南县"},{value:"320771",label:"连云港经济技术开发区"},{value:"320772",label:"连云港高新技术产业开发区"}]},{value:"320800",label:"淮安市",children:[{value:"320804",label:"淮阴区"},{value:"320812",label:"清江浦区"},{value:"320826",label:"涟水县"},{value:"320813",label:"洪泽区"},{value:"320830",label:"盱眙县"},{value:"320831",label:"金湖县"},{value:"320803",label:"淮安区"},{value:"320871",label:"淮安经济技术开发区"}]},{value:"320900",label:"盐城市",children:[{value:"320902",label:"亭湖区"},{value:"320903",label:"盐都区"},{value:"320921",label:"响水县"},{value:"320922",label:"滨海县"},{value:"320904",label:"大丰区"},{value:"320923",label:"阜宁县"},{value:"320924",label:"射阳县"},{value:"320925",label:"建湖县"},{value:"320981",label:"东台市"},{value:"320971",label:"盐城经济技术开发区"}]},{value:"321000",label:"扬州市",children:[{value:"321002",label:"广陵区"},{value:"321003",label:"邗江区"},{value:"321011",label:"维扬区"},{value:"321023",label:"宝应县"},{value:"321081",label:"仪征市"},{value:"321084",label:"高邮市"},{value:"321012",label:"江都区"},{value:"321071",label:"扬州经济技术开发区"}]},{value:"321100",label:"镇江市",children:[{value:"321102",label:"京口区"},{value:"321111",label:"润州区"},{value:"321112",label:"丹徒区"},{value:"321181",label:"丹阳市"},{value:"321182",label:"扬中市"},{value:"321183",label:"句容市"},{value:"321171",label:"镇江新区"}]},{value:"321200",label:"泰州市",children:[{value:"321202",label:"海陵区"},{value:"321203",label:"高港区"},{value:"321281",label:"兴化市"},{value:"321282",label:"靖江市"},{value:"321283",label:"泰兴市"},{value:"321204",label:"姜堰区"},{value:"321271",label:"泰州医药高新技术产业开发区"}]},{value:"321300",label:"宿迁市",children:[{value:"321302",label:"宿城区"},{value:"321311",label:"宿豫区"},{value:"321322",label:"沭阳县"},{value:"321323",label:"泗阳县"},{value:"321324",label:"泗洪县"}]}]},{value:'330000',label:'浙江省',children:[{value:"330100",label:"杭州市",children:[{value:"330102",label:"上城区"},{value:"330103",label:"下城区"},{value:"330104",label:"江干区"},{value:"330105",label:"拱墅区"},{value:"330106",label:"西湖区"},{value:"330108",label:"滨江区"},{value:"330109",label:"萧山区"},{value:"330110",label:"余杭区"},{value:"330122",label:"桐庐县"},{value:"330127",label:"淳安县"},{value:"330182",label:"建德市"},{value:"330111",label:"富阳区"},{value:"330112",label:"临安区"},{value:"330186",label:"其它区"}]},{value:"330200",label:"宁波市",children:[{value:"330203",label:"海曙区"},{value:"330205",label:"江北区"},{value:"330206",label:"北仑区"},{value:"330211",label:"镇海区"},{value:"330212",label:"鄞州区"},{value:"330225",label:"象山县"},{value:"330226",label:"宁海县"},{value:"330281",label:"余姚市"},{value:"330282",label:"慈溪市"},{value:"330213",label:"奉化区"}]},{value:"330300",label:"温州市",children:[{value:"330302",label:"鹿城区"},{value:"330303",label:"龙湾区"},{value:"330304",label:"瓯海区"},{value:"330305",label:"洞头区"},{value:"330324",label:"永嘉县"},{value:"330326",label:"平阳县"},{value:"330327",label:"苍南县"},{value:"330328",label:"文成县"},{value:"330329",label:"泰顺县"},{value:"330381",label:"瑞安市"},{value:"330382",label:"乐清市"},{value:"330371",label:"温州经济技术开发区"}]},{value:"330400",label:"嘉兴市",children:[{value:"330402",label:"南湖区"},{value:"330411",label:"秀洲区"},{value:"330421",label:"嘉善县"},{value:"330424",label:"海盐县"},{value:"330481",label:"海宁市"},{value:"330482",label:"平湖市"},{value:"330483",label:"桐乡市"}]},{value:"330500",label:"湖州市",children:[{value:"330502",label:"吴兴区"},{value:"330503",label:"南浔区"},{value:"330521",label:"德清县"},{value:"330522",label:"长兴县"},{value:"330523",label:"安吉县"}]},{value:"330600",label:"绍兴市",children:[{value:"330602",label:"越城区"},{value:"330621",label:"柯桥区"},{value:"330681",label:"诸暨市"},{value:"330604",label:"上虞区"},{value:"330683",label:"嵊州市"},{value:"330624",label:"新昌县"}]},{value:"330700",label:"金华市",children:[{value:"330702",label:"婺城区"},{value:"330703",label:"金东区"},{value:"330723",label:"武义县"},{value:"330726",label:"浦江县"},{value:"330727",label:"磐安县"},{value:"330781",label:"兰溪市"},{value:"330782",label:"义乌市"},{value:"330783",label:"东阳市"},{value:"330784",label:"永康市"}]},{value:"330800",label:"衢州市",children:[{value:"330802",label:"柯城区"},{value:"330803",label:"衢江区"},{value:"330822",label:"常山县"},{value:"330824",label:"开化县"},{value:"330825",label:"龙游县"},{value:"330881",label:"江山市"}]},{value:"330900",label:"舟山市",children:[{value:"330902",label:"定海区"},{value:"330903",label:"普陀区"},{value:"330921",label:"岱山县"},{value:"330922",label:"嵊泗县"}]},{value:"331000",label:"台州市",children:[{value:"331002",label:"椒江区"},{value:"331003",label:"黄岩区"},{value:"331004",label:"路桥区"},{value:"331083",label:"玉环市"},{value:"331022",label:"三门县"},{value:"331023",label:"天台县"},{value:"331024",label:"仙居县"},{value:"331081",label:"温岭市"},{value:"331082",label:"临海市"}]},{value:"331100",label:"丽水市",children:[{value:"331102",label:"莲都区"},{value:"331121",label:"青田县"},{value:"331122",label:"缙云县"},{value:"331123",label:"遂昌县"},{value:"331124",label:"松阳县"},{value:"331125",label:"云和县"},{value:"331126",label:"庆元县"},{value:"331127",label:"景宁畲族自治县"},{value:"331181",label:"龙泉市"}]}]},{value:'340000',label:'安徽省',children:[{value:"340100",label:"合肥市",children:[{value:"340111",label:"包河区"},{value:"340104",label:"蜀山区"},{value:"340103",label:"庐阳区"},{value:"340102",label:"瑶海区"},{value:"340171",label:"合肥高新技术产业开发区"},{value:"340172",label:"合肥经济技术开发区"},{value:"340173",label:"合肥新站高新技术产业开发区"},{value:"340121",label:"长丰县"},{value:"340122",label:"肥东县"},{value:"340123",label:"肥西县"},{value:"340124",label:"庐江县"},{value:"340181",label:"巢湖市"}]},{value:"340200",label:"芜湖市",children:[{value:"340202",label:"镜湖区"},{value:"340203",label:"弋江区"},{value:"340207",label:"鸠江区"},{value:"340208",label:"三山区"},{value:"340221",label:"芜湖县"},{value:"340222",label:"繁昌县"},{value:"340223",label:"南陵县"},{value:"340225",label:"无为县"},{value:"340272",label:"安徽芜湖长江大桥经济开发区"},{value:"340271",label:"芜湖经济技术开发区"}]},{value:"340300",label:"蚌埠市",children:[{value:"340302",label:"龙子湖区"},{value:"340303",label:"蚌山区"},{value:"340304",label:"禹会区"},{value:"340311",label:"淮上区"},{value:"340321",label:"怀远县"},{value:"340322",label:"五河县"},{value:"340323",label:"固镇县"},{value:"340371",label:"蚌埠市高新技术开发区"},{value:"340372	",label:"蚌埠市经济开发区"}]},{value:"340400",label:"淮南市",children:[{value:"340402",label:"大通区"},{value:"340403",label:"田家庵区"},{value:"340404",label:"谢家集区"},{value:"340405",label:"八公山区"},{value:"340406",label:"潘集区"},{value:"340421",label:"凤台县"},{value:"340422",label:"寿县"}]},{value:"340500",label:"马鞍山市",children:[{value:"340503",label:"花山区"},{value:"340504",label:"雨山区"},{value:"340521",label:"当涂县"},{value:"340506",label:"博望区"},{value:"340522",label:"含山县"},{value:"340523",label:"和县"}]},{value:"340600",label:"淮北市",children:[{value:"340602",label:"杜集区"},{value:"340603",label:"相山区"},{value:"340604",label:"烈山区"},{value:"340621",label:"濉溪县"}]},{value:"340700",label:"铜陵市",children:[{value:"340705",label:"铜官区"},{value:"340706",label:"义安区"},{value:"340711",label:"郊区"},{value:"340722",label:"枞阳县"}]},{value:"340800",label:"安庆市",children:[{value:"340802",label:"迎江区"},{value:"340803",label:"大观区"},{value:"340811",label:"宜秀区"},{value:"340822",label:"怀宁县"},{value:"340824",label:"潜山县"},{value:"340825",label:"太湖县"},{value:"340826",label:"宿松县"},{value:"340827",label:"望江县"},{value:"340828",label:"岳西县"},{value:"340881",label:"桐城市"},{value:"340871",label:"安徽安庆经济开发区"}]},{value:"341000",label:"黄山市",children:[{value:"341002",label:"屯溪区"},{value:"341003",label:"黄山区"},{value:"341004",label:"徽州区"},{value:"341021",label:"歙县"},{value:"341022",label:"休宁县"},{value:"341023",label:"黟县"},{value:"341024",label:"祁门县"}]},{value:"341100",label:"滁州市",children:[{value:"341102",label:"琅琊区"},{value:"341103",label:"南谯区"},{value:"341122",label:"来安县"},{value:"341124",label:"全椒县"},{value:"341125",label:"定远县"},{value:"341126",label:"凤阳县"},{value:"341181",label:"天长市"},{value:"341182",label:"明光市"},{value:"341171",label:"苏滁现代产业园"},{value:"341172",label:"滁州经济技术开发区"}]},{value:"341200",label:"阜阳市",children:[{value:"341202",label:"颍州区"},{value:"341203",label:"颍东区"},{value:"341204",label:"颍泉区"},{value:"341221",label:"临泉县"},{value:"341222",label:"太和县"},{value:"341225",label:"阜南县"},{value:"341226",label:"颍上县"},{value:"341282",label:"界首市"},{value:"341272",label:"阜阳经济技术开发区"},{value:"341271",label:"阜阳合肥现代产业园区"}]},{value:"341300",label:"宿州市",children:[{value:"341302",label:"埇桥区"},{value:"341321",label:"砀山县"},{value:"341322",label:"萧县"},{value:"341323",label:"灵璧县"},{value:"341324",label:"泗县"},{value:"341371",label:"宿州马鞍山现代产业园区"},{value:"341372",label:"宿州经济技术开发区"}]},{value:"341500",label:"六安市",children:[{value:"341502",label:"金安区"},{value:"341503",label:"裕安区"},{value:"341504",label:"叶集区"},{value:"341522",label:"霍邱县"},{value:"341523",label:"舒城县"},{value:"341524",label:"金寨县"},{value:"341525",label:"霍山县"}]},{value:"341600",label:"亳州市",children:[{value:"341602",label:"谯城区"},{value:"341621",label:"涡阳县"},{value:"341622",label:"蒙城县"},{value:"341623",label:"利辛县"}]},{value:"341700",label:"池州市",children:[{value:"341702",label:"贵池区"},{value:"341721",label:"东至县"},{value:"341722",label:"石台县"},{value:"341723",label:"青阳县"}]},{value:"341800",label:"宣城市",children:[{value:"341802",label:"宣州区"},{value:"341821",label:"郎溪县"},{value:"341822",label:"广德县"},{value:"341823",label:"泾县"},{value:"341824",label:"绩溪县"},{value:"341825",label:"旌德县"},{value:"341881",label:"宁国市"},{value:"341871",label:"宣城市经济开发区"}]}]},{value:'350000',label:'福建省',children:[{value:"350100",label:"福州市",children:[{value:"350102",label:"鼓楼区"},{value:"350103",label:"台江区"},{value:"350104",label:"仓山区"},{value:"350105",label:"马尾区"},{value:"350111",label:"晋安区"},{value:"350121",label:"闽侯县"},{value:"350122",label:"连江县"},{value:"350123",label:"罗源县"},{value:"350124",label:"闽清县"},{value:"350125",label:"永泰县"},{value:"350128",label:"平潭县"},{value:"350181",label:"福清市"},{value:"350182",label:"长乐市"}]},{value:"350200",label:"厦门市",children:[{value:"350203",label:"思明区"},{value:"350205",label:"海沧区"},{value:"350206",label:"湖里区"},{value:"350211",label:"集美区"},{value:"350212",label:"同安区"},{value:"350213",label:"翔安区"}]},{value:"350300",label:"莆田市",children:[{value:"350302",label:"城厢区"},{value:"350303",label:"涵江区"},{value:"350304",label:"荔城区"},{value:"350305",label:"秀屿区"},{value:"350322",label:"仙游县"}]},{value:"350400",label:"三明市",children:[{value:"350402",label:"梅列区"},{value:"350403",label:"三元区"},{value:"350421",label:"明溪县"},{value:"350423",label:"清流县"},{value:"350424",label:"宁化县"},{value:"350425",label:"大田县"},{value:"350426",label:"尤溪县"},{value:"350427",label:"沙县"},{value:"350428",label:"将乐县"},{value:"350429",label:"泰宁县"},{value:"350430",label:"建宁县"},{value:"350481",label:"永安市"}]},{value:"350500",label:"泉州市",children:[{value:"350502",label:"鲤城区"},{value:"350503",label:"丰泽区"},{value:"350504",label:"洛江区"},{value:"350505",label:"泉港区"},{value:"350521",label:"惠安县"},{value:"350524",label:"安溪县"},{value:"350525",label:"永春县"},{value:"350526",label:"德化县"},{value:"350527",label:"金门县"},{value:"350581",label:"石狮市"},{value:"350582",label:"晋江市"},{value:"350583",label:"南安市"}]},{value:"350600",label:"漳州市",children:[{value:"350602",label:"芗城区"},{value:"350603",label:"龙文区"},{value:"350622",label:"云霄县"},{value:"350623",label:"漳浦县"},{value:"350624",label:"诏安县"},{value:"350625",label:"长泰县"},{value:"350626",label:"东山县"},{value:"350627",label:"南靖县"},{value:"350628",label:"平和县"},{value:"350629",label:"华安县"},{value:"350681",label:"龙海市"}]},{value:"350700",label:"南平市",children:[{value:"350702",label:"延平区"},{value:"350721",label:"顺昌县"},{value:"350722",label:"浦城县"},{value:"350723",label:"光泽县"},{value:"350724",label:"松溪县"},{value:"350725",label:"政和县"},{value:"350781",label:"邵武市"},{value:"350782",label:"武夷山市"},{value:"350783",label:"建瓯市"},{value:"350703",label:"建阳区"}]},{value:"350800",label:"龙岩市",children:[{value:"350802",label:"新罗区"},{value:"350821",label:"长汀县"},{value:"350803",label:"永定区"},{value:"350823",label:"上杭县"},{value:"350824",label:"武平县"},{value:"350825",label:"连城县"},{value:"350881",label:"漳平市"}]},{value:"350900",label:"宁德市",children:[{value:"350902",label:"蕉城区"},{value:"350921",label:"霞浦县"},{value:"350922",label:"古田县"},{value:"350923",label:"屏南县"},{value:"350924",label:"寿宁县"},{value:"350925",label:"周宁县"},{value:"350926",label:"柘荣县"},{value:"350981",label:"福安市"},{value:"350982",label:"福鼎市"}]}]},{value:'360000',label:'江西省',children:[{value:"360100",label:"南昌市",children:[{value:"360102",label:"东湖区"},{value:"360103",label:"西湖区"},{value:"360104",label:"青云谱区"},{value:"360105",label:"湾里区"},{value:"360111",label:"青山湖区"},{value:"360121",label:"南昌县"},{value:"360112",label:"新建区"},{value:"360123",label:"安义县"},{value:"360124",label:"进贤县"}]},{value:"360200",label:"景德镇市",children:[{value:"360202",label:"昌江区"},{value:"360203",label:"珠山区"},{value:"360222",label:"浮梁县"},{value:"360281",label:"乐平市"}]},{value:"360300",label:"萍乡市",children:[{value:"360302",label:"安源区"},{value:"360313",label:"湘东区"},{value:"360321",label:"莲花县"},{value:"360322",label:"上栗县"},{value:"360323",label:"芦溪县"}]},{value:"360400",label:"九江市",children:[{value:"360402",label:"濂溪区"},{value:"360403",label:"浔阳区"},{value:"360404",label:"柴桑区"},{value:"360423",label:"武宁县"},{value:"360424",label:"修水县"},{value:"360425",label:"永修县"},{value:"360426",label:"德安县"},{value:"360428",label:"都昌县"},{value:"360429",label:"湖口县"},{value:"360430",label:"彭泽县"},{value:"360481",label:"瑞昌市"},{value:"360482",label:"共青城市"},{value:"360483",label:"庐山市"}]},{value:"360500",label:"新余市",children:[{value:"360502",label:"渝水区"},{value:"360521",label:"分宜县"}]},{value:"360600",label:"鹰潭市",children:[{value:"360602",label:"月湖区"},{value:"360622",label:"余江县"},{value:"360681",label:"贵溪市"}]},{value:"360700",label:"赣州市",children:[{value:"360702",label:"章贡区"},{value:"360704",label:"赣县区"},{value:"360722",label:"信丰县"},{value:"360723",label:"大余县"},{value:"360724",label:"上犹县"},{value:"360725",label:"崇义县"},{value:"360726",label:"安远县"},{value:"360727",label:"龙南县"},{value:"360728",label:"定南县"},{value:"360729",label:"全南县"},{value:"360730",label:"宁都县"},{value:"360731",label:"于都县"},{value:"360732",label:"兴国县"},{value:"360733",label:"会昌县"},{value:"360734",label:"寻乌县"},{value:"360735",label:"石城县"},{value:"360781",label:"瑞金市"},{value:"360703",label:"南康区"}]},{value:"360800",label:"吉安市",children:[{value:"360802",label:"吉州区"},{value:"360803",label:"青原区"},{value:"360821",label:"吉安县"},{value:"360822",label:"吉水县"},{value:"360823",label:"峡江县"},{value:"360824",label:"新干县"},{value:"360825",label:"永丰县"},{value:"360826",label:"泰和县"},{value:"360827",label:"遂川县"},{value:"360828",label:"万安县"},{value:"360829",label:"安福县"},{value:"360830",label:"永新县"},{value:"360881",label:"井冈山市"}]},{value:"360900",label:"宜春市",children:[{value:"360902",label:"袁州区"},{value:"360921",label:"奉新县"},{value:"360922",label:"万载县"},{value:"360923",label:"上高县"},{value:"360924",label:"宜丰县"},{value:"360925",label:"靖安县"},{value:"360926",label:"铜鼓县"},{value:"360981",label:"丰城市"},{value:"360982",label:"樟树市"},{value:"360983",label:"高安市"}]},{value:"361000",label:"抚州市",children:[{value:"361002",label:"临川区"},{value:"361021",label:"南城县"},{value:"361022",label:"黎川县"},{value:"361023",label:"南丰县"},{value:"361024",label:"崇仁县"},{value:"361025",label:"乐安县"},{value:"361026",label:"宜黄县"},{value:"361027",label:"金溪县"},{value:"361028",label:"资溪县"},{value:"361003",label:"东乡区"},{value:"361030",label:"广昌县"}]},{value:"361100",label:"上饶市",children:[{value:"361102",label:"信州区"},{value:"361121",label:"上饶县"},{value:"361103",label:"广丰区"},{value:"361123",label:"玉山县"},{value:"361124",label:"铅山县"},{value:"361125",label:"横峰县"},{value:"361126",label:"弋阳县"},{value:"361127",label:"余干县"},{value:"361128",label:"鄱阳县"},{value:"361129",label:"万年县"},{value:"361130",label:"婺源县"},{value:"361181",label:"德兴市"}]}]},{value:'370000',label:'山东省',children:[{value:"370100",label:"济南市",children:[{value:"370102",label:"历下区"},{value:"370103",label:"市中区"},{value:"370104",label:"槐荫区"},{value:"370105",label:"天桥区"},{value:"370112",label:"历城区"},{value:"370113",label:"长清区"},{value:"370124",label:"平阴县"},{value:"370125",label:"济阳县"},{value:"370126",label:"商河县"},{value:"370114",label:"章丘区"},{value:"370171",label:"济南高新技术产业开发区"}]},{value:"370200",label:"青岛市",children:[{value:"370202",label:"市南区"},{value:"370203",label:"市北区"},{value:"370211",label:"黄岛区"},{value:"370212",label:"崂山区"},{value:"370213",label:"李沧区"},{value:"370214",label:"城阳区"},{value:"370281",label:"胶州市"},{value:"370215",label:"即墨区"},{value:"370283",label:"平度市"},{value:"370285",label:"莱西市"},{value:"370271",label:"青岛高新技术产业开发区"}]},{value:"370300",label:"淄博市",children:[{value:"370302",label:"淄川区"},{value:"370303",label:"张店区"},{value:"370304",label:"博山区"},{value:"370305",label:"临淄区"},{value:"370306",label:"周村区"},{value:"370321",label:"桓台县"},{value:"370322",label:"高青县"},{value:"370323",label:"沂源县"}]},{value:"370400",label:"枣庄市",children:[{value:"370402",label:"市中区"},{value:"370403",label:"薛城区"},{value:"370404",label:"峄城区"},{value:"370405",label:"台儿庄区"},{value:"370406",label:"山亭区"},{value:"370481",label:"滕州市"}]},{value:"370500",label:"东营市",children:[{value:"370502",label:"东营区"},{value:"370503",label:"河口区"},{value:"370521",label:"垦利县"},{value:"370522",label:"利津县"},{value:"370523",label:"广饶县"},{value:"370589",label:"西城区"},{value:"370571",label:"东营经济技术开发区"},{value:"370572",label:"东营港经济开发区"}]},{value:"370600",label:"烟台市",children:[{value:"370602",label:"芝罘区"},{value:"370611",label:"福山区"},{value:"370612",label:"牟平区"},{value:"370613",label:"莱山区"},{value:"370634",label:"长岛县"},{value:"370681",label:"龙口市"},{value:"370682",label:"莱阳市"},{value:"370683",label:"莱州市"},{value:"370684",label:"蓬莱市"},{value:"370685",label:"招远市"},{value:"370686",label:"栖霞市"},{value:"370687",label:"海阳市"},{value:"370671",label:"烟台高新技术产业开发区"},{value:"370672",label:"烟台经济技术开发区"}]},{value:"370700",label:"潍坊市",children:[{value:"370702",label:"潍城区"},{value:"370703",label:"寒亭区"},{value:"370704",label:"坊子区"},{value:"370705",label:"奎文区"},{value:"370724",label:"临朐县"},{value:"370725",label:"昌乐县"},{value:"370772",label:"潍坊滨海经济技术开发区"},{value:"370781",label:"青州市"},{value:"370782",label:"诸城市"},{value:"370783",label:"寿光市"},{value:"370784",label:"安丘市"},{value:"370785",label:"高密市"},{value:"370786",label:"昌邑市"}]},{value:"370800",label:"济宁市",children:[{value:"370811",label:"任城区"},{value:"370826",label:"微山县"},{value:"370827",label:"鱼台县"},{value:"370828",label:"金乡县"},{value:"370829",label:"嘉祥县"},{value:"370830",label:"汶上县"},{value:"370831",label:"泗水县"},{value:"370832",label:"梁山县"},{value:"370881",label:"曲阜市"},{value:"370812",label:"兖州区"},{value:"370883",label:"邹城市"},{value:"370871",label:"济宁高新技术产业开发区"}]},{value:"370900",label:"泰安市",children:[{value:"370902",label:"泰山区"},{value:"370903",label:"岱岳区"},{value:"370921",label:"宁阳县"},{value:"370923",label:"东平县"},{value:"370982",label:"新泰市"},{value:"370983",label:"肥城市"}]},{value:"371000",label:"威海市",children:[{value:"371002",label:"环翠区"},{value:"371003",label:"文登区"},{value:"371082",label:"荣成市"},{value:"371083",label:"乳山市"},{value:"371071",label:"威海火炬高技术产业开发区"},{value:"371072",label:"威海经济技术开发区"},{value:"371073",label:"威海临港经济技术开发区"}]},{value:"371100",label:"日照市",children:[{value:"371102",label:"东港区"},{value:"371103",label:"岚山区"},{value:"371121",label:"五莲县"},{value:"371122",label:"莒县"},{value:"371171",label:"日照经济技术开发区"},{value:"371172",label:"日照国际海洋城"}]},{value:"371200",label:"莱芜市",children:[{value:"371202",label:"莱城区"},{value:"371203",label:"钢城区"}]},{value:"371300",label:"临沂市",children:[{value:"371302",label:"兰山区"},{value:"371311",label:"罗庄区"},{value:"371312",label:"河东区"},{value:"371321",label:"沂南县"},{value:"371322",label:"郯城县"},{value:"371323",label:"沂水县"},{value:"371324",label:"兰陵县"},{value:"371325",label:"费县"},{value:"371326",label:"平邑县"},{value:"371327",label:"莒南县"},{value:"371328",label:"蒙阴县"},{value:"371329",label:"临沭县"},{value:"371371",label:"临沂高新技术产业开发区"},{value:"371373",label:"临沂临港经济开发区"},{value:"371372",label:"临沂经济技术开发区"}]},{value:"371400",label:"德州市",children:[{value:"371402",label:"德城区"},{value:"371403",label:"陵城区"},{value:"371422",label:"宁津县"},{value:"371423",label:"庆云县"},{value:"371424",label:"临邑县"},{value:"371425",label:"齐河县"},{value:"371426",label:"平原县"},{value:"371427",label:"夏津县"},{value:"371428",label:"武城县"},{value:"371481",label:"乐陵市"},{value:"371482",label:"禹城市"},{value:"371471",label:"德州经济技术开发区"},{value:"371472",label:"德州运河经济开发区"}]},{value:"371500",label:"聊城市",children:[{value:"371502",label:"东昌府区"},{value:"371521",label:"阳谷县"},{value:"371522",label:"莘县"},{value:"371523",label:"茌平县"},{value:"371524",label:"东阿县"},{value:"371525",label:"冠县"},{value:"371526",label:"高唐县"},{value:"371581",label:"临清市"}]},{value:"371600",label:"滨州市",children:[{value:"371602",label:"滨城区"},{value:"371621",label:"惠民县"},{value:"371622",label:"阳信县"},{value:"371623",label:"无棣县"},{value:"371603",label:"沾化区"},{value:"371625",label:"博兴县"},{value:"371626",label:"邹平县"}]},{value:"371700",label:"菏泽市",children:[{value:"371702",label:"牡丹区"},{value:"371721",label:"曹县"},{value:"371722",label:"单县"},{value:"371723",label:"成武县"},{value:"371724",label:"巨野县"},{value:"371725",label:"郓城县"},{value:"371726",label:"鄄城县"},{value:"371727",label:"定陶区"},{value:"371728",label:"东明县"},{value:"371771",label:"菏泽经济技术开发区"},{value:"371772",label:"菏泽高新技术开发区"}]}]},{value:'410000',label:'河南省',children:[{value:"410100",label:"郑州市",children:[{value:"410102",label:"中原区"},{value:"410103",label:"二七区"},{value:"410104",label:"管城回族区"},{value:"410105",label:"金水区"},{value:"410106",label:"上街区"},{value:"410108",label:"惠济区"},{value:"410122",label:"中牟县"},{value:"410181",label:"巩义市"},{value:"410182",label:"荥阳市"},{value:"410183",label:"新密市"},{value:"410184",label:"新郑市"},{value:"410185",label:"登封市"},{value:"410171",label:"郑州经济技术开发区"},{value:"410172",label:"郑州高新技术产业开发区"},{value:"410173",label:"郑州航空港经济综合实验区"}]},{value:"410200",label:"开封市",children:[{value:"410202",label:"龙亭区"},{value:"410203",label:"顺河回族区"},{value:"410204",label:"鼓楼区"},{value:"410205",label:"禹王台区"},{value:"410211",label:"金明区"},{value:"410221",label:"杞县"},{value:"410222",label:"通许县"},{value:"410223",label:"尉氏县"},{value:"410225",label:"兰考县"},{value:"410212",label:"祥符区"}]},{value:"410300",label:"洛阳市",children:[{value:"410302",label:"老城区"},{value:"410303",label:"西工区"},{value:"410304",label:"廛河回族区"},{value:"410305",label:"涧西区"},{value:"410306",label:"吉利区"},{value:"410307",label:"洛龙区"},{value:"410322",label:"孟津县"},{value:"410323",label:"新安县"},{value:"410324",label:"栾川县"},{value:"410325",label:"嵩县"},{value:"410326",label:"汝阳县"},{value:"410327",label:"宜阳县"},{value:"410328",label:"洛宁县"},{value:"410329",label:"伊川县"},{value:"410381",label:"偃师市"},{value:"410371",label:"洛阳高新技术产业开发区"},{value:"471005",label:"其它区"}]},{value:"410400",label:"平顶山市",children:[{value:"410402",label:"新华区"},{value:"410403",label:"卫东区"},{value:"410404",label:"石龙区"},{value:"410411",label:"湛河区"},{value:"410421",label:"宝丰县"},{value:"410422",label:"叶县"},{value:"410423",label:"鲁山县"},{value:"410425",label:"郏县"},{value:"410481",label:"舞钢市"},{value:"410482",label:"汝州市"},{value:"410471",label:"平顶山高新技术产业开发区"},{value:"410472",label:"平顶山市新城区"}]},{value:"410500",label:"安阳市",children:[{value:"410502",label:"文峰区"},{value:"410503",label:"北关区"},{value:"410505",label:"殷都区"},{value:"410506",label:"龙安区"},{value:"410522",label:"安阳县"},{value:"410523",label:"汤阴县"},{value:"410526",label:"滑县"},{value:"410527",label:"内黄县"},{value:"410581",label:"林州市"},{value:"410571",label:"安阳高新技术产业开发区"}]},{value:"410600",label:"鹤壁市",children:[{value:"410602",label:"鹤山区"},{value:"410603",label:"山城区"},{value:"410611",label:"淇滨区"},{value:"410621",label:"浚县"},{value:"410622",label:"淇县"},{value:"410671",label:"鹤壁经济技术开发区"}]},{value:"410700",label:"新乡市",children:[{value:"410702",label:"红旗区"},{value:"410703",label:"卫滨区"},{value:"410704",label:"凤泉区"},{value:"410711",label:"牧野区"},{value:"410721",label:"新乡县"},{value:"410724",label:"获嘉县"},{value:"410725",label:"原阳县"},{value:"410726",label:"延津县"},{value:"410727",label:"封丘县"},{value:"410728",label:"长垣县"},{value:"410781",label:"卫辉市"},{value:"410782",label:"辉县市"},{value:"410771",label:"新乡高新技术产业开发区"},{value:"410773",label:"新乡市平原城乡一体化示范区"},{value:"410772",label:"新乡经济技术开发区"}]},{value:"410800",label:"焦作市",children:[{value:"410802",label:"解放区"},{value:"410803",label:"中站区"},{value:"410804",label:"马村区"},{value:"410811",label:"山阳区"},{value:"410821",label:"修武县"},{value:"410822",label:"博爱县"},{value:"410823",label:"武陟县"},{value:"410825",label:"温县"},{value:"410882",label:"沁阳市"},{value:"410883",label:"孟州市"},{value:"410871",label:"焦作城乡一体化示范区"}]},{value:"410900",label:"濮阳市",children:[{value:"410902",label:"华龙区"},{value:"410922",label:"清丰县"},{value:"410923",label:"南乐县"},{value:"410926",label:"范县"},{value:"410927",label:"台前县"},{value:"410928",label:"濮阳县"},{value:"410971",label:"河南濮阳工业园区"},{value:"410972",label:"濮阳经济技术开发区"}]},{value:"411000",label:"许昌市",children:[{value:"411002",label:"魏都区"},{value:"411003",label:"建安区"},{value:"411024",label:"鄢陵县"},{value:"411025",label:"襄城县"},{value:"411081",label:"禹州市"},{value:"411082",label:"长葛市"},{value:"411071",label:"许昌经济技术开发区"}]},{value:"411100",label:"漯河市",children:[{value:"411102",label:"源汇区"},{value:"411103",label:"郾城区"},{value:"411104",label:"召陵区"},{value:"411121",label:"舞阳县"},{value:"411122",label:"临颍县"},{value:"411171",label:"漯河经济技术开发区"}]},{value:"411200",label:"三门峡市",children:[{value:"411202",label:"湖滨区"},{value:"411221",label:"渑池县"},{value:"411222",label:"陕县"},{value:"411224",label:"卢氏县"},{value:"411281",label:"义马市"},{value:"411282",label:"灵宝市"},{value:"411203",label:"陕州区"},{value:"411271",label:"河南三门峡经济开发区"}]},{value:"411300",label:"南阳市",children:[{value:"411302",label:"宛城区"},{value:"411303",label:"卧龙区"},{value:"411321",label:"南召县"},{value:"411322",label:"方城县"},{value:"411323",label:"西峡县"},{value:"411324",label:"镇平县"},{value:"411325",label:"内乡县"},{value:"411326",label:"淅川县"},{value:"411327",label:"社旗县"},{value:"411328",label:"唐河县"},{value:"411329",label:"新野县"},{value:"411330",label:"桐柏县"},{value:"411381",label:"邓州市"},{value:"411371",label:"南阳高新技术产业开发区"},{value:"411372",label:"南阳市城乡一体化示范区"}]},{value:"411400",label:"商丘市",children:[{value:"411402",label:"梁园区"},{value:"411403",label:"睢阳区"},{value:"411421",label:"民权县"},{value:"411422",label:"睢县"},{value:"411423",label:"宁陵县"},{value:"411424",label:"柘城县"},{value:"411425",label:"虞城县"},{value:"411426",label:"夏邑县"},{value:"411481",label:"永城市"},{value:"411471",label:"豫东综合物流产业聚集区"},{value:"411472",label:"河南商丘经济开发"}]},{value:"411500",label:"信阳市",children:[{value:"411502",label:"浉河区"},{value:"411503",label:"平桥区"},{value:"411521",label:"罗山县"},{value:"411522",label:"光山县"},{value:"411523",label:"新县"},{value:"411524",label:"商城县"},{value:"411525",label:"固始县"},{value:"411526",label:"潢川县"},{value:"411527",label:"淮滨县"},{value:"411528",label:"息县"},{value:"411571",label:"信阳高新技术产业开发区"}]},{value:"411600",label:"周口市",children:[{value:"411602",label:"川汇区"},{value:"411621",label:"扶沟县"},{value:"411622",label:"西华县"},{value:"411623",label:"商水县"},{value:"411624",label:"沈丘县"},{value:"411625",label:"郸城县"},{value:"411626",label:"淮阳县"},{value:"411627",label:"太康县"},{value:"411628",label:"鹿邑县"},{value:"411681",label:"项城市"},{value:"411671",label:"河南周口经济开发区"}]},{value:"411700",label:"驻马店市",children:[{value:"411702",label:"驿城区"},{value:"411721",label:"西平县"},{value:"411722",label:"上蔡县"},{value:"411723",label:"平舆县"},{value:"411724",label:"正阳县"},{value:"411725",label:"确山县"},{value:"411726",label:"泌阳县"},{value:"411727",label:"汝南县"},{value:"411628",label:"遂平县"},{value:"411729",label:"新蔡县"},{value:"411771",label:"河南驻马店经济开发区"}]}]},{value:'420000',label:'湖北省',children:[{value:"420100",label:"武汉市",children:[{value:"420101",label:"市辖区"},{value:"420102",label:"江岸区"},{value:"420103",label:"江汉区"},{value:"420104",label:"硚口区"},{value:"420105",label:"汉阳区"},{value:"420106",label:"武昌区"},{value:"420107",label:"青山区"},{value:"420111",label:"洪山区"},{value:"420112",label:"东西湖区"},{value:"420113",label:"汉南区"},{value:"420114",label:"蔡甸区"},{value:"420115",label:"江夏区"},{value:"420116",label:"黄陂区"},{value:"420117",label:"新洲区"}]},{value:"420200",label:"黄石市",children:[{value:"420201",label:"市辖区"},{value:"420202",label:"黄石港区"},{value:"420203",label:"西塞山区"},{value:"420204",label:"下陆区"},{value:"420205",label:"铁山区"},{value:"420222",label:"阳新县"},{value:"420281",label:"大冶市"}]},{value:"420300",label:"十堰市",children:[{value:"420301",label:"市辖区"},{value:"420302",label:"茅箭区"},{value:"420303",label:"张湾区"},{value:"420304",label:"郧阳区"},{value:"420322",label:"郧西县"},{value:"420323",label:"竹山县"},{value:"420324",label:"竹溪县"},{value:"420325",label:"房县"},{value:"420381",label:"丹江口市"}]},{value:"420500",label:"宜昌市",children:[{value:"420501",label:"市辖区"},{value:"420502",label:"西陵区"},{value:"420503",label:"伍家岗区"},{value:"420504",label:"点军区"},{value:"420505",label:"猇亭区"},{value:"420506",label:"夷陵区"},{value:"420525",label:"远安县"},{value:"420526",label:"兴山县"},{value:"420527",label:"秭归县"},{value:"420528",label:"长阳土家族自治县"},{value:"420529",label:"五峰土家族自治县"},{value:"420581",label:"宜都市"},{value:"420582",label:"当阳市"},{value:"420583",label:"枝江市"}]},{value:"420600",label:"襄阳市",children:[{value:"420601",label:"市辖区"},{value:"420602",label:"襄城区"},{value:"420606",label:"樊城区"},{value:"420607",label:"襄州区"},{value:"420624",label:"南漳县"},{value:"420625",label:"谷城县"},{value:"420626",label:"保康县"},{value:"420682",label:"老河口市"},{value:"420683",label:"枣阳市"},{value:"420684",label:"宜城市"}]},{value:"420700",label:"鄂州市",children:[{value:"420701",label:"市辖区"},{value:"420702",label:"梁子湖区"},{value:"420703",label:"华容区"},{value:"420704",label:"鄂城区"}]},{value:"420800",label:"荆门市",children:[{value:"420801",label:"市辖区"},{value:"420802",label:"东宝区"},{value:"420804",label:"掇刀区"},{value:"420821",label:"京山县"},{value:"420822",label:"沙洋县"},{value:"420881",label:"钟祥市"}]},{value:"420900",label:"孝感市",children:[{value:"420901",label:"市辖区"},{value:"420902",label:"孝南区"},{value:"420921",label:"孝昌县"},{value:"420922",label:"大悟县"},{value:"420923",label:"云梦县"},{value:"420981",label:"应城市"},{value:"420982",label:"安陆市"},{value:"420984",label:"汉川市"}]},{value:"421000",label:"荆州市",children:[{value:"421001",label:"市辖区"},{value:"421002",label:"沙市区"},{value:"421003",label:"荆州区"},{value:"421022",label:"公安县"},{value:"421023",label:"监利县"},{value:"421024",label:"江陵县"},{value:"421071",label:"荆州经济技术开发区"},{value:"421081",label:"石首市"},{value:"421083",label:"洪湖市"},{value:"421087",label:"松滋市"}]},{value:"421100",label:"黄冈市",children:[{value:"421101",label:"市辖区"},{value:"421102",label:"黄州区"},{value:"421121",label:"团风县"},{value:"421122",label:"红安县"},{value:"421123",label:"罗田县"},{value:"421124",label:"英山县"},{value:"421125",label:"浠水县"},{value:"421126",label:"蕲春县"},{value:"421127",label:"黄梅县"},{value:"421171",label:"龙感湖管理区"},{value:"421181",label:"麻城市"},{value:"421182",label:"武穴市"}]},{value:"421200",label:"咸宁市",children:[{value:"421201",label:"市辖区"},{value:"421202",label:"咸安区"},{value:"421221",label:"嘉鱼县"},{value:"421222",label:"通城县"},{value:"421223",label:"崇阳县"},{value:"421224",label:"通山县"},{value:"421281",label:"赤壁市"}]},{value:"421300",label:"随州市",children:[{value:"421301",label:"市辖区"},{value:"421303",label:"曾都区"},{value:"421321",label:"随县"},{value:"421381",label:"广水市"}]},{value:"422800",label:"恩施土家族苗族自治州",children:[{value:"422801",label:"恩施市"},{value:"422802",label:"利川市"},{value:"422822",label:"建始县"},{value:"422823",label:"巴东县"},{value:"422825",label:"宣恩县"},{value:"422826",label:"咸丰县"},{value:"422827",label:"来凤县"},{value:"422828",label:"鹤峰县"}]},{value:"429000",label:"省直辖县级行政区划",children:[{value:"429004",label:"仙桃市"},{value:"429005",label:"潜江市"},{value:"429006",label:"天门市"},{value:"429021",label:"神农架林区"}]}]},{value:'430000',label:'湖南省',children:[{value:"430100",label:"长沙市",children:[{value:"430101",label:"市辖区"},{value:"430102",label:"芙蓉区"},{value:"430103",label:"天心区"},{value:"430104",label:"岳麓区"},{value:"430105",label:"开福区"},{value:"430111",label:"雨花区"},{value:"430112",label:"望城区"},{value:"430121",label:"长沙县"},{value:"430181",label:"浏阳市"},{value:"430182",label:"宁乡市"}]},{value:"430200",label:"株洲市",children:[{value:"430201",label:"市辖区"},{value:"430202",label:"荷塘区"},{value:"430203",label:"芦淞区"},{value:"430204",label:"石峰区"},{value:"430211",label:"天元区"},{value:"430221",label:"株洲县"},{value:"430223",label:"攸县"},{value:"430224",label:"茶陵县"},{value:"430225",label:"炎陵县"},{value:"430271",label:"云龙示范区"},{value:"430281",label:"醴陵市"}]},{value:"430300",label:"湘潭市",children:[{value:"430301",label:"市辖区"},{value:"430302",label:"雨湖区"},{value:"430304",label:"岳塘区"},{value:"430321",label:"湘潭县"},{value:"430371",label:"湖南湘潭高新技术产业园区"},{value:"430372",label:"湘潭昭山示范区"},{value:"430373",label:"湘潭九华示范区"},{value:"430381",label:"湘乡市"},{value:"430382",label:"韶山市"}]},{value:"430400",label:"衡阳市",children:[{value:"430401",label:"市辖区"},{value:"430405",label:"珠晖区"},{value:"430406",label:"雁峰区"},{value:"430407",label:"石鼓区"},{value:"430408",label:"蒸湘区"},{value:"430412",label:"南岳区"},{value:"430421",label:"衡阳县"},{value:"430422",label:"衡南县"},{value:"430423",label:"衡山县"},{value:"430424",label:"衡东县"},{value:"430426",label:"祁东县"},{value:"430471",label:"衡阳综合保税区"},{value:"430472",label:"湖南衡阳高新技术产业园区"},{value:"430473",label:"湖南衡阳松木经济开发区"},{value:"430481",label:"耒阳市"},{value:"430482",label:"常宁市"}]},{value:"430500",label:"邵阳市",children:[{value:"430501",label:"市辖区"},{value:"430502",label:"双清区"},{value:"430503",label:"大祥区"},{value:"430511",label:"北塔区"},{value:"430521",label:"邵东县"},{value:"430522",label:"新邵县"},{value:"430523",label:"邵阳县"},{value:"430524",label:"隆回县"},{value:"430525",label:"洞口县"},{value:"430527",label:"绥宁县"},{value:"430528",label:"新宁县"},{value:"430529",label:"城步苗族自治县"},{value:"430581",label:"武冈市"}]},{value:"430600",label:"岳阳市",children:[{value:"430601",label:"市辖区"},{value:"430602",label:"岳阳楼区"},{value:"430603",label:"云溪区"},{value:"430611",label:"君山区"},{value:"430621",label:"岳阳县"},{value:"430623",label:"华容县"},{value:"430624",label:"湘阴县"},{value:"430626",label:"平江县"},{value:"430671",label:"岳阳市屈原管理区"},{value:"430681",label:"汨罗市"},{value:"430682",label:"临湘市"}]},{value:"430700",label:"常德市",children:[{value:"430701",label:"市辖区"},{value:"430702",label:"武陵区"},{value:"430703",label:"鼎城区"},{value:"430721",label:"安乡县"},{value:"430722",label:"汉寿县"},{value:"430723",label:"澧县"},{value:"430724",label:"临澧县"},{value:"430725",label:"桃源县"},{value:"430726",label:"石门县"},{value:"430771",label:"常德市西洞庭管理区"},{value:"430781",label:"津市市"}]},{value:"430800",label:"张家界市",children:[{value:"430801",label:"市辖区"},{value:"430802",label:"永定区"},{value:"430811",label:"武陵源区"},{value:"430821",label:"慈利县"},{value:"430822",label:"桑植县"}]},{value:"430900",label:"益阳市",children:[{value:"430901",label:"市辖区"},{value:"430902",label:"资阳区"},{value:"430903",label:"赫山区"},{value:"430921",label:"南县"},{value:"430922",label:"桃江县"},{value:"430923",label:"安化县"},{value:"430971",label:"益阳市大通湖管理区"},{value:"430972",label:"湖南益阳高新技术产业园区"},{value:"430981",label:"沅江市"}]},{value:"431000",label:"郴州市",children:[{value:"431001",label:"市辖区"},{value:"431002",label:"北湖区"},{value:"431003",label:"苏仙区"},{value:"431021",label:"桂阳县"},{value:"431022",label:"宜章县"},{value:"431023",label:"永兴县"},{value:"431024",label:"嘉禾县"},{value:"431025",label:"临武县"},{value:"431026",label:"汝城县"},{value:"431027",label:"桂东县"},{value:"431028",label:"安仁县"},{value:"431081",label:"资兴市"}]},{value:"431100",label:"永州市",children:[{value:"431101",label:"市辖区"},{value:"431102",label:"零陵区"},{value:"431103",label:"冷水滩区"},{value:"431121",label:"祁阳县"},{value:"431122",label:"东安县"},{value:"431123",label:"双牌县"},{value:"431124",label:"道县"},{value:"431125",label:"江永县"},{value:"431126",label:"宁远县"},{value:"431127",label:"蓝山县"},{value:"431128",label:"新田县"},{value:"431129",label:"江华瑶族自治县"},{value:"431171",label:"永州经济技术开发区"},{value:"431172",label:"永州市金洞管理区"},{value:"431173",label:"永州市回龙圩管理区"}]},{value:"431200",label:"怀化市",children:[{value:"431201",label:"市辖区"},{value:"431202",label:"鹤城区"},{value:"431221",label:"中方县"},{value:"431222",label:"沅陵县"},{value:"431223",label:"辰溪县"},{value:"431224",label:"溆浦县"},{value:"431225",label:"会同县"},{value:"431226",label:"麻阳苗族自治县"},{value:"431227",label:"新晃侗族自治县"},{value:"431228",label:"芷江侗族自治县"},{value:"431229",label:"靖州苗族侗族自治县"},{value:"431230",label:"通道侗族自治县"},{value:"431271",label:"怀化市洪江管理区"},{value:"431281",label:"洪江市"}]},{value:"431300",label:"娄底市",children:[{value:"431301",label:"市辖区"},{value:"431302",label:"娄星区"},{value:"431321",label:"双峰县"},{value:"431322",label:"新化县"},{value:"431381",label:"冷水江市"},{value:"431382",label:"涟源市"}]},{value:"433100",label:"湘西土家族苗族自治州",children:[{value:"433101",label:"吉首市"},{value:"433122",label:"泸溪县"},{value:"433123",label:"凤凰县"},{value:"433124",label:"花垣县"},{value:"433125",label:"保靖县"},{value:"433126",label:"古丈县"},{value:"433127",label:"永顺县"},{value:"433130",label:"龙山县"},{value:"433172",label:"湖南吉首经济开发区"},{value:"433173",label:"湖南永顺经济开发区"}]}]},{value:'440000',label:'广东省',children:[{value:"440100",label:"广州市",children:[{value:"440101",label:"市辖区"},{value:"440103",label:"荔湾区"},{value:"440104",label:"越秀区"},{value:"440105",label:"海珠区"},{value:"440106",label:"天河区"},{value:"440111",label:"白云区"},{value:"440112",label:"黄埔区"},{value:"440113",label:"番禺区"},{value:"440114",label:"花都区"},{value:"440115",label:"南沙区"},{value:"440117",label:"从化区"},{value:"440118",label:"增城区"}]},{value:"440200",label:"韶关市",children:[{value:"440201",label:"市辖区"},{value:"440203",label:"武江区"},{value:"440204",label:"浈江区"},{value:"440205",label:"曲江区"},{value:"440222",label:"始兴县"},{value:"440224",label:"仁化县"},{value:"440229",label:"翁源县"},{value:"440232",label:"乳源瑶族自治县"},{value:"440233",label:"新丰县"},{value:"440281",label:"乐昌市"},{value:"440282",label:"南雄市"}]},{value:"440300",label:"深圳市",children:[{value:"440301",label:"市辖区"},{value:"440303",label:"罗湖区"},{value:"440304",label:"福田区"},{value:"440305",label:"南山区"},{value:"440306",label:"宝安区"},{value:"440307",label:"龙岗区"},{value:"440308",label:"盐田区"},{value:"440309",label:"龙华区"},{value:"440310",label:"坪山区"}]},{value:"440400",label:"珠海市",children:[{value:"440401",label:"市辖区"},{value:"440402",label:"香洲区"},{value:"440403",label:"斗门区"},{value:"440404",label:"金湾区"}]},{value:"440500",label:"汕头市",children:[{value:"440501",label:"市辖区"},{value:"440507",label:"龙湖区"},{value:"440511",label:"金平区"},{value:"440512",label:"濠江区"},{value:"440513",label:"潮阳区"},{value:"440514",label:"潮南区"},{value:"440515",label:"澄海区"},{value:"440523",label:"南澳县"}]},{value:"440600",label:"佛山市",children:[{value:"440601",label:"市辖区"},{value:"440604",label:"禅城区"},{value:"440605",label:"南海区"},{value:"440606",label:"顺德区"},{value:"440607",label:"三水区"},{value:"440608",label:"高明区"}]},{value:"440700",label:"江门市",children:[{value:"440701",label:"市辖区"},{value:"440703",label:"蓬江区"},{value:"440704",label:"江海区"},{value:"440705",label:"新会区"},{value:"440781",label:"台山市"},{value:"440783",label:"开平市"},{value:"440784",label:"鹤山市"},{value:"440785",label:"恩平市"}]},{value:"440800",label:"湛江市",children:[{value:"440801",label:"市辖区"},{value:"440802",label:"赤坎区"},{value:"440803",label:"霞山区"},{value:"440804",label:"坡头区"},{value:"440811",label:"麻章区"},{value:"440823",label:"遂溪县"},{value:"440825",label:"徐闻县"},{value:"440881",label:"廉江市"},{value:"440882",label:"雷州市"},{value:"440883",label:"吴川市"}]},{value:"440900",label:"茂名市",children:[{value:"440901",label:"市辖区"},{value:"440902",label:"茂南区"},{value:"440904",label:"电白区"},{value:"440981",label:"高州市"},{value:"440982",label:"化州市"},{value:"440983",label:"信宜市"}]},{value:"441200",label:"肇庆市",children:[{value:"441201",label:"市辖区"},{value:"441202",label:"端州区"},{value:"441203",label:"鼎湖区"},{value:"441204",label:"高要区"},{value:"441223",label:"广宁县"},{value:"441224",label:"怀集县"},{value:"441225",label:"封开县"},{value:"441226",label:"德庆县"},{value:"441284",label:"四会市"}]},{value:"441300",label:"惠州市",children:[{value:"441301",label:"市辖区"},{value:"441302",label:"惠城区"},{value:"441303",label:"惠阳区"},{value:"441322",label:"博罗县"},{value:"441323",label:"惠东县"},{value:"441324",label:"龙门县"}]},{value:"441400",label:"梅州市",children:[{value:"441401",label:"市辖区"},{value:"441402",label:"梅江区"},{value:"441403",label:"梅县区"},{value:"441422",label:"大埔县"},{value:"441423",label:"丰顺县"},{value:"441424",label:"五华县"},{value:"441426",label:"平远县"},{value:"441427",label:"蕉岭县"},{value:"441481",label:"兴宁市"}]},{value:"441500",label:"汕尾市",children:[{value:"441501",label:"市辖区"},{value:"441502",label:"城区"},{value:"441521",label:"海丰县"},{value:"441523",label:"陆河县"},{value:"441581",label:"陆丰市"}]},{value:"441600",label:"河源市",children:[{value:"441601",label:"市辖区"},{value:"441602",label:"源城区"},{value:"441621",label:"紫金县"},{value:"441622",label:"龙川县"},{value:"441623",label:"连平县"},{value:"441624",label:"和平县"},{value:"441625",label:"东源县"}]},{value:"441700",label:"阳江市",children:[{value:"441701",label:"市辖区"},{value:"441702",label:"江城区"},{value:"441704",label:"阳东区"},{value:"441721",label:"阳西县"},{value:"441781",label:"阳春市"}]},{value:"441800",label:"清远市",children:[{value:"441801",label:"市辖区"},{value:"441802",label:"清城区"},{value:"441803",label:"清新区"},{value:"441821",label:"佛冈县"},{value:"441823",label:"阳山县"},{value:"441825",label:"连山壮族瑶族自治县"},{value:"441826",label:"连南瑶族自治县"},{value:"441881",label:"英德市"},{value:"441882",label:"连州市"}]},{value:"441900",label:"东莞市"},{value:"442000",label:"中山市"},{value:"445100",label:"潮州市",children:[{value:"445101",label:"市辖区"},{value:"445102",label:"湘桥区"},{value:"445103",label:"潮安区"},{value:"445122",label:"饶平县"}]},{value:"445200",label:"揭阳市",children:[{value:"445201",label:"市辖区"},{value:"445202",label:"榕城区"},{value:"445203",label:"揭东区"},{value:"445222",label:"揭西县"},{value:"445224",label:"惠来县"},{value:"445281",label:"普宁市"}]},{value:"445300",label:"云浮市",children:[{value:"445301",label:"市辖区"},{value:"445302",label:"云城区"},{value:"445303",label:"云安区"},{value:"445321",label:"新兴县"},{value:"445322",label:"郁南县"},{value:"445381",label:"罗定市"}]}]},{value:'450000',label:'广西壮族',children:[{value:"450100",label:"南宁市",children:[{value:"450101",label:"市辖区"},{value:"450102",label:"兴宁区"},{value:"450103",label:"青秀区"},{value:"450105",label:"江南区"},{value:"450107",label:"西乡塘区"},{value:"450108",label:"良庆区"},{value:"450109",label:"邕宁区"},{value:"450110",label:"武鸣区"},{value:"450123",label:"隆安县"},{value:"450124",label:"马山县"},{value:"450125",label:"上林县"},{value:"450126",label:"宾阳县"},{value:"450127",label:"横县"}]},{value:"450200",label:"柳州市",children:[{value:"450201",label:"市辖区"},{value:"450202",label:"城中区"},{value:"450203",label:"鱼峰区"},{value:"450204",label:"柳南区"},{value:"450205",label:"柳北区"},{value:"450206",label:"柳江区"},{value:"450222",label:"柳城县"},{value:"450223",label:"鹿寨县"},{value:"450224",label:"融安县"},{value:"450225",label:"融水苗族自治县"},{value:"450226",label:"三江侗族自治县"}]},{value:"450300",label:"桂林市",children:[{value:"450301",label:"市辖区"},{value:"450302",label:"秀峰区"},{value:"450303",label:"叠彩区"},{value:"450304",label:"象山区"},{value:"450305",label:"七星区"},{value:"450311",label:"雁山区"},{value:"450312",label:"临桂区"},{value:"450321",label:"阳朔县"},{value:"450323",label:"灵川县"},{value:"450324",label:"全州县"},{value:"450325",label:"兴安县"},{value:"450326",label:"永福县"},{value:"450327",label:"灌阳县"},{value:"450328",label:"龙胜各族自治县"},{value:"450329",label:"资源县"},{value:"450330",label:"平乐县"},{value:"450331",label:"荔浦县"},{value:"450332",label:"恭城瑶族自治县"}]},{value:"450400",label:"梧州市",children:[{value:"450401",label:"市辖区"},{value:"450403",label:"万秀区"},{value:"450405",label:"长洲区"},{value:"450406",label:"龙圩区"},{value:"450421",label:"苍梧县"},{value:"450422",label:"藤县"},{value:"450423",label:"蒙山县"},{value:"450481",label:"岑溪市"}]},{value:"450500",label:"北海市",children:[{value:"450501",label:"市辖区"},{value:"450502",label:"海城区"},{value:"450503",label:"银海区"},{value:"450512",label:"铁山港区"},{value:"450521",label:"合浦县"}]},{value:"450600",label:"防城港市",children:[{value:"450601",label:"市辖区"},{value:"450602",label:"港口区"},{value:"450603",label:"防城区"},{value:"450621",label:"上思县"},{value:"450681",label:"东兴市"}]},{value:"450700",label:"钦州市",children:[{value:"450701",label:"市辖区"},{value:"450702",label:"钦南区"},{value:"450703",label:"钦北区"},{value:"450721",label:"灵山县"},{value:"450722",label:"浦北县"}]},{value:"450800",label:"贵港市",children:[{value:"450801",label:"市辖区"},{value:"450802",label:"港北区"},{value:"450803",label:"港南区"},{value:"450804",label:"覃塘区"},{value:"450821",label:"平南县"},{value:"450881",label:"桂平市"}]},{value:"450900",label:"玉林市",children:[{value:"450901",label:"市辖区"},{value:"450902",label:"玉州区"},{value:"450903",label:"福绵区"},{value:"450921",label:"容县"},{value:"450922",label:"陆川县"},{value:"450923",label:"博白县"},{value:"450924",label:"兴业县"},{value:"450981",label:"北流市"}]},{value:"451000",label:"百色市",children:[{value:"451001",label:"市辖区"},{value:"451002",label:"右江区"},{value:"451021",label:"田阳县"},{value:"451022",label:"田东县"},{value:"451023",label:"平果县"},{value:"451024",label:"德保县"},{value:"451026",label:"那坡县"},{value:"451027",label:"凌云县"},{value:"451028",label:"乐业县"},{value:"451029",label:"田林县"},{value:"451030",label:"西林县"},{value:"451031",label:"隆林各族自治县"},{value:"451081",label:"靖西市"}]},{value:"451100",label:"贺州市",children:[{value:"451101",label:"市辖区"},{value:"451102",label:"八步区"},{value:"451103",label:"平桂区"},{value:"451121",label:"昭平县"},{value:"451122",label:"钟山县"},{value:"451123",label:"富川瑶族自治县"}]},{value:"451200",label:"河池市",children:[{value:"451201",label:"市辖区"},{value:"451202",label:"金城江区"},{value:"451203",label:"宜州区"},{value:"451221",label:"南丹县"},{value:"451222",label:"天峨县"},{value:"451223",label:"凤山县"},{value:"451224",label:"东兰县"},{value:"451225",label:"罗城仫佬族自治县"},{value:"451226",label:"环江毛南族自治县"},{value:"451227",label:"巴马瑶族自治县"},{value:"451228",label:"都安瑶族自治县"},{value:"451229",label:"大化瑶族自治县"}]},{value:"451300",label:"来宾市",children:[{value:"451301",label:"市辖区"},{value:"451302",label:"兴宾区"},{value:"451321",label:"忻城县"},{value:"451322",label:"象州县"},{value:"451323",label:"武宣县"},{value:"451324",label:"金秀瑶族自治县"},{value:"451381",label:"合山市"}]},{value:"451400",label:"崇左市",children:[{value:"451401",label:"市辖区"},{value:"451402",label:"江州区"},{value:"451421",label:"扶绥县"},{value:"451422",label:"宁明县"},{value:"451423",label:"龙州县"},{value:"451424",label:"大新县"},{value:"451425",label:"天等县"},{value:"451481",label:"凭祥市"}]}]},{value:'460000',label:'海南省',children:[{value:"460100",label:"海口市",children:[{value:"460101",label:"市辖区"},{value:"460105",label:"秀英区"},{value:"460106",label:"龙华区"},{value:"460107",label:"琼山区"},{value:"460108",label:"美兰区"}]},{value:"460200",label:"三亚市",children:[{value:"460201",label:"市辖区"},{value:"460202",label:"海棠区"},{value:"460203",label:"吉阳区"},{value:"460204",label:"天涯区"},{value:"460205",label:"崖州区"}]},{value:"460300",label:"三沙市",children:[{value:"460321",label:"西沙群岛"},{value:"460322",label:"南沙群岛"},{value:"460323",label:"中沙群岛的岛礁及其海域"}]},{value:"460400",label:"儋州市"},{value:"469000",label:"省直辖县级行政区划",children:[{value:"469001",label:"五指山市"},{value:"469002",label:"琼海市"},{value:"469005",label:"文昌市"},{value:"469006",label:"万宁市"},{value:"469007",label:"东方市"},{value:"469021",label:"定安县"},{value:"469022",label:"屯昌县"},{value:"469023",label:"澄迈县"},{value:"469024",label:"临高县"},{value:"469025",label:"白沙黎族自治县"},{value:"469026",label:"昌江黎族自治县"},{value:"469027",label:"乐东黎族自治县"},{value:"469028",label:"陵水黎族自治县"},{value:"469029",label:"保亭黎族苗族自治县"},{value:"469030",label:"琼中黎族苗族自治县"}]}]},{value:'500000',label:'重庆',children:[{value:"500100",label:"市辖区",children:[{value:"500101",label:"万州区"},{value:"500102",label:"涪陵区"},{value:"500103",label:"渝中区"},{value:"500104",label:"大渡口区"},{value:"500105",label:"江北区"},{value:"500106",label:"沙坪坝区"},{value:"500107",label:"九龙坡区"},{value:"500108",label:"南岸区"},{value:"500109",label:"北碚区"},{value:"500110",label:"綦江区"},{value:"500111",label:"大足区"},{value:"500112",label:"渝北区"},{value:"500113",label:"巴南区"},{value:"500114",label:"黔江区"},{value:"500115",label:"长寿区"},{value:"500116",label:"江津区"},{value:"500117",label:"合川区"},{value:"500118",label:"永川区"},{value:"500119",label:"南川区"},{value:"500120",label:"璧山区"},{value:"500151",label:"铜梁区"},{value:"500152",label:"潼南区"},{value:"500153",label:"荣昌区"},{value:"500154",label:"开州区"},{value:"500155",label:"梁平区"},{value:"500156",label:"武隆区"}]},{value:"500200",label:"县",children:[{value:"500229",label:"城口县"},{value:"500230",label:"丰都县"},{value:"500231",label:"垫江县"},{value:"500233",label:"忠县"},{value:"500235",label:"云阳县"},{value:"500236",label:"奉节县"},{value:"500237",label:"巫山县"},{value:"500238",label:"巫溪县"},{value:"500240",label:"石柱土家族自治县"},{value:"500241",label:"秀山土家族苗族自治县"},{value:"500242",label:"酉阳土家族苗族自治县"},{value:"500243",label:"彭水苗族土家族自治县"}]}]},{value:'510000',label:'四川省',children:[{value:"510100",label:"成都市",children:[{value:"510101",label:"市辖区"},{value:"510104",label:"锦江区"},{value:"510105",label:"青羊区"},{value:"510106",label:"金牛区"},{value:"510107",label:"武侯区"},{value:"510108",label:"成华区"},{value:"510112",label:"龙泉驿区"},{value:"510113",label:"青白江区"},{value:"510114",label:"新都区"},{value:"510115",label:"温江区"},{value:"510116",label:"双流区"},{value:"510117",label:"郫都区"},{value:"510121",label:"金堂县"},{value:"510129",label:"大邑县"},{value:"510131",label:"蒲江县"},{value:"510132",label:"新津县"},{value:"510181",label:"都江堰市"},{value:"510182",label:"彭州市"},{value:"510183",label:"邛崃市"},{value:"510184",label:"崇州市"},{value:"510185",label:"简阳市"}]},{value:"510300",label:"自贡市",children:[{value:"510301",label:"市辖区"},{value:"510302",label:"自流井区"},{value:"510303",label:"贡井区"},{value:"510304",label:"大安区"},{value:"510311",label:"沿滩区"},{value:"510321",label:"荣县"},{value:"510322",label:"富顺县"}]},{value:"510400",label:"攀枝花市",children:[{value:"510401",label:"市辖区"},{value:"510402",label:"东区"},{value:"510403",label:"西区"},{value:"510411",label:"仁和区"},{value:"510421",label:"米易县"},{value:"510422",label:"盐边县"}]},{value:"510500",label:"泸州市",children:[{value:"510501",label:"市辖区"},{value:"510502",label:"江阳区"},{value:"510503",label:"纳溪区"},{value:"510504",label:"龙马潭区"},{value:"510521",label:"泸县"},{value:"510522",label:"合江县"},{value:"510524",label:"叙永县"},{value:"510525",label:"古蔺县"}]},{value:"510600",label:"德阳市",children:[{value:"510601",label:"市辖区"},{value:"510603",label:"旌阳区"},{value:"510604",label:"罗江区"},{value:"510623",label:"中江县"},{value:"510681",label:"广汉市"},{value:"510682",label:"什邡市"},{value:"510683",label:"绵竹市"}]},{value:"510700",label:"绵阳市",children:[{value:"510701",label:"市辖区"},{value:"510703",label:"涪城区"},{value:"510704",label:"游仙区"},{value:"510705",label:"安州区"},{value:"510722",label:"三台县"},{value:"510723",label:"盐亭县"},{value:"510725",label:"梓潼县"},{value:"510726",label:"北川羌族自治县"},{value:"510727",label:"平武县"},{value:"510781",label:"江油市"}]},{value:"510800",label:"广元市",children:[{value:"510801",label:"市辖区"},{value:"510802",label:"利州区"},{value:"510811",label:"昭化区"},{value:"510812",label:"朝天区"},{value:"510821",label:"旺苍县"},{value:"510822",label:"青川县"},{value:"510823",label:"剑阁县"},{value:"510824",label:"苍溪县"}]},{value:"510900",label:"遂宁市",children:[{value:"510901",label:"市辖区"},{value:"510903",label:"船山区"},{value:"510904",label:"安居区"},{value:"510921",label:"蓬溪县"},{value:"510922",label:"射洪县"},{value:"510923",label:"大英县"}]},{value:"511000",label:"内江市",children:[{value:"511001",label:"市辖区"},{value:"511002",label:"市中区"},{value:"511011",label:"东兴区"},{value:"511024",label:"威远县"},{value:"511025",label:"资中县"},{value:"511071",label:"内江经济开发区"},{value:"511083",label:"隆昌市"}]},{value:"511100",label:"乐山市",children:[{value:"511101",label:"市辖区"},{value:"511102",label:"市中区"},{value:"511111",label:"沙湾区"},{value:"511112",label:"五通桥区"},{value:"511113",label:"金口河区"},{value:"511123",label:"犍为县"},{value:"511124",label:"井研县"},{value:"511126",label:"夹江县"},{value:"511129",label:"沐川县"},{value:"511132",label:"峨边彝族自治县"},{value:"511133",label:"马边彝族自治县"},{value:"511181",label:"峨眉山市"}]},{value:"511300",label:"南充市",children:[{value:"511301",label:"市辖区"},{value:"511302",label:"顺庆区"},{value:"511303",label:"高坪区"},{value:"511304",label:"嘉陵区"},{value:"511321",label:"南部县"},{value:"511322",label:"营山县"},{value:"511323",label:"蓬安县"},{value:"511324",label:"仪陇县"},{value:"511325",label:"西充县"},{value:"511381",label:"阆中市"}]},{value:"511400",label:"眉山市",children:[{value:"511401",label:"市辖区"},{value:"511402",label:"东坡区"},{value:"511403",label:"彭山区"},{value:"511421",label:"仁寿县"},{value:"511423",label:"洪雅县"},{value:"511424",label:"丹棱县"},{value:"511425",label:"青神县"}]},{value:"511500",label:"宜宾市",children:[{value:"511501",label:"市辖区"},{value:"511502",label:"翠屏区"},{value:"511503",label:"南溪区"},{value:"511521",label:"宜宾县"},{value:"511523",label:"江安县"},{value:"511524",label:"长宁县"},{value:"511525",label:"高县"},{value:"511526",label:"珙县"},{value:"511527",label:"筠连县"},{value:"511528",label:"兴文县"},{value:"511529",label:"屏山县"}]},{value:"511600",label:"广安市",children:[{value:"511601",label:"市辖区"},{value:"511602",label:"广安区"},{value:"511603",label:"前锋区"},{value:"511621",label:"岳池县"},{value:"511622",label:"武胜县"},{value:"511623",label:"邻水县"},{value:"511681",label:"华蓥市"}]},{value:"511700",label:"达州市",children:[{value:"511701",label:"市辖区"},{value:"511702",label:"通川区"},{value:"511703",label:"达川区"},{value:"511722",label:"宣汉县"},{value:"511723",label:"开江县"},{value:"511724",label:"大竹县"},{value:"511725",label:"渠县"},{value:"511771",label:"达州经济开发区"},{value:"511781",label:"万源市"}]},{value:"511800",label:"雅安市",children:[{value:"511801",label:"市辖区"},{value:"511802",label:"雨城区"},{value:"511803",label:"名山区"},{value:"511822",label:"荥经县"},{value:"511823",label:"汉源县"},{value:"511824",label:"石棉县"},{value:"511825",label:"天全县"},{value:"511826",label:"芦山县"},{value:"511827",label:"宝兴县"}]},{value:"511900",label:"巴中市",children:[{value:"511901",label:"市辖区"},{value:"511902",label:"巴州区"},{value:"511903",label:"恩阳区"},{value:"511921",label:"通江县"},{value:"511922",label:"南江县"},{value:"511923",label:"平昌县"},{value:"511971",label:"巴中经济开发区"}]},{value:"512000",label:"资阳市",children:[{value:"512001",label:"市辖区"},{value:"512002",label:"雁江区"},{value:"512021",label:"安岳县"},{value:"512022",label:"乐至县"}]},{value:"513200",label:"阿坝藏族羌族自治州",children:[{value:"513201",label:"马尔康市"},{value:"513221",label:"汶川县"},{value:"513222",label:"理县"},{value:"513223",label:"茂县"},{value:"513224",label:"松潘县"},{value:"513225",label:"九寨沟县"},{value:"513226",label:"金川县"},{value:"513227",label:"小金县"},{value:"513228",label:"黑水县"},{value:"513230",label:"壤塘县"},{value:"513231",label:"阿坝县"},{value:"513232",label:"若尔盖县"},{value:"513233",label:"红原县"}]},{value:"513300",label:"甘孜藏族自治州",children:[{value:"513301",label:"康定市"},{value:"513322",label:"泸定县"},{value:"513323",label:"丹巴县"},{value:"513324",label:"九龙县"},{value:"513325",label:"雅江县"},{value:"513326",label:"道孚县"},{value:"513327",label:"炉霍县"},{value:"513328",label:"甘孜县"},{value:"513329",label:"新龙县"},{value:"513330",label:"德格县"},{value:"513331",label:"白玉县"},{value:"513332",label:"石渠县"},{value:"513333",label:"色达县"},{value:"513334",label:"理塘县"},{value:"513335",label:"巴塘县"},{value:"513336",label:"乡城县"},{value:"513337",label:"稻城县"},{value:"513338",label:"得荣县"}]},{value:"513400",label:"凉山彝族自治州",children:[{value:"513401",label:"西昌市"},{value:"513422",label:"木里藏族自治县"},{value:"513423",label:"盐源县"},{value:"513424",label:"德昌县"},{value:"513425",label:"会理县"},{value:"513426",label:"会东县"},{value:"513427",label:"宁南县"},{value:"513428",label:"普格县"},{value:"513429",label:"布拖县"},{value:"513430",label:"金阳县"},{value:"513431",label:"昭觉县"},{value:"513432",label:"喜德县"},{value:"513433",label:"冕宁县"},{value:"513434",label:"越西县"},{value:"513435",label:"甘洛县"},{value:"513436",label:"美姑县"},{value:"513437",label:"雷波县"}]}]},{value:'520000',label:'贵州省',children:[{value:"520100",label:"贵阳市",children:[{value:"520101",label:"市辖区"},{value:"520102",label:"南明区"},{value:"520103",label:"云岩区"},{value:"520111",label:"花溪区"},{value:"520112",label:"乌当区"},{value:"520113",label:"白云区"},{value:"520115",label:"观山湖区"},{value:"520121",label:"开阳县"},{value:"520122",label:"息烽县"},{value:"520123",label:"修文县"},{value:"520181",label:"清镇市"}]},{value:"520200",label:"六盘水市",children:[{value:"520201",label:"钟山区"},{value:"520203",label:"六枝特区"},{value:"520221",label:"水城县"},{value:"520281",label:"盘州市"}]},{value:"520300",label:"遵义市",children:[{value:"520301",label:"市辖区"},{value:"520302",label:"红花岗区"},{value:"520303",label:"汇川区"},{value:"520304",label:"播州区"},{value:"520322",label:"桐梓县"},{value:"520323",label:"绥阳县"},{value:"520324",label:"正安县"},{value:"520325",label:"道真仡佬族苗族自治县"},{value:"520326",label:"务川仡佬族苗族自治县"},{value:"520327",label:"凤冈县"},{value:"520328",label:"湄潭县"},{value:"520329",label:"余庆县"},{value:"520330",label:"习水县"},{value:"520381",label:"赤水市"},{value:"520382",label:"仁怀市"}]},{value:"520400",label:"安顺市",children:[{value:"520401",label:"市辖区"},{value:"520402",label:"西秀区"},{value:"520403",label:"平坝区"},{value:"520422",label:"普定县"},{value:"520423",label:"镇宁布依族苗族自治县"},{value:"520424",label:"关岭布依族苗族自治县"},{value:"520425",label:"紫云苗族布依族自治县"}]},{value:"520500",label:"毕节市",children:[{value:"520501",label:"市辖区"},{value:"520502",label:"七星关区"},{value:"520521",label:"大方县"},{value:"520522",label:"黔西县"},{value:"520523",label:"金沙县"},{value:"520524",label:"织金县"},{value:"520525",label:"纳雍县"},{value:"520526",label:"威宁彝族回族苗族自治县"},{value:"520527",label:"赫章县"}]},{value:"520600",label:"铜仁市",children:[{value:"520601",label:"市辖区"},{value:"520602",label:"碧江区"},{value:"520603",label:"万山区"},{value:"520621",label:"江口县"},{value:"520622",label:"玉屏侗族自治县"},{value:"520623",label:"石阡县"},{value:"520624",label:"思南县"},{value:"520625",label:"印江土家族苗族自治县"},{value:"520626",label:"德江县"},{value:"520627",label:"沿河土家族自治县"},{value:"520628",label:"松桃苗族自治县"}]},{value:"522300",label:"黔西南布依族苗族自治州",children:[{value:"522301",label:"兴义市"},{value:"522322",label:"兴仁县"},{value:"522323",label:"普安县"},{value:"522324",label:"晴隆县"},{value:"522325",label:"贞丰县"},{value:"522326",label:"望谟县"},{value:"522327",label:"册亨县"},{value:"522328",label:"安龙县"}]},{value:"522600",label:"黔东南苗族侗族自治州",children:[{value:"522601",label:"凯里市"},{value:"522622",label:"黄平县"},{value:"522623",label:"施秉县"},{value:"522624",label:"三穗县"},{value:"522625",label:"镇远县"},{value:"522626",label:"岑巩县"},{value:"522627",label:"天柱县"},{value:"522628",label:"锦屏县"},{value:"522629",label:"剑河县"},{value:"522630",label:"台江县"},{value:"522631",label:"黎平县"},{value:"522632",label:"榕江县"},{value:"522633",label:"从江县"},{value:"522634",label:"雷山县"},{value:"522635",label:"麻江县"},{value:"522636",label:"丹寨县"}]},{value:"522700",label:"黔南布依族苗族自治州",children:[{value:"522701",label:"都匀市"},{value:"522702",label:"福泉市"},{value:"522722",label:"荔波县"},{value:"522723",label:"贵定县"},{value:"522725",label:"瓮安县"},{value:"522726",label:"独山县"},{value:"522727",label:"平塘县"},{value:"522728",label:"罗甸县"},{value:"522729",label:"长顺县"},{value:"522730",label:"龙里县"},{value:"522731",label:"惠水县"},{value:"522732",label:"三都水族自治县"}]}]},{value:'530000',label:'云南省',children:[{value:"530100",label:"昆明市",children:[{value:"530101",label:"市辖区"},{value:"530102",label:"五华区"},{value:"530103",label:"盘龙区"},{value:"530111",label:"官渡区"},{value:"530112",label:"西山区"},{value:"530113",label:"东川区"},{value:"530114",label:"呈贡区"},{value:"530115",label:"晋宁区"},{value:"530124",label:"富民县"},{value:"530125",label:"宜良县"},{value:"530126",label:"石林彝族自治县"},{value:"530127",label:"嵩明县"},{value:"530128",label:"禄劝彝族苗族自治县"},{value:"530129",label:"寻甸回族彝族自治县"},{value:"530181",label:"安宁市"}]},{value:"530300",label:"曲靖市",children:[{value:"530301",label:"市辖区"},{value:"530302",label:"麒麟区"},{value:"530303",label:"沾益区"},{value:"530321",label:"马龙县"},{value:"530322",label:"陆良县"},{value:"530323",label:"师宗县"},{value:"530324",label:"罗平县"},{value:"530325",label:"富源县"},{value:"530326",label:"会泽县"},{value:"530381",label:"宣威市"}]},{value:"530400",label:"玉溪市",children:[{value:"530401",label:"市辖区"},{value:"530402",label:"红塔区"},{value:"530403",label:"江川区"},{value:"530422",label:"澄江县"},{value:"530423",label:"通海县"},{value:"530424",label:"华宁县"},{value:"530425",label:"易门县"},{value:"530426",label:"峨山彝族自治县"},{value:"530427",label:"新平彝族傣族自治县"},{value:"530428",label:"元江哈尼族彝族傣族自治县"}]},{value:"530500",label:"保山市",children:[{value:"530501",label:"市辖区"},{value:"530502",label:"隆阳区"},{value:"530521",label:"施甸县"},{value:"530523",label:"龙陵县"},{value:"530524",label:"昌宁县"},{value:"530581",label:"腾冲市"}]},{value:"530600",label:"昭通市",children:[{value:"530601",label:"市辖区"},{value:"530602",label:"昭阳区"},{value:"530621",label:"鲁甸县"},{value:"530622",label:"巧家县"},{value:"530623",label:"盐津县"},{value:"530624",label:"大关县"},{value:"530625",label:"永善县"},{value:"530626",label:"绥江县"},{value:"530627",label:"镇雄县"},{value:"530628",label:"彝良县"},{value:"530629",label:"威信县"},{value:"530630",label:"水富县"}]},{value:"530700",label:"丽江市",children:[{value:"530701",label:"市辖区"},{value:"530702",label:"古城区"},{value:"530721",label:"玉龙纳西族自治县"},{value:"530722",label:"永胜县"},{value:"530723",label:"华坪县"},{value:"530724",label:"宁蒗彝族自治县"}]},{value:"530800",label:"普洱市",children:[{value:"530801",label:"市辖区"},{value:"530802",label:"思茅区"},{value:"530821",label:"宁洱哈尼族彝族自治县"},{value:"530822",label:"墨江哈尼族自治县"},{value:"530823",label:"景东彝族自治县"},{value:"530824",label:"景谷傣族彝族自治县"},{value:"530825",label:"镇沅彝族哈尼族拉祜族自治县"},{value:"530826",label:"江城哈尼族彝族自治县"},{value:"530827",label:"孟连傣族拉祜族佤族自治县"},{value:"530828",label:"澜沧拉祜族自治县"},{value:"530829",label:"西盟佤族自治县"}]},{value:"530900",label:"临沧市",children:[{value:"530901",label:"市辖区"},{value:"530902",label:"临翔区"},{value:"530921",label:"凤庆县"},{value:"530922",label:"云县"},{value:"530923",label:"永德县"},{value:"530924",label:"镇康县"},{value:"530925",label:"双江拉祜族佤族布朗族傣族自治县"},{value:"530926",label:"耿马傣族佤族自治县"},{value:"530927",label:"沧源佤族自治县"}]},{value:"532300",label:"楚雄彝族自治州",children:[{value:"532301",label:"楚雄市"},{value:"532322",label:"双柏县"},{value:"532323",label:"牟定县"},{value:"532324",label:"南华县"},{value:"532325",label:"姚安县"},{value:"532326",label:"大姚县"},{value:"532327",label:"永仁县"},{value:"532328",label:"元谋县"},{value:"532329",label:"武定县"},{value:"532331",label:"禄丰县"}]},{value:"532500",label:"红河哈尼族彝族自治州",children:[{value:"532501",label:"个旧市"},{value:"532502",label:"开远市"},{value:"532503",label:"蒙自市"},{value:"532504",label:"弥勒市"},{value:"532523",label:"屏边苗族自治县"},{value:"532524",label:"建水县"},{value:"532525",label:"石屏县"},{value:"532527",label:"泸西县"},{value:"532528",label:"元阳县"},{value:"532529",label:"红河县"},{value:"532530",label:"金平苗族瑶族傣族自治县"},{value:"532531",label:"绿春县"},{value:"532532",label:"河口瑶族自治县"}]},{value:"532600",label:"文山壮族苗族自治州",children:[{value:"532601",label:"文山市"},{value:"532622",label:"砚山县"},{value:"532623",label:"西畴县"},{value:"532624",label:"麻栗坡县"},{value:"532625",label:"马关县"},{value:"532626",label:"丘北县"},{value:"532627",label:"广南县"},{value:"532628",label:"富宁县"}]},{value:"532800",label:"西双版纳傣族自治州",children:[{value:"532801",label:"景洪市"},{value:"532822",label:"勐海县"},{value:"532823",label:"勐腊县"}]},{value:"532900",label:"大理白族自治州",children:[{value:"532901",label:"大理市"},{value:"532922",label:"漾濞彝族自治县"},{value:"532923",label:"祥云县"},{value:"532924",label:"宾川县"},{value:"532925",label:"弥渡县"},{value:"532926",label:"南涧彝族自治县"},{value:"532927",label:"巍山彝族回族自治县"},{value:"532928",label:"永平县"},{value:"532929",label:"云龙县"},{value:"532930",label:"洱源县"},{value:"532931",label:"剑川县"},{value:"532932",label:"鹤庆县"}]},{value:"533100",label:"德宏傣族景颇族自治州",children:[{value:"533102",label:"瑞丽市"},{value:"533103",label:"芒市"},{value:"533122",label:"梁河县"},{value:"533123",label:"盈江县"},{value:"533124",label:"陇川县"}]},{value:"533300",label:"怒江傈僳族自治州",children:[{value:"533301",label:"泸水市"},{value:"533323",label:"福贡县"},{value:"533324",label:"贡山独龙族怒族自治县"},{value:"533325",label:"兰坪白族普米族自治县"}]},{value:"533400",label:"迪庆藏族自治州",children:[{value:"533401",label:"香格里拉市"},{value:"533422",label:"德钦县"},{value:"533423",label:"维西傈僳族自治县"}]}]},{value:'540000',label:'西藏',children:[{value:"540100",label:"拉萨市",children:[{value:"540101",label:"市辖区"},{value:"540102",label:"城关区"},{value:"540103",label:"堆龙德庆区"},{value:"540121",label:"林周县"},{value:"540122",label:"当雄县"},{value:"540123",label:"尼木县"},{value:"540124",label:"曲水县"},{value:"540126",label:"达孜县"},{value:"540127",label:"墨竹工卡县"},{value:"540171",label:"格尔木藏青工业园区"},{value:"540172",label:"拉萨经济技术开发区"},{value:"540173",label:"西藏文化旅游创意园区"},{value:"540174",label:"达孜工业园区"}]},{value:"540200",label:"日喀则市",children:[{value:"540202",label:"桑珠孜区"},{value:"540221",label:"南木林县"},{value:"540222",label:"江孜县"},{value:"540223",label:"定日县"},{value:"540224",label:"萨迦县"},{value:"540225",label:"拉孜县"},{value:"540226",label:"昂仁县"},{value:"540227",label:"谢通门县"},{value:"540228",label:"白朗县"},{value:"540229",label:"仁布县"},{value:"540230",label:"康马县"},{value:"540231",label:"定结县"},{value:"540232",label:"仲巴县"},{value:"540233",label:"亚东县"},{value:"540234",label:"吉隆县"},{value:"540235",label:"聂拉木县"},{value:"540236",label:"萨嘎县"},{value:"540237",label:"岗巴县"}]},{value:"540300",label:"昌都市",children:[{value:"540302",label:"卡若区"},{value:"540321",label:"江达县"},{value:"540322",label:"贡觉县"},{value:"540323",label:"类乌齐县"},{value:"540324",label:"丁青县"},{value:"540325",label:"察雅县"},{value:"540326",label:"八宿县"},{value:"540327",label:"左贡县"},{value:"540328",label:"芒康县"},{value:"540329",label:"洛隆县"},{value:"540330",label:"边坝县"}]},{value:"540400",label:"林芝市",children:[{value:"540402",label:"巴宜区"},{value:"540421",label:"工布江达县"},{value:"540422",label:"米林县"},{value:"540423",label:"墨脱县"},{value:"540424",label:"波密县"},{value:"540425",label:"察隅县"},{value:"540426",label:"朗县"}]},{value:"540500",label:"山南市",children:[{value:"540501",label:"市辖区"},{value:"540502",label:"乃东区"},{value:"540521",label:"扎囊县"},{value:"540522",label:"贡嘎县"},{value:"540523",label:"桑日县"},{value:"540524",label:"琼结县"},{value:"540525",label:"曲松县"},{value:"540526",label:"措美县"},{value:"540527",label:"洛扎县"},{value:"540528",label:"加查县"},{value:"540529",label:"隆子县"},{value:"540530",label:"错那县"},{value:"540531",label:"浪卡子县"}]},{value:"542400",label:"那曲地区",children:[{value:"542421",label:"那曲县"},{value:"542422",label:"嘉黎县"},{value:"542423",label:"比如县"},{value:"542424",label:"聂荣县"},{value:"542425",label:"安多县"},{value:"542426",label:"申扎县"},{value:"542427",label:"索县"},{value:"542428",label:"班戈县"},{value:"542429",label:"巴青县"},{value:"542430",label:"尼玛县"},{value:"542431",label:"双湖县"}]},{value:"542500",label:"阿里地区",children:[{value:"542521",label:"普兰县"},{value:"542522",label:"札达县"},{value:"542523",label:"噶尔县"},{value:"542524",label:"日土县"},{value:"542525",label:"革吉县"},{value:"542526",label:"改则县"},{value:"542527",label:"措勤县"}]}]},{value:'610000',label:'陕西省',children:[{value:"610100",label:"西安市",children:[{value:"610101",label:"市辖区"},{value:"610102",label:"新城区"},{value:"610103",label:"碑林区"},{value:"610104",label:"莲湖区"},{value:"610111",label:"灞桥区"},{value:"610112",label:"未央区"},{value:"610113",label:"雁塔区"},{value:"610114",label:"阎良区"},{value:"610115",label:"临潼区"},{value:"610116",label:"长安区"},{value:"610117",label:"高陵区"},{value:"610118",label:"鄠邑区"},{value:"610122",label:"蓝田县"},{value:"610124",label:"周至县"}]},{value:"610200",label:"铜川市",children:[{value:"610201",label:"市辖区"},{value:"610202",label:"王益区"},{value:"610203",label:"印台区"},{value:"610204",label:"耀州区"},{value:"610222",label:"宜君县"}]},{value:"610300",label:"宝鸡市",children:[{value:"610301",label:"市辖区"},{value:"610302",label:"渭滨区"},{value:"610303",label:"金台区"},{value:"610304",label:"陈仓区"},{value:"610322",label:"凤翔县"},{value:"610323",label:"岐山县"},{value:"610324",label:"扶风县"},{value:"610326",label:"眉县"},{value:"610327",label:"陇县"},{value:"610328",label:"千阳县"},{value:"610329",label:"麟游县"},{value:"610330",label:"凤县"},{value:"610331",label:"太白县"}]},{value:"610400",label:"咸阳市",children:[{value:"610401",label:"市辖区"},{value:"610402",label:"秦都区"},{value:"610403",label:"杨陵区"},{value:"610404",label:"渭城区"},{value:"610422",label:"三原县"},{value:"610423",label:"泾阳县"},{value:"610424",label:"乾县"},{value:"610425",label:"礼泉县"},{value:"610426",label:"永寿县"},{value:"610427",label:"彬县"},{value:"610428",label:"长武县"},{value:"610429",label:"旬邑县"},{value:"610430",label:"淳化县"},{value:"610431",label:"武功县"},{value:"610481",label:"兴平市"}]},{value:"610500",label:"渭南市",children:[{value:"610501",label:"市辖区"},{value:"610502",label:"临渭区"},{value:"610503",label:"华州区"},{value:"610522",label:"潼关县"},{value:"610523",label:"大荔县"},{value:"610524",label:"合阳县"},{value:"610525",label:"澄城县"},{value:"610526",label:"蒲城县"},{value:"610527",label:"白水县"},{value:"610528",label:"富平县"},{value:"610581",label:"韩城市"},{value:"610582",label:"华阴市"}]},{value:"610600",label:"延安市",children:[{value:"610601",label:"市辖区"},{value:"610602",label:"宝塔区"},{value:"610603",label:"安塞区"},{value:"610621",label:"延长县"},{value:"610622",label:"延川县"},{value:"610623",label:"子长县"},{value:"610625",label:"志丹县"},{value:"610626",label:"吴起县"},{value:"610627",label:"甘泉县"},{value:"610628",label:"富县"},{value:"610629",label:"洛川县"},{value:"610630",label:"宜川县"},{value:"610631",label:"黄龙县"},{value:"610632",label:"黄陵县"}]},{value:"610700",label:"汉中市",children:[{value:"610701",label:"市辖区"},{value:"610702",label:"汉台区"},{value:"610703",label:"南郑区"},{value:"610722",label:"城固县"},{value:"610723",label:"洋县"},{value:"610724",label:"西乡县"},{value:"610725",label:"勉县"},{value:"610726",label:"宁强县"},{value:"610727",label:"略阳县"},{value:"610728",label:"镇巴县"},{value:"610729",label:"留坝县"},{value:"610730",label:"佛坪县"}]},{value:"610800",label:"榆林市",children:[{value:"610801",label:"市辖区"},{value:"610802",label:"榆阳区"},{value:"610803",label:"横山区"},{value:"610822",label:"府谷县"},{value:"610824",label:"靖边县"},{value:"610825",label:"定边县"},{value:"610826",label:"绥德县"},{value:"610827",label:"米脂县"},{value:"610828",label:"佳县"},{value:"610829",label:"吴堡县"},{value:"610830",label:"清涧县"},{value:"610831",label:"子洲县"},{value:"610881",label:"神木市"}]},{value:"610900",label:"安康市",children:[{value:"610901",label:"市辖区"},{value:"610902",label:"汉滨区"},{value:"610921",label:"汉阴县"},{value:"610922",label:"石泉县"},{value:"610923",label:"宁陕县"},{value:"610924",label:"紫阳县"},{value:"610925",label:"岚皋县"},{value:"610926",label:"平利县"},{value:"610927",label:"镇坪县"},{value:"610928",label:"旬阳县"},{value:"610929",label:"白河县"}]},{value:"611000",label:"商洛市",children:[{value:"611001",label:"市辖区"},{value:"611002",label:"商州区"},{value:"611021",label:"洛南县"},{value:"611022",label:"丹凤县"},{value:"611023",label:"商南县"},{value:"611024",label:"山阳县"},{value:"611025",label:"镇安县"},{value:"611026",label:"柞水县"}]}]},{value:'620000',label:'甘肃省',children:[{value:"620100",label:"兰州市",children:[{value:"620101",label:"市辖区"},{value:"620102",label:"城关区"},{value:"620103",label:"七里河区"},{value:"620104",label:"西固区"},{value:"620105",label:"安宁区"},{value:"620111",label:"红古区"},{value:"620121",label:"永登县"},{value:"620122",label:"皋兰县"},{value:"620123",label:"榆中县"},{value:"620171",label:"兰州新区"}]},{value:"620200",label:"嘉峪关市",children:[{value:"620201",label:"市辖区"}]},{value:"620300",label:"金昌市",children:[{value:"620301",label:"市辖区"},{value:"620302",label:"金川区"},{value:"620321",label:"永昌县"}]},{value:"620400",label:"白银市",children:[{value:"620401",label:"市辖区"},{value:"620402",label:"白银区"},{value:"620403",label:"平川区"},{value:"620421",label:"靖远县"},{value:"620422",label:"会宁县"},{value:"620423",label:"景泰县"}]},{value:"620500",label:"天水市",children:[{value:"620501",label:"市辖区"},{value:"620502",label:"秦州区"},{value:"620503",label:"麦积区"},{value:"620521",label:"清水县"},{value:"620522",label:"秦安县"},{value:"620523",label:"甘谷县"},{value:"620524",label:"武山县"},{value:"620525",label:"张家川回族自治县"}]},{value:"620600",label:"武威市",children:[{value:"620601",label:"市辖区"},{value:"620602",label:"凉州区"},{value:"620621",label:"民勤县"},{value:"620622",label:"古浪县"},{value:"620623",label:"天祝藏族自治县"}]},{value:"620700",label:"张掖市",children:[{value:"620701",label:"市辖区"},{value:"620702",label:"甘州区"},{value:"620721",label:"肃南裕固族自治县"},{value:"620722",label:"民乐县"},{value:"620723",label:"临泽县"},{value:"620724",label:"高台县"},{value:"620725",label:"山丹县"}]},{value:"620800",label:"平凉市",children:[{value:"620801",label:"市辖区"},{value:"620802",label:"崆峒区"},{value:"620821",label:"泾川县"},{value:"620822",label:"灵台县"},{value:"620823",label:"崇信县"},{value:"620824",label:"华亭县"},{value:"620825",label:"庄浪县"},{value:"620826",label:"静宁县"},{value:"620871",label:"平凉工业园区"}]},{value:"620900",label:"酒泉市",children:[{value:"620901",label:"市辖区"},{value:"620902",label:"肃州区"},{value:"620921",label:"金塔县"},{value:"620922",label:"瓜州县"},{value:"620923",label:"肃北蒙古族自治县"},{value:"620924",label:"阿克塞哈萨克族自治县"},{value:"620981",label:"玉门市"},{value:"620982",label:"敦煌市"}]},{value:"621000",label:"庆阳市",children:[{value:"621001",label:"市辖区"},{value:"621002",label:"西峰区"},{value:"621021",label:"庆城县"},{value:"621022",label:"环县"},{value:"621023",label:"华池县"},{value:"621024",label:"合水县"},{value:"621025",label:"正宁县"},{value:"621026",label:"宁县"},{value:"621027",label:"镇原县"}]},{value:"621100",label:"定西市",children:[{value:"621101",label:"市辖区"},{value:"621102",label:"安定区"},{value:"621121",label:"通渭县"},{value:"621122",label:"陇西县"},{value:"621123",label:"渭源县"},{value:"621124",label:"临洮县"},{value:"621125",label:"漳县"},{value:"621126",label:"岷县"}]},{value:"621200",label:"陇南市",children:[{value:"621201",label:"市辖区"},{value:"621202",label:"武都区"},{value:"621221",label:"成县"},{value:"621222",label:"文县"},{value:"621223",label:"宕昌县"},{value:"621224",label:"康县"},{value:"621225",label:"西和县"},{value:"621226",label:"礼县"},{value:"621227",label:"徽县"},{value:"621228",label:"两当县"}]},{value:"622900",label:"临夏回族自治州",children:[{value:"622901",label:"临夏市"},{value:"622921",label:"临夏县"},{value:"622922",label:"康乐县"},{value:"622923",label:"永靖县"},{value:"622924",label:"广河县"},{value:"622925",label:"和政县"},{value:"622926",label:"东乡族自治县"},{value:"622927",label:"积石山保安族东乡族撒拉族自治县"}]},{value:"623000",label:"甘南藏族自治州",children:[{value:"623001",label:"合作市"},{value:"623021",label:"临潭县"},{value:"623022",label:"卓尼县"},{value:"623023",label:"舟曲县"},{value:"623024",label:"迭部县"},{value:"623025",label:"玛曲县"},{value:"623026",label:"碌曲县"},{value:"623027",label:"夏河县"}]}]},{value:'630000',label:'青海省',children:[{value:"630100",label:"西宁市",children:[{value:"630101",label:"市辖区"},{value:"630102",label:"城东区"},{value:"630103",label:"城中区"},{value:"630104",label:"城西区"},{value:"630105",label:"城北区"},{value:"630121",label:"大通回族土族自治县"},{value:"630122",label:"湟中县"},{value:"630123",label:"湟源县"}]},{value:"630200",label:"海东市",children:[{value:"630202",label:"乐都区"},{value:"630203",label:"平安区"},{value:"630222",label:"民和回族土族自治县"},{value:"630223",label:"互助土族自治县"},{value:"630224",label:"化隆回族自治县"},{value:"630225",label:"循化撒拉族自治县"}]},{value:"632200",label:"海北藏族自治州",children:[{value:"632221",label:"门源回族自治县"},{value:"632222",label:"祁连县"},{value:"632223",label:"海晏县"},{value:"632224",label:"刚察县"}]},{value:"632300",label:"黄南藏族自治州",children:[{value:"632321",label:"同仁县"},{value:"632322",label:"尖扎县"},{value:"632323",label:"泽库县"},{value:"632324",label:"河南蒙古族自治县"}]},{value:"632500",label:"海南藏族自治州",children:[{value:"632521",label:"共和县"},{value:"632522",label:"同德县"},{value:"632523",label:"贵德县"},{value:"632524",label:"兴海县"},{value:"632525",label:"贵南县"}]},{value:"632600",label:"果洛藏族自治州",children:[{value:"632621",label:"玛沁县"},{value:"632622",label:"班玛县"},{value:"632623",label:"甘德县"},{value:"632624",label:"达日县"},{value:"632625",label:"久治县"},{value:"632626",label:"玛多县"}]},{value:"632700",label:"玉树藏族自治州",children:[{value:"632701",label:"玉树市"},{value:"632722",label:"杂多县"},{value:"632723",label:"称多县"},{value:"632724",label:"治多县"},{value:"632725",label:"囊谦县"},{value:"632726",label:"曲麻莱县"}]},{value:"632800",label:"海西蒙古族藏族自治州",children:[{value:"632801",label:"格尔木市"},{value:"632802",label:"德令哈市"},{value:"632821",label:"乌兰县"},{value:"632822",label:"都兰县"},{value:"632823",label:"天峻县"},{value:"632857",label:"大柴旦行政委员会"},{value:"632858",label:"冷湖行政委员会"},{value:"632859",label:"茫崖行政委员会"}]}]},{value:'640000',label:'宁夏',children:[{value:"640100",label:"银川市",children:[{value:"640101",label:"市辖区"},{value:"640104",label:"兴庆区"},{value:"640105",label:"西夏区"},{value:"640106",label:"金凤区"},{value:"640121",label:"永宁县"},{value:"640122",label:"贺兰县"},{value:"640181",label:"灵武市"}]},{value:"640200",label:"石嘴山市",children:[{value:"640201",label:"市辖区"},{value:"640202",label:"大武口区"},{value:"640205",label:"惠农区"},{value:"640221",label:"平罗县"}]},{value:"640300",label:"吴忠市",children:[{value:"640301",label:"市辖区"},{value:"640302",label:"利通区"},{value:"640303",label:"红寺堡区"},{value:"640323",label:"盐池县"},{value:"640324",label:"同心县"},{value:"640381",label:"青铜峡市"}]},{value:"640400",label:"固原市",children:[{value:"640401",label:"市辖区"},{value:"640402",label:"原州区"},{value:"640422",label:"西吉县"},{value:"640423",label:"隆德县"},{value:"640424",label:"泾源县"},{value:"640425",label:"彭阳县"}]},{value:"640500",label:"中卫市",children:[{value:"640501",label:"市辖区"},{value:"640502",label:"沙坡头区"},{value:"640521",label:"中宁县"},{value:"640522",label:"海原县"}]}]},{value:'650000',label:'新疆',children:[{value:"650100",label:"乌鲁木齐市",children:[{value:"650101",label:"市辖区"},{value:"650102",label:"天山区"},{value:"650103",label:"沙依巴克区"},{value:"650104",label:"新市区"},{value:"650105",label:"水磨沟区"},{value:"650106",label:"头屯河区"},{value:"650107",label:"达坂城区"},{value:"650109",label:"米东区"},{value:"650121",label:"乌鲁木齐县"},{value:"650171",label:"乌鲁木齐经济技术开发区"},{value:"650172",label:"乌鲁木齐高新技术产业开发区"}]},{value:"650200",label:"克拉玛依市",children:[{value:"650201",label:"市辖区"},{value:"650202",label:"独山子区"},{value:"650203",label:"克拉玛依区"},{value:"650204",label:"白碱滩区"},{value:"650205",label:"乌尔禾区"}]},{value:"650400",label:"吐鲁番市",children:[{value:"650402",label:"高昌区"},{value:"650421",label:"鄯善县"},{value:"650422",label:"托克逊县"}]},{value:"650500",label:"哈密市",children:[{value:"650502",label:"伊州区"},{value:"650521",label:"巴里坤哈萨克自治县"},{value:"650522",label:"伊吾县"}]},{value:"652300",label:"昌吉回族自治州",children:[{value:"652301",label:"昌吉市"},{value:"652302",label:"阜康市"},{value:"652323",label:"呼图壁县"},{value:"652324",label:"玛纳斯县"},{value:"652325",label:"奇台县"},{value:"652327",label:"吉木萨尔县"},{value:"652328",label:"木垒哈萨克自治县"}]},{value:"652700",label:"博尔塔拉蒙古自治州",children:[{value:"652701",label:"博乐市"},{value:"652702",label:"阿拉山口市"},{value:"652722",label:"精河县"},{value:"652723",label:"温泉县"}]},{value:"652800",label:"巴音郭楞蒙古自治州",children:[{value:"652801",label:"库尔勒市"},{value:"652822",label:"轮台县"},{value:"652823",label:"尉犁县"},{value:"652824",label:"若羌县"},{value:"652825",label:"且末县"},{value:"652826",label:"焉耆回族自治县"},{value:"652827",label:"和静县"},{value:"652828",label:"和硕县"},{value:"652829",label:"博湖县"},{value:"652871",label:"库尔勒经济技术开发区"}]},{value:"652900",label:"阿克苏地区",children:[{value:"652901",label:"阿克苏市"},{value:"652922",label:"温宿县"},{value:"652923",label:"库车县"},{value:"652924",label:"沙雅县"},{value:"652925",label:"新和县"},{value:"652926",label:"拜城县"},{value:"652927",label:"乌什县"},{value:"652928",label:"阿瓦提县"},{value:"652929",label:"柯坪县"}]},{value:"653000",label:"克孜勒苏柯尔克孜自治州",children:[{value:"653001",label:"阿图什市"},{value:"653022",label:"阿克陶县"},{value:"653023",label:"阿合奇县"},{value:"653024",label:"乌恰县"}]},{value:"653100",label:"喀什地区",children:[{value:"653101",label:"喀什市"},{value:"653121",label:"疏附县"},{value:"653122",label:"疏勒县"},{value:"653123",label:"英吉沙县"},{value:"653124",label:"泽普县"},{value:"653125",label:"莎车县"},{value:"653126",label:"叶城县"},{value:"653127",label:"麦盖提县"},{value:"653128",label:"岳普湖县"},{value:"653129",label:"伽师县"},{value:"653130",label:"巴楚县"},{value:"653131",label:"塔什库尔干塔吉克自治县"}]},{value:"653200",label:"和田地区",children:[{value:"653201",label:"和田市"},{value:"653221",label:"和田县"},{value:"653222",label:"墨玉县"},{value:"653223",label:"皮山县"},{value:"653224",label:"洛浦县"},{value:"653225",label:"策勒县"},{value:"653226",label:"于田县"},{value:"653227",label:"民丰县"}]},{value:"654000",label:"伊犁哈萨克自治州",children:[{value:"654002",label:"伊宁市"},{value:"654003",label:"奎屯市"},{value:"654004",label:"霍尔果斯市"},{value:"654021",label:"伊宁县"},{value:"654022",label:"察布查尔锡伯自治县"},{value:"654023",label:"霍城县"},{value:"654024",label:"巩留县"},{value:"654025",label:"新源县"},{value:"654026",label:"昭苏县"},{value:"654027",label:"特克斯县"},{value:"654028",label:"尼勒克县"}]},{value:"654200",label:"塔城地区",children:[{value:"654201",label:"塔城市"},{value:"654202",label:"乌苏市"},{value:"654221",label:"额敏县"},{value:"654223",label:"沙湾县"},{value:"654224",label:"托里县"},{value:"654225",label:"裕民县"},{value:"654226",label:"和布克赛尔蒙古自治县"}]},{value:"654300",label:"阿勒泰地区",children:[{value:"654301",label:"阿勒泰市"},{value:"654321",label:"布尔津县"},{value:"654322",label:"富蕴县"},{value:"654323",label:"福海县"},{value:"654324",label:"哈巴河县"},{value:"654325",label:"青河县"},{value:"654326",label:"吉木乃县"}]},{value:"659000",label:"自治区直辖县级行政区划",children:[{value:"659001",label:"石河子市"},{value:"659002",label:"阿拉尔市"},{value:"659003",label:"图木舒克市"},{value:"659004",label:"五家渠市"},{value:"659006",label:"铁门关市"}]}]},{value:'660000',label:'台湾省',children:[{value:"660100",label:"台北市",children:[{value:"660101",label:"中正区"},{value:"660102",label:"大同区"},{value:"660103",label:"中山区"},{value:"660104",label:"松山区"},{value:"660105",label:"大安区"},{value:"660106",label:"万华区"},{value:"660107",label:"信义区"},{value:"660108",label:"士林区"},{value:"660109",label:"北投区"},{value:"660110",label:"内湖区"},{value:"660111",label:"南港区"},{value:"660112",label:"文山区"}]},{value:"660200",label:"高雄市",children:[{value:"660201",label:"新兴区"},{value:"660202",label:"前金区"},{value:"660203",label:"芩雅区"},{value:"660204",label:"盐埕区"},{value:"660205",label:"鼓山区"},{value:"660206",label:"旗津区"},{value:"660207",label:"前镇区"},{value:"660208",label:"三民区"},{value:"660209",label:"左营区"},{value:"660210",label:"楠梓区"},{value:"660211",label:"小港区"}]},{value:"660300",label:"台南市",children:[{value:"660301",label:"中西区"},{value:"660302",label:"东区"},{value:"660303",label:"南区"},{value:"660304",label:"北区"},{value:"660305",label:"安平区"},{value:"660306",label:"安南区"}]},{value:"660400",label:"台中市",children:[{value:"660401",label:"中区"},{value:"660402",label:"东区"},{value:"660403",label:"南区"},{value:"660404",label:"西区"},{value:"660405",label:"北区"},{value:"660406",label:"北屯区"},{value:"660407",label:"西屯区"},{value:"660408",label:"南屯区"}]},{value:"660500",label:"金门县",children:[{value:"660501",label:"金门县"}]},{value:"660600",label:"南投县",children:[{value:"660601",label:"南投县",}]},{value:"660700",label:"基隆市",children:[{value:"660701",label:"仁爱区"},{value:"660702",label:"信义区"},{value:"660703",label:"中正区"},{value:"660704",label:"中山区"},{value:"660705",label:"安乐区"},{value:"660706",label:"暖暖区"},{value:"660707",label:"七堵区"}]},{value:"660800",label:"新竹市",children:[{value:"660801",label:"东区"},{value:"660802",label:"北区"},{value:"660803",label:"香山区"}]},{value:"660900",label:"嘉义市",children:[{value:"660901",label:"东区"},{value:"660902",label:"西区"}]},{value:"661000",label:"新北市",children:[{value:"661001",label:"新北市"}]},{value:"661100",label:"宜兰县",children:[{value:"661100",label:"宜兰县"}]},{value:"661200",label:"新竹县",children:[{value:"661201",label:"新竹县"}]},{value:"661300",label:"桃园县",children:[{value:"661301",label:"桃园县"}]},{value:"661400",label:"苗栗县",children:[{value:"661401",label:"苗栗县"}]},{value:"661500",label:"彰化县",children:[{value:"661501",label:"彰化县"}]},{value:"661600",label:"嘉义县",children:[{value:"661601",label:"嘉义县"}]},{value:"661700",label:"云林县",children:[{value:"661701",label:"云林县"}]},{value:"661800",label:"屏东县",children:[{value:"661801",label:"屏东县"}]},{value:"661900",label:"台东县",children:[{value:"661901",label:"台东县"}]},{value:"662000",label:"花莲县",children:[{value:"662001",label:"花莲县"}]},{value:"662100",label:"澎湖县",children:[{value:"662101",label:"澎湖县"}]}]},{value:'670000',label:'香港',children:[{value:"670100",label:"香港岛",children:[{value:"670101",label:"中西区"},{value:"670102",label:"湾仔区"},{value:"670103",label:"东区"},{value:"670104",label:"南区"}]},{value:"670200",label:"九龙半岛",children:[{value:"670201",label:"九龙城区"},{value:"670202",label:"油尖旺区"},{value:"670203",label:"深水埗区"},{value:"670204",label:"黄大仙区"},{value:"670205",label:"观塘区"}]},{value:"670300",label:"新界",children:[{value:"670301",label:"北区"},{value:"670302",label:"大埔区"},{value:"670303",label:"沙田区"},{value:"670304",label:"西贡区"},{value:"670305",label:"元朗区"},{value:"670306",label:"屯门区"},{value:"670307",label:"荃湾区"},{value:"670308",label:"葵青区"},{value:"670309",label:"离岛区"}]}]},{value:'680000',label:'澳门',children:[{value:"680100",label:"澳门半岛",children:[{value:"680101",label:"花地玛堂区"},{value:"680102",label:"圣安多尼堂区"},{value:"680103",label:"大堂区"},{value:"680104",label:"望德堂区"},{value:"680105",label:"风顺堂区"}]},{value:"680200",label:"离岛",children:[{value:"680201",label:"嘉模堂区"},{value:"680202",label:"圣方济各堂区"}]}]}];export default cityData
\ No newline at end of file
diff --git a/components/w-picker/date-picker.vue b/components/w-picker/date-picker.vue
new file mode 100644
index 0000000..c0154d5
--- /dev/null
+++ b/components/w-picker/date-picker.vue
@@ -0,0 +1,742 @@
+<template>
+	<view class="w-picker-view">
+		<picker-view v-if="fields=='year'" class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.years" :key="index">{{item}}年</view>
+			</picker-view-column>
+		</picker-view>
+		<picker-view v-if="fields=='month'" class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.years" :key="index">{{item}}年</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.months" :key="index">{{item}}月</view>
+			</picker-view-column>
+		</picker-view>
+		<picker-view v-if="fields=='day'" class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.years" :key="index">{{item}}年</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.months" :key="index">{{item}}月</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.days" :key="index">{{item}}日</view>
+			</picker-view-column>
+		</picker-view>
+		<picker-view v-if="fields=='hour'" class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.years" :key="index">{{item}}年</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.months" :key="index">{{item}}月</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.days" :key="index">{{item}}日</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.hours" :key="index">{{item}}时</view>
+			</picker-view-column>
+		</picker-view>
+		<picker-view v-if="fields=='minute'" class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.years" :key="index">{{item}}年</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.months" :key="index">{{item}}月</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.days" :key="index">{{item}}日</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.hours" :key="index">{{item}}时</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.minutes" :key="index">{{item}}分</view>
+			</picker-view-column>
+		</picker-view>
+		<picker-view v-if="fields=='second'" class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.years" :key="index">{{item}}年</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.months" :key="index">{{item}}月</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.days" :key="index">{{item}}日</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.hours" :key="index">{{item}}时</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.minutes" :key="index">{{item}}分</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.seconds" :key="index">{{item}}秒</view>
+			</picker-view-column>
+		</picker-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				pickVal:[],
+				range:{
+					years:[],
+					months:[],
+					days:[],
+					hours:[],
+					minutes:[],
+					seconds:[]
+				},
+				checkObj:{}
+			};
+		},
+		props:{
+			itemHeight:{
+				type:String,
+				default:"44px"
+			},
+			startYear:{
+				type:[String,Number],
+				default:""
+			},
+			endYear:{
+				type:[String,Number],
+				default:""
+			},
+			value:{
+				type:[String,Array,Number],
+				default:""
+			},
+			current:{//是否默认选中当前日期
+				type:Boolean,
+				default:false
+			},
+			disabledAfter:{//是否禁用当前之后的日期
+				type:Boolean,
+				default:false
+			},
+			fields:{
+				type:String,
+				default:"day"
+			}
+		},
+		watch:{
+			fields(val){
+				this.initData();
+			},
+			value(val){
+				this.initData();
+			}
+		},
+		created() {
+			this.initData();
+		},
+		methods:{
+			formatNum(n){
+				return (Number(n)<10?'0'+Number(n):Number(n)+'');
+			},
+			checkValue(value){
+				let strReg,example
+				switch(this.fields){
+					case "year":
+						strReg=/^\d{4}$/;
+						example="2019";
+						break;
+					case "month":
+						strReg=/^\d{4}-\d{2}$/;
+						example="2019-02";
+						break;
+					case "day":
+						strReg=/^\d{4}-\d{2}-\d{2}$/;
+						example="2019-02-01";
+						break;
+					case "hour":
+						strReg=/^\d{4}-\d{2}-\d{2} \d{2}(:\d{2}){1,2}?$/;
+						example="2019-02-01 18:00:00或2019-02-01 18";
+						break;
+					case "minute":
+						strReg=/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}(:\d{2}){0,1}?$/;
+						example="2019-02-01 18:06:00或2019-02-01 18:06";
+						break;
+					case "second":
+						strReg=/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}$/;
+						example="2019-02-01 18:06:01";
+						break;
+				}
+				if(!strReg.test(value)){
+					console.log(new Error("请传入与mode、fields匹配的value值，例value="+example+""))
+				}
+				return strReg.test(value);
+			},
+			resetData(year,month,day,hour,minute){
+				let curDate=this.getCurrenDate();
+				let curFlag=this.current;
+				let curYear=curDate.curYear;
+				let curMonth=curDate.curMonth;
+				let curDay=curDate.curDay;
+				let curHour=curDate.curHour;
+				let curMinute=curDate.curMinute;
+				let curSecond=curDate.curSecond;
+				let months=[],days=[],hours=[],minutes=[],seconds=[];
+				let disabledAfter=this.disabledAfter;
+				let monthsLen=disabledAfter?(year*1<curYear?12:curMonth):12;
+				let totalDays=new Date(year,month,0).getDate();//计算当月有几天;
+				let daysLen=disabledAfter?((year*1<curYear||month*1<curMonth)?totalDays:curDay):totalDays;
+				let hoursLen=disabledAfter?((year*1<curYear||month*1<curMonth||day*1<curDay)?24:curHour+1):24;
+				let minutesLen=disabledAfter?((year*1<curYear||month*1<curMonth||day*1<curDay||hour*1<curHour)?60:curMinute+1):60;
+				let secondsLen=disabledAfter?((year*1<curYear||month*1<curMonth||day*1<curDay||hour*1<curHour||minute*1<curMinute)?60:curSecond+1):60;
+				for(let month=1;month<=monthsLen;month++){
+					months.push(this.formatNum(month));
+				};
+				for(let day=1;day<=daysLen;day++){
+					days.push(this.formatNum(day));
+				}
+				for(let hour=0;hour<hoursLen;hour++){
+					hours.push(this.formatNum(hour));
+				}
+				for(let minute=0;minute<minutesLen;minute++){
+					minutes.push(this.formatNum(minute));
+				}
+				for(let second=0;second<secondsLen;second++){
+					seconds.push(this.formatNum(second));
+				}
+				return{
+					months,
+					days,
+					hours,
+					minutes,
+					seconds
+				}
+			},
+			isLeapYear (Year) {
+				if (((Year % 4)==0) && ((Year % 100)!=0) || ((Year % 400)==0)) {
+					return true;
+				} else { 
+					return false; 
+				}
+			},
+			getData(dVal){
+				//用来处理初始化数据
+				let curFlag=this.current;
+				let disabledAfter=this.disabledAfter;
+				let fields=this.fields;
+				let curDate=this.getCurrenDate();
+				let curYear=curDate.curYear;
+				let curMonthdays=curDate.curMonthdays;
+				let curMonth=curDate.curMonth;
+				let curDay=curDate.curDay;
+				let curHour=curDate.curHour;
+				let curMinute=curDate.curMinute;
+				let curSecond=curDate.curSecond;
+				let defaultDate=this.getDefaultDate();
+				let startYear=this.getStartDate().getFullYear();
+				let endYear=this.getEndDate().getFullYear();
+				//颗粒度，禁用当前之后日期仅对year,month,day,hour生效;分钟秒禁用没有意义,
+				let years=[],months=[],days=[],hours=[],minutes=[],seconds=[];
+				let year=dVal[0]*1;
+				let month=dVal[1]*1;
+				let day=dVal[2]*1;
+				let hour=dVal[3]*1;
+				let minute=dVal[4]*1;
+				let monthsLen=disabledAfter?(year<curYear?12:curDate.curMonth):12;
+				let daysLen=disabledAfter?((year<curYear||month<curMonth)?defaultDate.defaultDays:curDay):(curFlag?curMonthdays:defaultDate.defaultDays);
+				let hoursLen=disabledAfter?((year<curYear||month<curMonth||day<curDay)?24:curHour+1):24;
+				let minutesLen=disabledAfter?((year<curYear||month<curMonth||day<curDay||hour<curHour)?60:curMinute+1):60;
+				let secondsLen=disabledAfter?((year<curYear||month<curMonth||day<curDay||hour<curHour||minute<curMinute)?60:curSecond+1):60;
+				for(let year=startYear;year<=(disabledAfter?curYear:endYear);year++){
+					years.push(year.toString())
+				}
+				for(let month=1;month<=monthsLen;month++){
+					months.push(this.formatNum(month));
+				}
+				for(let day=1;day<=daysLen;day++){
+					days.push(this.formatNum(day));
+				}
+				for(let hour=0;hour<hoursLen;hour++){
+					hours.push(this.formatNum(hour));
+				}
+				for(let minute=0;minute<minutesLen;minute++){
+					minutes.push(this.formatNum(minute));
+				}
+				// for(let second=0;second<(disabledAfter?curDate.curSecond+1:60);second++){
+				// 	seconds.push(this.formatNum(second));
+				// }
+				for(let second=0;second<60;second++){
+					seconds.push(this.formatNum(second));
+				}
+				return {
+					years,
+					months,
+					days,
+					hours,
+					minutes,
+					seconds
+				}
+			},
+			getCurrenDate(){
+				let curDate=new Date();
+				let curYear=curDate.getFullYear();
+				let curMonth=curDate.getMonth()+1;
+				let curMonthdays=new Date(curYear,curMonth,0).getDate();
+				let curDay=curDate.getDate();
+				let curHour=curDate.getHours();
+				let curMinute=curDate.getMinutes();
+				let curSecond=curDate.getSeconds();
+				return{
+					curDate,
+					curYear,
+					curMonth,
+					curMonthdays,
+					curDay,
+					curHour,
+					curMinute,
+					curSecond
+				}
+			},
+			getDefaultDate(){
+				let value=this.value;
+				let reg=/-/g;
+				let defaultDate=value?new Date(value.replace(reg,"/")):new Date();
+				let defaultYear=defaultDate.getFullYear();
+				let defaultMonth=defaultDate.getMonth()+1;
+				let defaultDay=defaultDate.getDate();
+				let defaultDays=new Date(defaultYear,defaultMonth,0).getDate()*1;
+				return{
+					defaultDate,
+					defaultYear,
+					defaultMonth,
+					defaultDay,
+					defaultDays
+				}
+			},
+			getStartDate(){
+				let start=this.startYear;
+				let startDate="";
+				let reg=/-/g;
+				if(start){
+					startDate=new Date(start+"/01/01");
+				}else{
+					startDate=new Date("1970/01/01");
+				}
+				return startDate;
+			},
+			getEndDate(){
+				let end=this.endYear;
+				let reg=/-/g;
+				let endDate="";
+				if(end){
+					endDate=new Date(end+"/12/01");
+				}else{
+					endDate=new Date();
+				}
+				return endDate;
+			},
+			getDval(){
+				let value=this.value;
+				let fields=this.fields;
+				let dVal=null;
+				let aDate=new Date();
+				let year=this.formatNum(aDate.getFullYear());
+				let month=this.formatNum(aDate.getMonth()+1);
+				let day=this.formatNum(aDate.getDate());
+				let hour=this.formatNum(aDate.getHours());
+				let minute=this.formatNum(aDate.getMinutes());
+				let second=this.formatNum(aDate.getSeconds());
+				if(value){
+					let flag=this.checkValue(value);
+					if(!flag){
+						dVal=[year,month,day,hour,minute,second]
+					}else{
+						switch(this.fields){
+							case "year":
+								dVal=value?[value]:[];	
+								break;
+							case "month":
+								dVal=value?value.split("-"):[];
+								break;
+							case "day":
+								dVal=value?value.split("-"):[];
+								break;
+							case "hour":
+								dVal=[...value.split(" ")[0].split("-"),...value.split(" ")[1].split(":")];
+								break;
+							case "minute":
+								dVal=value?[...value.split(" ")[0].split("-"),...value.split(" ")[1].split(":")]:[];
+								break;
+							case "second":
+								dVal=[...value.split(" ")[0].split("-"),...value.split(" ")[1].split(":")];
+								break;
+						}
+					}
+				}else{
+					dVal=[year,month,day,hour,minute,second]
+				}
+				return dVal;
+			},
+			initData(){
+				let startDate,endDate,startYear,endYear,startMonth,endMonth,startDay,endDay;
+				let years=[],months=[],days=[],hours=[],minutes=[],seconds=[];
+				let dVal=[],pickVal=[];
+				let value=this.value;
+				let reg=/-/g;
+				let range={};
+				let result="",full="",year,month,day,hour,minute,second,obj={};
+				let defaultDate=this.getDefaultDate();
+				let defaultYear=defaultDate.defaultYear;
+				let defaultMonth=defaultDate.defaultMonth;
+				let defaultDay=defaultDate.defaultDay;
+				let defaultDays=defaultDate.defaultDays;
+				let curFlag=this.current;
+				let disabledAfter=this.disabledAfter;
+				let curDate=this.getCurrenDate();
+				let curYear=curDate.curYear;
+				let curMonth=curDate.curMonth;
+				let curMonthdays=curDate.curMonthdays;
+				let curDay=curDate.curDay;
+				let curHour=curDate.curHour;
+				let curMinute=curDate.curMinute;
+				let curSecond=curDate.curSecond;
+				let dateData=[];
+				dVal=this.getDval();
+				
+				startDate=this.getStartDate();
+				endDate=this.getEndDate();
+				startYear=startDate.getFullYear();
+				startMonth=startDate.getMonth();
+				startDay=startDate.getDate();
+				endYear=endDate.getFullYear();
+				endMonth=endDate.getMonth();
+				endDay=endDate.getDate();
+				dateData=this.getData(dVal);
+				years=dateData.years;
+				months=dateData.months;
+				days=dateData.days;
+				hours=dateData.hours;
+				minutes=dateData.minutes;
+				seconds=dateData.seconds;
+				switch(this.fields){
+					case "year":
+						pickVal=disabledAfter?[
+							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0
+						]:(curFlag?[
+							years.indexOf(curYear+'')
+						]:[
+							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0
+						]);
+						range={years};
+						year=dVal[0]?dVal[0]:years[0];
+						result=full=`${year}`;
+						obj={
+							year
+						}
+						break;
+					case "month":
+						pickVal=disabledAfter?[
+							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
+							dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0
+						]:(curFlag?[
+							years.indexOf(curYear+''),
+							months.indexOf(this.formatNum(curMonth))
+						]:[
+							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
+							dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0
+						]);
+						range={years,months};
+						year=dVal[0]?dVal[0]:years[0];
+						month=dVal[1]?dVal[1]:months[0];
+						result=full=`${year+'-'+month}`;
+						obj={
+							year,
+							month
+						}
+						break;
+					case "day":
+						pickVal=disabledAfter?[
+							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
+							dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0,
+							dVal[2]&&days.indexOf(dVal[2])!=-1?days.indexOf(dVal[2]):0
+						]:(curFlag?[
+							years.indexOf(curYear+''),
+							months.indexOf(this.formatNum(curMonth)),
+							days.indexOf(this.formatNum(curDay)),
+						]:[
+							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
+							dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0,
+							dVal[2]&&days.indexOf(dVal[2])!=-1?days.indexOf(dVal[2]):0
+						]);
+						range={years,months,days};
+						year=dVal[0]?dVal[0]:years[0];
+						month=dVal[1]?dVal[1]:months[0];
+						day=dVal[2]?dVal[2]:days[0];
+						result=full=`${year+'-'+month+'-'+day}`;
+						obj={
+							year,
+							month,
+							day
+						}
+						break;
+					case "hour":
+						pickVal=disabledAfter?[
+							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
+							dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0,
+							dVal[2]&&days.indexOf(dVal[2])!=-1?days.indexOf(dVal[2]):0,
+							dVal[3]&&hours.indexOf(dVal[3])!=-1?hours.indexOf(dVal[3]):0
+						]:(curFlag?[
+							years.indexOf(curYear+''),
+							months.indexOf(this.formatNum(curMonth)),
+							days.indexOf(this.formatNum(curDay)),
+							hours.indexOf(this.formatNum(curHour)),
+						]:[
+							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
+							dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0,
+							dVal[2]&&days.indexOf(dVal[2])!=-1?days.indexOf(dVal[2]):0,
+							dVal[3]&&hours.indexOf(dVal[3])!=-1?hours.indexOf(dVal[3]):0
+						]);
+						range={years,months,days,hours};
+						year=dVal[0]?dVal[0]:years[0];
+						month=dVal[1]?dVal[1]:months[0];
+						day=dVal[2]?dVal[2]:days[0];
+						hour=dVal[3]?dVal[3]:hours[0];
+						result=`${year+'-'+month+'-'+day+' '+hour}`;
+						full=`${year+'-'+month+'-'+day+' '+hour+':00:00'}`;
+						obj={
+							year,
+							month,
+							day,
+							hour
+						}
+						break;
+					case "minute":
+						pickVal=disabledAfter?[
+							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
+							dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0,
+							dVal[2]&&days.indexOf(dVal[2])!=-1?days.indexOf(dVal[2]):0,
+							dVal[3]&&hours.indexOf(dVal[3])!=-1?hours.indexOf(dVal[3]):0,
+							dVal[4]&&minutes.indexOf(dVal[4])!=-1?minutes.indexOf(dVal[4]):0
+						]:(curFlag?[
+							years.indexOf(curYear+''),
+							months.indexOf(this.formatNum(curMonth)),
+							days.indexOf(this.formatNum(curDay)),
+							hours.indexOf(this.formatNum(curHour)),
+							minutes.indexOf(this.formatNum(curMinute)),
+						]:[
+							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
+							dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0,
+							dVal[2]&&days.indexOf(dVal[2])!=-1?days.indexOf(dVal[2]):0,
+							dVal[3]&&hours.indexOf(dVal[3])!=-1?hours.indexOf(dVal[3]):0,
+							dVal[4]&&minutes.indexOf(dVal[4])!=-1?minutes.indexOf(dVal[4]):0
+						]);
+						range={years,months,days,hours,minutes};
+						year=dVal[0]?dVal[0]:years[0];
+						month=dVal[1]?dVal[1]:months[0];
+						day=dVal[2]?dVal[2]:days[0];
+						hour=dVal[3]?dVal[3]:hours[0];
+						minute=dVal[4]?dVal[4]:minutes[0];
+						full=`${year+'-'+month+'-'+day+' '+hour+':'+minute+':00'}`;
+						result=`${year+'-'+month+'-'+day+' '+hour+':'+minute}`;
+						obj={
+							year,
+							month,
+							day,
+							hour,
+							minute
+						}
+						break;
+					case "second":
+						pickVal=disabledAfter?[
+							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
+							dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0,
+							dVal[2]&&days.indexOf(dVal[2])!=-1?days.indexOf(dVal[2]):0,
+							dVal[3]&&hours.indexOf(dVal[3])!=-1?hours.indexOf(dVal[3]):0,
+							dVal[4]&&minutes.indexOf(dVal[4])!=-1?minutes.indexOf(dVal[4]):0,
+							dVal[5]&&seconds.indexOf(dVal[5])!=-1?seconds.indexOf(dVal[5]):0
+						]:(curFlag?[
+							years.indexOf(curYear+''),
+							months.indexOf(this.formatNum(curMonth)),
+							days.indexOf(this.formatNum(curDay)),
+							hours.indexOf(this.formatNum(curHour)),
+							minutes.indexOf(this.formatNum(curMinute)),
+							seconds.indexOf(this.formatNum(curSecond)),
+						]:[
+							dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
+							dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0,
+							dVal[2]&&days.indexOf(dVal[2])!=-1?days.indexOf(dVal[2]):0,
+							dVal[3]&&hours.indexOf(dVal[3])!=-1?hours.indexOf(dVal[3]):0,
+							dVal[4]&&minutes.indexOf(dVal[4])!=-1?minutes.indexOf(dVal[4]):0,
+							dVal[5]&&seconds.indexOf(dVal[5])!=-1?seconds.indexOf(dVal[5]):0
+						]);
+						range={years,months,days,hours,minutes,seconds};
+						year=dVal[0]?dVal[0]:years[0];
+						month=dVal[1]?dVal[1]:months[0];
+						day=dVal[2]?dVal[2]:days[0];
+						hour=dVal[3]?dVal[3]:hours[0];
+						minute=dVal[4]?dVal[4]:minutes[0];
+						second=dVal[5]?dVal[5]:seconds[0];
+						result=full=`${year+'-'+month+'-'+day+' '+hour+':'+minute+':'+second}`;
+						obj={
+							year,
+							month,
+							day,
+							hour,
+							minute,
+							second
+						}
+						break;
+					default:
+						range={years,months,days};
+						break;
+				}
+				this.range=range;
+				this.checkObj=obj;
+				this.$emit("change",{
+					result:result,
+					value:full,
+					obj:obj
+				});
+				this.$nextTick(()=>{
+					this.pickVal=pickVal;
+				})
+			},
+			handlerChange(e){
+				let arr=[...e.detail.value];
+				let data=this.range;
+				let year="",month="",day="",hour="",minute="",second="";
+				let result="",full="",obj={};
+				let months=null,days=null,hours=null,minutes=null,seconds=null;
+				let disabledAfter=this.disabledAfter;
+				let leapYear=false,resetData={};
+				year=(arr[0]||arr[0]==0)?data.years[arr[0]]||data.years[data.years.length-1]:"";
+				month=(arr[1]||arr[1]==0)?data.months[arr[1]]||data.months[data.months.length-1]:"";
+				day=(arr[2]||arr[2]==0)?data.days[arr[2]]||data.days[data.days.length-1]:"";
+				hour=(arr[3]||arr[3]==0)?data.hours[arr[3]]||data.hours[data.hours.length-1]:"";
+				minute=(arr[4]||arr[4]==0)?data.minutes[arr[4]]||data.minutes[data.minutes.length-1]:"";
+				second=(arr[5]||arr[5]==0)?data.seconds[arr[5]]||data.seconds[data.seconds.length-1]:"";
+				resetData=this.resetData(year,month,day,hour,minute);//重新拉取当前日期数据;
+				leapYear=this.isLeapYear(year);//判断是否为闰年;
+				switch(this.fields){
+					case "year":
+						result=full=`${year}`;
+						obj={
+							year
+						};
+						break;
+					case "month":
+						result=full=`${year+'-'+month}`;
+						if(this.disabledAfter)months=resetData.months;
+						if(months)this.range.months=months;
+						obj={
+							year,
+							month
+						}
+						break;
+					case "day":
+						result=full=`${year+'-'+month+'-'+day}`;
+						if(this.disabledAfter){
+							months=resetData.months;
+							days=resetData.days;
+						}else{
+							if(leapYear||(month!=this.checkObj.month)||month==2){
+								days=resetData.days;
+							}
+						}
+						if(months)this.range.months=months;
+						if(days)this.range.days=days;
+						obj={
+							year,
+							month,
+							day
+						}
+						break;
+					case "hour":
+						result=`${year+'-'+month+'-'+day+' '+hour}`;
+						full=`${year+'-'+month+'-'+day+' '+hour+':00:00'}`;
+						if(this.disabledAfter){
+							months=resetData.months;
+							days=resetData.days;
+							hours=resetData.hours;
+						}else{
+							if(leapYear||(month!=this.checkObj.month)||month==2){
+								days=resetData.days;
+							}
+						}
+						if(months)this.range.months=months;
+						if(days)this.range.days=days;
+						if(hours)this.range.hours=hours;
+						obj={
+							year,
+							month,
+							day,
+							hour
+						}
+						break;
+					case "minute":
+						full=`${year+'-'+month+'-'+day+' '+hour+':'+minute+':00'}`;
+						result=`${year+'-'+month+'-'+day+' '+hour+':'+minute}`;
+						if(this.disabledAfter){
+							months=resetData.months;
+							days=resetData.days;
+							hours=resetData.hours;
+							minutes=resetData.minutes;
+						}else{
+							if(leapYear||(month!=this.checkObj.month)||month==2){
+								days=resetData.days;
+							}
+						}
+						if(months)this.range.months=months;
+						if(days)this.range.days=days;
+						if(hours)this.range.hours=hours;
+						if(minutes)this.range.minutes=minutes;
+						obj={
+							year,
+							month,
+							day,
+							hour,
+							minute
+						};
+						break;
+					case "second":
+						result=full=`${year+'-'+month+'-'+day+' '+hour+':'+minute+':'+second}`;
+						if(this.disabledAfter){
+							months=resetData.months;
+							days=resetData.days;
+							hours=resetData.hours;
+							minutes=resetData.minutes;
+							//seconds=resetData.seconds;
+						}else{
+							if(leapYear||(month!=this.checkObj.month)||month==2){
+								days=resetData.days;
+							}
+						}
+						if(months)this.range.months=months;
+						if(days)this.range.days=days;
+						if(hours)this.range.hours=hours;
+						if(minutes)this.range.minutes=minutes;
+						//if(seconds)this.range.seconds=seconds;
+						obj={
+							year,
+							month,
+							day,
+							hour,
+							minute,
+							second
+						}
+						break;
+				}
+				this.checkObj=obj;
+				this.$emit("change",{
+					result:result,
+					value:full,
+					obj:obj
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "./w-picker.css";
+</style>
diff --git a/components/w-picker/half-picker.vue b/components/w-picker/half-picker.vue
new file mode 100644
index 0000000..0fdfb33
--- /dev/null
+++ b/components/w-picker/half-picker.vue
@@ -0,0 +1,345 @@
+<template>
+	<view class="w-picker-view">
+		<picker-view class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.years" :key="index">{{item}}年</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.months" :key="index">{{item}}月</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.days" :key="index">{{item}}日</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.sections" :key="index">{{item}}</view>
+			</picker-view-column>
+		</picker-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				pickVal:[],
+				range:{},
+				checkObj:{}
+			};
+		},
+		props:{
+			itemHeight:{
+				type:String,
+				default:"44px"
+			},
+			startYear:{
+				type:String,
+				default:""
+			},
+			endYear:{
+				type:String,
+				default:""
+			},
+			value:{
+				type:[String,Array,Number],
+				default:""
+			},
+			current:{//是否默认选中当前日期
+				type:Boolean,
+				default:false
+			},
+			disabledAfter:{//是否禁用当前之后的日期
+				type:Boolean,
+				default:false
+			}
+		},
+		watch:{
+			value(val){
+				this.initData();
+			}
+		},
+		created() {
+			this.initData();
+		},
+		methods:{
+			formatNum(n){
+				return (Number(n)<10?'0'+Number(n):Number(n)+'');
+			},
+			checkValue(value){
+				let strReg=/^\d{4}-\d{2}-\d{2} [\u4e00-\u9fa5]{2}$/,example;
+				if(!strReg.test(value)){
+					console.log(new Error("请传入与mode、fields匹配的value值，例value="+example+""))
+				}
+				return strReg.test(value);
+			},
+			resetData(year,month,day){
+				let curDate=this.getCurrenDate();
+				let curFlag=this.current;
+				let curYear=curDate.curYear;
+				let curMonth=curDate.curMonth;
+				let curDay=curDate.curDay;
+				let curHour=curDate.curHour;
+				let months=[],days=[],sections=[];
+				let disabledAfter=this.disabledAfter;
+				let monthsLen=disabledAfter?(year*1<curYear?12:curMonth):12;
+				let totalDays=new Date(year,month,0).getDate();//计算当月有几天;
+				let daysLen=disabledAfter?((year*1<curYear||month*1<curMonth)?totalDays:curDay):totalDays;
+				let sectionFlag=disabledAfter?((year*1<curYear||month*1<curMonth||day*1<curDay)==true?false:true):(curHour>12==true?true:false);
+				sections=["上午","下午"];
+				for(let month=1;month<=monthsLen;month++){
+					months.push(this.formatNum(month));
+				};
+				for(let day=1;day<=daysLen;day++){
+					days.push(this.formatNum(day));
+				}
+				if(sectionFlag){
+					sections=["上午"];
+				}
+				return{
+					months,
+					days,
+					sections
+				}
+			},
+			getData(dVal){
+				//用来处理初始化数据
+				let curFlag=this.current;
+				let disabledAfter=this.disabledAfter;
+				let curDate=this.getCurrenDate();
+				let curYear=curDate.curYear;
+				let curMonthdays=curDate.curMonthdays;
+				let curMonth=curDate.curMonth;
+				let curDay=curDate.curDay;
+				let curHour=curDate.curHour;
+				let defaultDate=this.getDefaultDate();
+				let startYear=this.getStartDate().getFullYear();
+				let endYear=this.getEndDate().getFullYear();
+				let years=[],months=[],days=[],sections=[];
+				let year=dVal[0]*1;
+				let month=dVal[1]*1;
+				let day=dVal[2]*1;
+				let monthsLen=disabledAfter?(year<curYear?12:curDate.curMonth):12;
+				let daysLen=disabledAfter?((year<curYear||month<curMonth)?defaultDate.defaultDays:curDay):(curFlag?curMonthdays:defaultDate.defaultDays);
+				let sectionFlag=disabledAfter?((year*1<curYear||month*1<curMonth||day*1<curDay)==true?false:true):(curHour>12==true?true:false);
+				for(let year=startYear;year<=(disabledAfter?curYear:endYear);year++){
+					years.push(year.toString())
+				}
+				for(let month=1;month<=monthsLen;month++){
+					months.push(this.formatNum(month));
+				}
+				for(let day=1;day<=daysLen;day++){
+					days.push(this.formatNum(day));
+				}
+				if(sectionFlag){
+					sections=["下午"];
+				}else{
+					sections=["上午","下午"];
+				}
+				return {
+					years,
+					months,
+					days,
+					sections
+				}
+			},
+			getCurrenDate(){
+				let curDate=new Date();
+				let curYear=curDate.getFullYear();
+				let curMonth=curDate.getMonth()+1;
+				let curMonthdays=new Date(curYear,curMonth,0).getDate();
+				let curDay=curDate.getDate();
+				let curHour=curDate.getHours();
+				let curSection="上午";
+				if(curHour>=12){
+					curSection="下午";
+				}
+				return{
+					curDate,
+					curYear,
+					curMonth,
+					curMonthdays,
+					curDay,
+					curHour,
+					curSection
+				}
+			},
+			getDefaultDate(){
+				let value=this.value;
+				let reg=/-/g;
+				let defaultDate=value?new Date(value.split(" ")[0].replace(reg,"/")):new Date();
+				let defaultYear=defaultDate.getFullYear();
+				let defaultMonth=defaultDate.getMonth()+1;
+				let defaultDay=defaultDate.getDate();
+				let defaultDays=new Date(defaultYear,defaultMonth,0).getDate()*1;
+				return{
+					defaultDate,
+					defaultYear,
+					defaultMonth,
+					defaultDay,
+					defaultDays
+				}
+			},
+			getStartDate(){
+				let start=this.startYear;
+				let startDate="";
+				let reg=/-/g;
+				if(start){
+					startDate=new Date(start+"/01/01");
+				}else{
+					startDate=new Date("1970/01/01");
+				}
+				return startDate;
+			},
+			getEndDate(){
+				let end=this.endYear;
+				let reg=/-/g;
+				let endDate="";
+				if(end){
+					endDate=new Date(end+"/12/31");
+				}else{
+					endDate=new Date();
+				}
+				return endDate;
+			},
+			getDval(){
+				let value=this.value;
+				let dVal=null;
+				let aDate=new Date();
+				let year=this.formatNum(aDate.getFullYear());
+				let month=this.formatNum(aDate.getMonth()+1);
+				let day=this.formatNum(aDate.getDate());
+				let hour=aDate.getHours();
+				let section="上午";
+				if(hour>=12)section="下午";
+				if(value){
+					let flag=this.checkValue(value);
+					if(!flag){
+						dVal=[year,month,day,section]
+					}else{
+						let v=value.split(" ");
+						dVal=[...v[0].split("-"),v[1]];
+					}
+				}else{
+					dVal=[year,month,day,section]
+				}
+				return dVal;
+			},
+			initData(){
+				let startDate,endDate,startYear,endYear,startMonth,endMonth,startDay,endDay;
+				let years=[],months=[],days=[],sections=[];
+				let dVal=[],pickVal=[];
+				let value=this.value;
+				let reg=/-/g;
+				let range={};
+				let result="",full="",year,month,day,section,obj={};
+				let defaultDate=this.getDefaultDate();
+				let defaultYear=defaultDate.defaultYear;
+				let defaultMonth=defaultDate.defaultMonth;
+				let defaultDay=defaultDate.defaultDay;
+				let defaultDays=defaultDate.defaultDays;
+				let curFlag=this.current;
+				let disabledAfter=this.disabledAfter;
+				let curDate=this.getCurrenDate();
+				let curYear=curDate.curYear;
+				let curMonth=curDate.curMonth;
+				let curMonthdays=curDate.curMonthdays;
+				let curDay=curDate.curDay;
+				let curSection=curDate.curSection;
+				let dateData=[];
+				dVal=this.getDval();
+				startDate=this.getStartDate();
+				endDate=this.getEndDate();
+				startYear=startDate.getFullYear();
+				startMonth=startDate.getMonth();
+				startDay=startDate.getDate();
+				endYear=endDate.getFullYear();
+				endMonth=endDate.getMonth();
+				endDay=endDate.getDate();
+				dateData=this.getData(dVal);
+				years=dateData.years;
+				months=dateData.months;
+				days=dateData.days;
+				sections=dateData.sections;
+				pickVal=disabledAfter?[
+					dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
+					dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0,
+					dVal[2]&&days.indexOf(dVal[2])!=-1?days.indexOf(dVal[2]):0,
+					dVal[3]&&sections.indexOf(dVal[3])!=-1?sections.indexOf(dVal[3]):0
+				]:(curFlag?[
+					years.indexOf(curYear+''),
+					months.indexOf(this.formatNum(curMonth)),
+					days.indexOf(this.formatNum(curDay)),
+					sections.indexOf(curSection),
+				]:[
+					dVal[0]&&years.indexOf(dVal[0])!=-1?years.indexOf(dVal[0]):0,
+					dVal[1]&&months.indexOf(dVal[1])!=-1?months.indexOf(dVal[1]):0,
+					dVal[2]&&days.indexOf(dVal[2])!=-1?days.indexOf(dVal[2]):0,
+					dVal[3]&&sections.indexOf(dVal[3])!=-1?sections.indexOf(dVal[3]):0
+				]);
+				range={years,months,days,sections};
+				year=dVal[0]?dVal[0]:years[0];
+				month=dVal[1]?dVal[1]:months[0];
+				day=dVal[2]?dVal[2]:days[0];
+				section=dVal[3]?dVal[3]:sections[0];
+				result=full=`${year+'-'+month+'-'+day+' '+section}`;
+				obj={
+					year,
+					month,
+					day,
+					section
+				}
+				this.range=range;
+				this.checkObj=obj;
+				this.$nextTick(()=>{
+					this.pickVal=pickVal;
+				});
+				this.$emit("change",{
+					result:result,
+					value:full,
+					obj:obj
+				})
+			},
+			handlerChange(e){
+				let arr=[...e.detail.value];
+				let data=this.range;
+				let year="",month="",day="",section="";
+				let result="",full="",obj={};
+				let months=null,days=null,sections=null;
+				let disabledAfter=this.disabledAfter;
+				year=(arr[0]||arr[0]==0)?data.years[arr[0]]||data.years[data.years.length-1]:"";
+				month=(arr[1]||arr[1]==0)?data.months[arr[1]]||data.months[data.months.length-1]:"";
+				day=(arr[2]||arr[2]==0)?data.days[arr[2]]||data.days[data.days.length-1]:"";
+				section=(arr[3]||arr[3]==0)?data.sections[arr[3]]||data.sections[data.sections.length-1]:"";
+				result=full=`${year+'-'+month+'-'+day+' '+section}`;
+				let resetData=this.resetData(year,month,day);
+				if(this.disabledAfter){
+					months=resetData.months;
+					days=resetData.days;
+					sections=resetData.sections;
+				}else{
+					if(year%4==0||(month!=this.checkObj.month)){
+						days=resetData.days;
+					}
+				}
+				if(months)this.range.months=months;
+				if(days)this.range.days=days;
+				if(sections)this.range.sections=sections;
+				obj={
+					year,
+					month,
+					day,
+					section
+				}
+				this.checkObj=obj;
+				this.$emit("change",{
+					result:result,
+					value:full,
+					obj:obj
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "./w-picker.css";
+</style>
diff --git a/components/w-picker/linkage-picker.vue b/components/w-picker/linkage-picker.vue
new file mode 100644
index 0000000..290422d
--- /dev/null
+++ b/components/w-picker/linkage-picker.vue
@@ -0,0 +1,274 @@
+<template>
+	<view class="w-picker-view">
+		<picker-view class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
+			<picker-view-column v-for="(group,gIndex) in range" :key="gIndex">
+				<view class="w-picker-item" v-for="(item,index) in group" :key="index">{{item[nodeKey]}}</view>
+			</picker-view-column>
+		</picker-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				pickVal:[],
+				range:[],
+				checkObj:{}
+			};
+		},
+		props:{
+			itemHeight:{
+				type:String,
+				default:"44px"
+			},
+			value:{
+				type:[Array,String],
+				default:""
+			},
+			defaultType:{
+				type:String,
+				default:"label"
+			},
+			options:{
+				type:Array,
+				default(){
+					return []
+				}
+			},
+			defaultProps:{
+				type:Object,
+				default(){
+					return{
+						lable:"label",
+						value:"value",
+						children:"children"
+					}
+				}
+			},
+			level:{
+				//多级联动层级，表示几级联动
+				type:[Number,String],
+				default:2
+			}
+		},
+		computed:{
+			nodeKey(){
+				return this.defaultProps.label;
+			},
+			nodeVal(){
+				return this.defaultProps.value;
+			},
+			nodeChild(){
+				return this.defaultProps.children;
+			}
+		},
+		watch:{
+			value(val){
+				if(this.options.length!=0){
+					this.initData();
+				}
+			},
+			options(val){
+				this.initData();
+			}
+		},
+		created() {
+			if(this.options.length!=0){
+				this.initData();
+			}
+		},
+		methods:{
+			getData(){
+				//用来处理初始化数据
+				let options=this.options;
+				let col1={},col2={},col3={},col4={};
+				let arr1=options,arr2=[],arr3=[],arr4=[];
+				let col1Index=0,col2Index=0,col3Index=0,col4Index=0;
+				let a1="",a2="",a3="",a4="";
+				let dVal=[],obj={};
+				let value=this.value;
+				let data=[];
+				a1=value[0];
+				a2=value[1];
+				if(this.level>2){
+					a3=value[2];
+				}
+				if(this.level>3){
+					a4=value[3];
+				};
+				/*第1列*/
+				col1Index=arr1.findIndex((v)=>{
+					return v[this.defaultType]==a1
+				});
+				col1Index=value?(col1Index!=-1?col1Index:0):0;
+				col1=arr1[col1Index];
+				
+				/*第2列*/
+				arr2=arr1[col1Index][this.nodeChild];
+				col2Index=arr2.findIndex((v)=>{
+					return v[this.defaultType]==a2
+				});
+				col2Index=value?(col2Index!=-1?col2Index:0):0;
+				col2=arr2[col2Index];
+				
+				/*第3列*/
+				if(this.level>2){
+					arr3=arr2[col2Index][this.nodeChild];
+					col3Index=arr3.findIndex((v)=>{
+						return v[this.defaultType]==a3;
+					});
+					col3Index=value?(col3Index!=-1?col3Index:0):0;
+					col3=arr3[col3Index];
+				};
+				
+				
+				/*第4列*/
+				if(this.level>3){
+					arr4=arr3[col4Index][this.nodeChild];
+					col4Index=arr4.findIndex((v)=>{
+						return v[this.defaultType]==a4;
+					});
+					col4Index=value?(col4Index!=-1?col4Index:0):0;
+					col4=arr4[col4Index];
+				};
+				switch(this.level*1){
+					case 2:
+						dVal=[col1Index,col2Index];
+						obj={
+							col1,
+							col2
+						}
+						data=[arr1,arr2];
+						break;
+					case 3:
+						dVal=[col1Index,col2Index,col3Index];
+						obj={
+							col1,
+							col2,
+							col3
+						}
+						data=[arr1,arr2,arr3];
+						break;
+					case 4:
+						dVal=[col1Index,col2Index,col3Index,col4Index];
+						obj={
+							col1,
+							col2,
+							col3,
+							col4
+						}
+						data=[arr1,arr2,arr3,arr4];
+						break
+				}
+				return {
+					data,
+					dVal,
+					obj
+				}
+			},
+			initData(){
+				let dataData=this.getData();
+				let data=dataData.data;
+				let arr1=data[0];
+				let arr2=data[1];
+				let arr3=data[2]||[];
+				let arr4=data[3]||[];
+				let obj=dataData.obj;
+				let col1=obj.col1,col2=obj.col2,col3=obj.col3||{},col4=obj.col4||{};
+				let result="",value=[];
+				let range=[];
+				switch(this.level){
+					case 2:
+						value=[col1[this.nodeVal],col2[this.nodeVal]];
+						result=`${col1[this.nodeKey]+col2[this.nodeKey]}`;
+						range=[arr1,arr2];
+						break;
+					case 3:
+						value=[col1[this.nodeVal],col2[this.nodeVal],col3[this.nodeVal]];
+						result=`${col1[this.nodeKey]+col2[this.nodeKey]+col3[this.nodeKey]}`;
+						range=[arr1,arr2,arr3];
+						break;
+					case 4:
+						value=[col1[this.nodeVal],col2[this.nodeVal],col3[this.nodeVal],col4[this.nodeVal]];
+						result=`${col1[this.nodeKey]+col2[this.nodeKey]+col3[this.nodeKey]+col4[this.nodeKey]}`;
+						range=[arr1,arr2,arr3,arr4];
+						break;
+				}
+				this.range=range;
+				this.checkObj=obj;
+				this.$nextTick(()=>{
+					this.pickVal=dataData.dVal;
+				});
+				this.$emit("change",{
+					result:result,
+					value:value,
+					obj:obj
+				})
+			},
+			handlerChange(e){
+				let arr=[...e.detail.value];
+				let col1Index=arr[0],col2Index=arr[1],col3Index=arr[2]||0,col4Index=arr[3]||0;
+				let arr1=[],arr2=[],arr3=[],arr4=[];
+				let col1,col2,col3,col4,obj={};
+				let result="",value=[];
+				arr1=this.options;
+				arr2=(arr1[col1Index]&&arr1[col1Index][this.nodeChild])||arr1[arr1.length-1][this.nodeChild]||[];
+				col1=arr1[col1Index]||arr1[arr1.length-1]||{};
+				col2=arr2[col2Index]||arr2[arr2.length-1]||{};
+				if(this.level>2){
+					arr3=(arr2[col2Index]&&arr2[col2Index][this.nodeChild])||arr2[arr2.length-1][this.nodeChild];
+					col3=arr3[col3Index]||arr3[arr3.length-1]||{};
+				}
+				if(this.level>3){
+					arr4=(arr3[col3Index]&&arr3[col3Index][this.nodeChild])||arr3[arr3.length-1][this.nodeChild]||[];
+					col4=arr4[col4Index]||arr4[arr4.length-1]||{};
+				}
+				switch(this.level){
+					case 2:
+						obj={
+							col1,
+							col2
+						}
+						this.range=[arr1,arr2];
+						result=`${(col1[this.nodeKey]||'')+(col2[this.nodeKey]||'')}`;
+						value=[col1[this.nodeVal]||'',col2[this.nodeVal]||''];
+						break;
+					case 3:
+						obj={
+							col1,
+							col2,
+							col3
+						}
+						this.range=[arr1,arr2,arr3];
+						result=`${(col1[this.nodeKey]||'')+(col2[this.nodeKey]||'')+(col3[this.nodeKey]||'')}`;
+						value=[col1[this.nodeVal]||'',col2[this.nodeVal]||'',col3[this.nodeVal]||''];
+						break;
+					case 4:
+						obj={
+							col1,
+							col2,
+							col3,
+							col4
+						}
+						this.range=[arr1,arr2,arr3,arr4];
+						result=`${(col1[this.nodeKey]||'')+(col2[this.nodeKey]||'')+(col3[this.nodeKey]||'')+(col4[this.nodeKey]||'')}`;
+						value=[col1[this.nodeVal]||'',col2[this.nodeVal]||'',col3[this.nodeVal]||'',col4[this.nodeVal]||''];
+						break;
+				}
+				this.checkObj=obj;
+				this.pickVal=arr;
+				this.$emit("change",{
+					result:result,
+					value:value,
+					obj:obj
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "./w-picker.css";	
+</style>
+
diff --git a/components/w-picker/range-picker.vue b/components/w-picker/range-picker.vue
new file mode 100644
index 0000000..7dd8b5b
--- /dev/null
+++ b/components/w-picker/range-picker.vue
@@ -0,0 +1,344 @@
+<template>
+	<view class="w-picker-view">
+		<picker-view  class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
+			<picker-view-column class="w-picker-flex2">
+				<view class="w-picker-item" v-for="(item,index) in range.fyears" :key="index">{{item}}年</view>
+			</picker-view-column>
+			<picker-view-column class="w-picker-flex2">
+				<view class="w-picker-item" v-for="(item,index) in range.fmonths" :key="index">{{item}}月</view>
+			</picker-view-column>
+			<picker-view-column class="w-picker-flex2">
+				<view class="w-picker-item" v-for="(item,index) in range.fdays" :key="index">{{item}}日</view>
+			</picker-view-column>
+			<picker-view-column class="w-picker-flex1">
+				<view class="w-picker-item">-</view>
+			</picker-view-column>
+			<picker-view-column class="w-picker-flex2">
+				<view class="w-picker-item" v-for="(item,index) in range.tyears" :key="index">{{item}}年</view>
+			</picker-view-column>
+			<picker-view-column class="w-picker-flex2">
+				<view class="w-picker-item" v-for="(item,index) in range.tmonths" :key="index">{{item}}月</view>
+			</picker-view-column>
+			<picker-view-column class="w-picker-flex2">
+				<view class="w-picker-item" v-for="(item,index) in range.tdays" :key="index">{{item}}日</view>
+			</picker-view-column>
+		</picker-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				pickVal:[],
+				range:{},
+				checkObj:{}
+			};
+		},
+		props:{
+			itemHeight:{
+				type:String,
+				default:"44px"
+			},
+			value:{
+				type:[String,Array],
+				default(){
+					return []
+				}
+			},
+			current:{//是否默认选中当前日期
+				type:Boolean,
+				default:false
+			},
+			startYear:{
+				type:[String,Number],
+				default:1970
+			},
+			endYear:{
+				type:[String,Number],
+				default:new Date().getFullYear()
+			}
+		},
+		watch:{
+			value(val){
+				this.initData();
+			}
+		},
+		created() {
+			this.initData();
+		},
+		methods:{
+			formatNum(n){
+				return (Number(n)<10?'0'+Number(n):Number(n)+'');
+			},
+			checkValue(value){
+				let strReg=/^\d{4}-\d{2}-\d{2}$/,example="2020-04-03";
+				if(!strReg.test(value[0])||!strReg.test(value[1])){
+					console.log(new Error("请传入与mode匹配的value值，例["+example+","+example+"]"))
+				}
+				return strReg.test(value[0])&&strReg.test(value[1]);
+			},
+			resetToData(fmonth,fday,tyear,tmonth){
+				let range=this.range;
+				let tmonths=[],tdays=[];
+				let yearFlag=tyear!=range.tyears[0];
+				let monthFlag=tyear!=range.tyears[0]||tmonth!=range.tmonths[0];
+				let ttotal=new Date(tyear,tmonth,0).getDate();
+				for(let i=yearFlag?1:fmonth*1;i<=12;i++){
+					tmonths.push(this.formatNum(i))
+				}
+				for(let i=monthFlag?1:fday*1;i<=ttotal;i++){
+					tdays.push(this.formatNum(i))
+				}
+				return{
+					tmonths,
+					tdays
+				}
+			},
+			resetData(fyear,fmonth,fday,tyear,tmonth){
+				let fyears=[],fmonths=[],fdays=[],tyears=[],tmonths=[],tdays=[];
+				let startYear=this.startYear;
+				let endYear=this.endYear;
+				let ftotal=new Date(fyear,fmonth,0).getDate();
+				let ttotal=new Date(tyear,tmonth,0).getDate();
+				for(let i=startYear*1;i<=endYear;i++){
+					fyears.push(this.formatNum(i))
+				}
+				for(let i=1;i<=12;i++){
+					fmonths.push(this.formatNum(i))
+				}
+				for(let i=1;i<=ftotal;i++){
+					fdays.push(this.formatNum(i))
+				}
+				for(let i=fyear*1;i<=endYear;i++){
+					tyears.push(this.formatNum(i))
+				}
+				for(let i=fmonth*1;i<=12;i++){
+					tmonths.push(this.formatNum(i))
+				}
+				for(let i=fday*1;i<=ttotal;i++){
+					tdays.push(this.formatNum(i))
+				}
+				return {
+					fyears,
+					fmonths,
+					fdays,
+					tyears,
+					tmonths,
+					tdays
+				}
+			},
+			getData(dVal){
+				let start=this.startYear*1;
+				let end=this.endYear*1;
+				let value=dVal;
+				let flag=this.current;
+				let aToday=new Date();
+				let tYear,tMonth,tDay,tHours,tMinutes,tSeconds,pickVal=[];
+				let initstartDate=new Date(start.toString());
+				let endDate=new Date(end.toString());
+				if(start>end){
+					initstartDate=new Date(end.toString());
+					endDate=new Date(start.toString());
+				};
+				let startYear=initstartDate.getFullYear();
+				let startMonth=initstartDate.getMonth()+1;
+				let endYear=endDate.getFullYear();
+				let fyears=[],fmonths=[],fdays=[],tyears=[],tmonths=[],tdays=[],returnArr=[],startDVal=[],endDVal=[];
+				let curMonth=flag?value[1]*1:(startDVal[1]*1+1);
+				let curMonth1=flag?value[5][1]*1:(value[5]*1+1);
+				let totalDays=new Date(value[0],value[1],0).getDate();
+				let totalDays1=new Date(value[4],value[5],0).getDate();
+				for(let s=startYear;s<=endYear;s++){
+					fyears.push(this.formatNum(s));
+				};
+				for(let m=1;m<=12;m++){
+					fmonths.push(this.formatNum(m));
+				};
+				for(let d=1;d<=totalDays;d++){
+					fdays.push(this.formatNum(d));
+				};
+				for(let s=value[0]*1;s<=endYear;s++){
+					tyears.push(this.formatNum(s));
+				};
+				
+				if(value[4]*1>value[0]*1){
+					for(let m=1;m<=12;m++){
+						tmonths.push(this.formatNum(m));
+					};
+					for(let d=1;d<=totalDays1;d++){
+						tdays.push(this.formatNum(d));
+					};
+				}else{
+					for(let m=value[1]*1;m<=12;m++){
+						tmonths.push(this.formatNum(m));
+					};
+					for(let d=value[2]*1;d<=totalDays1;d++){
+						tdays.push(this.formatNum(d));
+					};
+				};
+				
+				pickVal=[
+					fyears.indexOf(value[0])==-1?0:fyears.indexOf(value[0]),
+					fmonths.indexOf(value[1])==-1?0:fmonths.indexOf(value[1]),
+					fdays.indexOf(value[2])==-1?0:fdays.indexOf(value[2]),
+					0,
+					tyears.indexOf(value[4])==-1?0:tyears.indexOf(value[4]),
+					tmonths.indexOf(value[5])==-1?0:tmonths.indexOf(value[5]),
+					tdays.indexOf(value[6])==-1?0:tdays.indexOf(value[6])
+				];
+				return {
+					fyears,
+					fmonths,
+					fdays,
+					tyears,
+					tmonths,
+					tdays,
+					pickVal
+				}
+			},
+			getDval(){
+				let value=this.value;
+				let fields=this.fields;
+				let dVal=null;
+				let aDate=new Date();
+				let fyear=this.formatNum(aDate.getFullYear());
+				let fmonth=this.formatNum(aDate.getMonth()+1);
+				let fday=this.formatNum(aDate.getDate());
+				let tyear=this.formatNum(aDate.getFullYear());
+				let tmonth=this.formatNum(aDate.getMonth()+1);
+				let tday=this.formatNum(aDate.getDate());
+				if(value&&value.length>0){
+					let flag=this.checkValue(value);
+					if(!flag){
+						dVal=[fyear,fmonth,fday,"-",tyear,tmonth,tday]
+					}else{
+						dVal=[...value[0].split("-"),"-",...value[1].split("-")];
+					}
+				}else{
+					dVal=[fyear,fmonth,fday,"-",tyear,tmonth,tday]
+				}
+				return dVal;
+			},
+			initData(){
+				let range=[],pickVal=[];
+				let result="",full="",obj={};
+				let dVal=this.getDval();
+				let dateData=this.getData(dVal);
+				let fyears=[],fmonths=[],fdays=[],tyears=[],tmonths=[],tdays=[];
+				let fyear,fmonth,fday,tyear,tmonth,tday;
+				pickVal=dateData.pickVal;
+				fyears=dateData.fyears;
+				fmonths=dateData.fmonths;
+				fdays=dateData.fdays;
+				tyears=dateData.tyears;
+				tmonths=dateData.tmonths;
+				tdays=dateData.tdays;
+				range={
+					fyears,
+					fmonths,
+					fdays,
+					tyears,
+					tmonths,
+					tdays,
+				}
+				fyear=range.fyears[pickVal[0]];
+				fmonth=range.fmonths[pickVal[1]];
+				fday=range.fdays[pickVal[2]];
+				tyear=range.tyears[pickVal[4]];
+				tmonth=range.tmonths[pickVal[5]];
+				tday=range.tdays[pickVal[6]];
+				obj={
+					fyear,
+					fmonth,
+					fday,
+					tyear,
+					tmonth,
+					tday
+				}
+				result=`${fyear+'-'+fmonth+'-'+fday+'至'+tyear+'-'+tmonth+'-'+tday}`;
+				this.range=range;
+				this.checkObj=obj;
+				this.$nextTick(()=>{
+					this.pickVal=pickVal;
+				});
+				this.$emit("change",{
+					result:result,
+					value:result.split("至"),
+					obj:obj
+				})
+			},
+			handlerChange(e){
+				let arr=[...e.detail.value];
+				let result="",full="",obj={};
+				let year="",month="",day="",hour="",minute="",second="",note=[],province,city,area;
+				let checkObj=this.checkObj;
+				let days=[],months=[],endYears=[],endMonths=[],endDays=[],startDays=[];
+				let mode=this.mode;
+				let col1,col2,col3,d,a,h,m;
+				let xDate=new Date().getTime();
+				let range=this.range;
+				let fyear=range.fyears[arr[0]]||range.fyears[range.fyears.length-1];
+				let fmonth=range.fmonths[arr[1]]||range.fmonths[range.fmonths.length-1];
+				let fday=range.fdays[arr[2]]||range.fdays[range.fdays.length-1];
+				let tyear=range.tyears[arr[4]]||range.tyears[range.tyears.length-1];
+				let tmonth=range.tmonths[arr[5]]||range.tmonths[range.tmonths.length-1];
+				let tday=range.tdays[arr[6]]||range.tdays[range.tdays.length-1];
+				let resetData=this.resetData(fyear,fmonth,fday,tyear,tmonth);
+				if(fyear!=checkObj.fyear||fmonth!=checkObj.fmonth||fday!=checkObj.fday){
+					arr[4]=0;
+					arr[5]=0;
+					arr[6]=0;
+					range.tyears=resetData.tyears;
+					range.tmonths=resetData.tmonths;
+					range.tdays=resetData.tdays;
+					tyear=range.tyears[0];
+					checkObj.tyears=range.tyears[0];
+					tmonth=range.tmonths[0];
+					checkObj.tmonths=range.tmonths[0];
+					tday=range.tdays[0];
+					checkObj.tdays=range.tdays[0];
+				}
+				if(fyear!=checkObj.fyear||fmonth!=checkObj.fmonth){
+					range.fdays=resetData.fdays;
+				};
+				if(tyear!=checkObj.tyear){
+					arr[5]=0;
+					arr[6]=0;
+					let toData=this.resetToData(fmonth,fday,tyear,tmonth);
+					range.tmonths=toData.tmonths;
+					range.tdays=toData.tdays;
+					tmonth=range.tmonths[0];
+					checkObj.tmonths=range.tmonths[0];
+					tday=range.tdays[0];
+					checkObj.tdays=range.tdays[0];
+				};
+				if(tmonth!=checkObj.tmonth){
+					arr[6]=0;
+					let toData=this.resetToData(fmonth,fday,tyear,tmonth);
+					range.tdays=toData.tdays;
+					tday=range.tdays[0];
+					checkObj.tdays=range.tdays[0];
+				};
+				result=`${fyear+'-'+fmonth+'-'+fday+'至'+tyear+'-'+tmonth+'-'+tday}`;
+				obj={
+					fyear,fmonth,fday,tyear,tmonth,tday
+				}
+				this.checkObj=obj;
+				this.$nextTick(()=>{
+					this.pickVal=arr;
+				})
+				this.$emit("change",{
+					result:result,
+					value:result.split("至"),
+					obj:obj
+				})
+				
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "./w-picker.css";
+</style>
diff --git a/components/w-picker/region-picker.vue b/components/w-picker/region-picker.vue
new file mode 100644
index 0000000..34c1f40
--- /dev/null
+++ b/components/w-picker/region-picker.vue
@@ -0,0 +1,183 @@
+<template>
+	<view class="w-picker-view">
+		<picker-view class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.provinces" :key="index">{{item.label}}</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.citys" :key="index">{{item.label}}</view>
+			</picker-view-column>
+			<picker-view-column v-if="!hideArea">
+				<view class="w-picker-item" v-for="(item,index) in range.areas" :key="index">{{item.label}}</view>
+			</picker-view-column>
+		</picker-view>
+	</view>
+</template>
+
+<script>
+	import areaData from "./areadata/areadata.js"
+	export default {
+		data() {
+			return {
+				pickVal:[],
+				range:{
+					provinces:[],
+					citys:[],
+					areas:[]
+				},
+				checkObj:{}
+			};
+		},
+		props:{
+			itemHeight:{
+				type:String,
+				default:"44px"
+			},
+			value:{
+				type:[Array,String],
+				default:""
+			},
+			defaultType:{
+				type:String,
+				default:"label"
+			},
+			hideArea:{
+				type:Boolean,
+				default:false
+			}
+		},
+		watch:{
+			value(val){
+				this.initData();
+			}
+		},
+		created() {
+			this.initData();
+		},
+		methods:{
+			getData(){
+				//用来处理初始化数据
+				let provinces=areaData;
+				let dVal=[];
+				let value=this.value;
+				let a1=value[0];//默认值省
+				let a2=value[1];//默认值市
+				let a3=value[2];//默认值区、县
+				let province,city,area;
+				let provinceIndex=provinces.findIndex((v)=>{
+					return v[this.defaultType]==a1
+				});
+				provinceIndex=value?(provinceIndex!=-1?provinceIndex:0):0;
+				let citys=provinces[provinceIndex].children;
+				let cityIndex=citys.findIndex((v)=>{
+					return v[this.defaultType]==a2
+				});
+				cityIndex=value?(cityIndex!=-1?cityIndex:0):0;
+				let areas=citys[cityIndex].children;
+				let areaIndex=areas.findIndex((v)=>{
+					return v[this.defaultType]==a3;
+				});
+				areaIndex=value?(areaIndex!=-1?areaIndex:0):0;
+				dVal=this.hideArea?[provinceIndex,cityIndex]:[provinceIndex,cityIndex,areaIndex];
+				province=provinces[provinceIndex];
+				city=citys[cityIndex];
+				area=areas[areaIndex];
+				let obj=this.hideArea?{
+					province,
+					city
+				}:{
+					province,
+					city,
+					area
+				}
+				return this.hideArea?{
+					provinces,
+					citys,
+					dVal,
+					obj
+				}:{
+					provinces,
+					citys,
+					areas,
+					dVal,
+					obj
+				}
+			},
+			initData(){
+				let dataData=this.getData();
+				let provinces=dataData.provinces;
+				let citys=dataData.citys;
+				let areas=this.hideArea?[]:dataData.areas;
+				let obj=dataData.obj;
+				let province=obj.province,city=obj.city,area=this.hideArea?{}:obj.area;
+				let value=this.hideArea?[province.value,city.value]:[province.value,city.value,area.value];
+				let result=this.hideArea?`${province.label+city.label}`:`${province.label+city.label+area.label}`;
+				this.range=this.hideArea?{
+					provinces,
+					citys,
+				}:{
+					provinces,
+					citys,
+					areas
+				};
+				this.checkObj=obj;
+				this.$nextTick(()=>{
+					this.pickVal=dataData.dVal;
+				});
+				this.$emit("change",{
+					result:result,
+					value:value,
+					obj:obj
+				})
+			},
+			handlerChange(e){
+				let arr=[...e.detail.value];
+				let provinceIndex=arr[0],cityIndex=arr[1],areaIndex=this.hideArea?0:arr[2];
+				let provinces=areaData;
+				let citys=(provinces[provinceIndex]&&provinces[provinceIndex].children)||provinces[provinces.length-1].children||[];
+				let areas=this.hideArea?[]:((citys[cityIndex]&&citys[cityIndex].children)||citys[citys.length-1].children||[]);
+				let province=provinces[provinceIndex]||provinces[provinces.length-1],
+				city=citys[cityIndex]||[citys.length-1],
+				area=this.hideArea?{}:(areas[areaIndex]||[areas.length-1]);
+				let obj=this.hideArea?{
+					province,
+					city
+				}:{
+					province,
+					city,
+					area
+				}
+				if(this.checkObj.province.label!=province.label){
+					//当省更新的时候需要刷新市、区县的数据;
+					this.range.citys=citys;
+					if(!this.hideArea){
+						this.range.areas=areas;
+					}
+					
+				}
+				if(this.checkObj.city.label!=city.label){
+					//当市更新的时候需要刷新区县的数据;
+					if(!this.hideArea){
+						this.range.areas=areas;
+					}
+				}
+				this.checkObj=obj;
+				this.$nextTick(()=>{
+					this.pickVal=arr;
+				})
+				let result=this.hideArea?`${province.label+city.label}`:`${province.label+city.label+area.label}`;
+				let value=this.hideArea?[province.value,city.value]:[province.value,city.value,area.value];
+				this.$emit("change",{
+					result:result,
+					value:value,
+					obj:obj
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "./w-picker.css";	
+</style>
+
diff --git a/components/w-picker/selector-picker.vue b/components/w-picker/selector-picker.vue
new file mode 100644
index 0000000..6ce2ced
--- /dev/null
+++ b/components/w-picker/selector-picker.vue
@@ -0,0 +1,129 @@
+<template>
+	<view class="w-picker-view">
+		<picker-view class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range" :key="index">{{item[nodeKey]}}</view>
+			</picker-view-column>
+		</picker-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		props:{
+			itemHeight:{
+				type:String,
+				default:"44px"
+			},
+			options:{
+				type:[Array,Object],
+				default(){
+					return []
+				}
+			},
+			value:{
+				type:String,
+				default:""
+			},
+			defaultType:{
+				type:String,
+				default:"label"
+			},
+			defaultProps:{
+				type:Object,
+				default(){
+					return{
+						label:"label",
+						value:"value"
+					}
+				}
+			}
+		},
+		data() {
+			return {
+				pickVal:[]
+			};
+		},
+		computed:{
+			nodeKey(){
+				return this.defaultProps.label;
+			},
+			nodeValue(){
+				return this.defaultProps.value;
+			},
+			range(){
+				return this.options
+			}
+		},
+		watch:{
+			value(val){
+				if(this.options.length!=0){
+					this.initData();
+				}
+			},
+			options(val){
+				this.initData();
+			}
+		},
+		created() {
+			if(this.options.length!=0){
+				this.initData();
+			}
+		},
+		methods:{
+			initData(){
+				let dVal=this.value||"";
+				let data=this.range;
+				let pickVal=[0];
+				let cur=null;
+				let label="";
+				let value,idx;
+				if(this.defaultType==this.nodeValue){
+					value=data.find((v)=>v[this.nodeValue]==dVal);
+					idx=data.findIndex((v)=>v[this.nodeValue]==dVal);
+				}else{
+					value=data.find((v)=>v[this.nodeKey]==dVal);
+					idx=data.findIndex((v)=>v[this.nodeKey]==dVal);
+				}
+				pickVal=[idx!=-1?idx:0];
+				this.$nextTick(()=>{
+					this.pickVal=pickVal;
+				});
+				if(this.defaultType==this.nodeValue){
+					this.$emit("change",{
+						result:value?value[this.nodeKey]:data[0][this.nodeKey],
+						value:dVal||data[0][this.nodeKey],
+						obj:value?value:data[0]
+					})
+				}else{
+					this.$emit("change",{
+						result:dVal||data[0][this.nodeKey],
+						value:value?value[this.nodeValue]:data[0][this.nodeValue],
+						obj:value?value:data[0]
+					})
+				}
+				
+			},
+			handlerChange(e){
+				let arr=[...e.detail.value];
+				let pickVal=[arr[0]||0];
+				let data=this.range;
+				let cur=data[arr[0]];
+				let label="";
+				let value="";
+				this.$nextTick(()=>{
+					this.pickVal=pickVal;
+				});
+				this.$emit("change",{
+					result:cur[this.nodeKey],
+					value:cur[this.nodeValue],
+					obj:cur
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "./w-picker.css";
+</style>
diff --git a/components/w-picker/shortterm-picker.vue b/components/w-picker/shortterm-picker.vue
new file mode 100644
index 0000000..d133cf4
--- /dev/null
+++ b/components/w-picker/shortterm-picker.vue
@@ -0,0 +1,250 @@
+<template>
+	<view class="w-picker-view">
+		<picker-view class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.dates" :key="index">{{item.label}}</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.hours" :key="index">{{item.label}}时</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.minutes" :key="index">{{item.label}}分</view>
+			</picker-view-column>
+		</picker-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				pickVal:[],
+				range:{},
+				checkObj:{}
+			};
+		},
+		props:{
+			itemHeight:{
+				type:String,
+				default:"44px"
+			},
+			value:{
+				type:[String,Array,Number],
+				default:""
+			},
+			current:{//是否默认选中当前日期
+				type:Boolean,
+				default:false
+			},
+			expand:{
+				type:[Number,String],
+				default:30
+			}
+		},
+		watch:{
+			value(val){
+				this.initData();
+			}
+		},
+		created() {
+			this.initData();
+		},
+		methods:{
+			formatNum(n){
+				return (Number(n)<10?'0'+Number(n):Number(n)+'');
+			},
+			checkValue(value){
+				let strReg=/^\d{4}-\d{2}-\d{2} \d{2}:\d{2}(:\d{2})?$/,example="2019-12-12 18:05:00或者2019-12-12 18:05";
+				if(!strReg.test(value)){
+					console.log(new Error("请传入与mode、fields匹配的value值，例value="+example+""))
+				}
+				return strReg.test(value);
+			},
+			resetData(year,month,day){
+				let curDate=this.getCurrenDate();
+				let curFlag=this.current;
+				let curYear=curDate.curYear;
+				let curMonth=curDate.curMonth;
+				let curDay=curDate.curDay;
+				let curHour=curDate.curHour;
+				let months=[],days=[],sections=[];
+				let disabledAfter=this.disabledAfter;
+				let monthsLen=disabledAfter?(year*1<curYear?12:curMonth):12;
+				let totalDays=new Date(year,month,0).getDate();//计算当月有几天;
+				for(let month=1;month<=monthsLen;month++){
+					months.push(this.formatNum(month));
+				};
+				for(let day=1;day<=daysLen;day++){
+					days.push(this.formatNum(day));
+				}
+				return{
+					months,
+					days,
+					sections
+				}
+			},
+			getData(dVal){
+				//用来处理初始化数据
+				let curFlag=this.current;
+				let disabledAfter=this.disabledAfter;
+				let dates=[],hours=[],minutes=[];
+				let curDate=new Date();
+				let curYear=curDate.getFullYear();
+				let curMonth=curDate.getMonth();
+				let curDay=curDate.getDate();
+				let aDate=new Date(curYear,curMonth,curDay);
+				for(let i=0;i<this.expand*1;i++){
+					aDate=new Date(curYear,curMonth,curDay+i);
+					let year=aDate.getFullYear();
+					let month=aDate.getMonth()+1;
+					let day=aDate.getDate();
+					let label=year+"-"+this.formatNum(month)+"-"+this.formatNum(day);
+					switch(i){
+						case 0:
+							label="今天";
+							break;
+						case 1:
+							label="明天";
+							break;
+						case 2:
+							label="后天";
+							break
+					}
+					dates.push({
+						label:label,
+						value:year+"-"+this.formatNum(month)+"-"+this.formatNum(day)
+					})
+				};
+				for(let i=0;i<24;i++){
+					hours.push({
+						label:this.formatNum(i),
+						value:this.formatNum(i)
+					})
+				}
+				for(let i=0;i<60;i++){
+					minutes.push({
+						label:this.formatNum(i),
+						value:this.formatNum(i)
+					})
+				}
+				return {
+					dates,
+					hours,
+					minutes
+				}
+			},
+			getDefaultDate(){
+				let value=this.value;
+				let reg=/-/g;
+				let defaultDate=value?new Date(value.replace(reg,"/")):new Date();
+				let defaultYear=defaultDate.getFullYear();
+				let defaultMonth=defaultDate.getMonth()+1;
+				let defaultDay=defaultDate.getDate();
+				let defaultDays=new Date(defaultYear,defaultMonth,0).getDate()*1;
+				return{
+					defaultDate,
+					defaultYear,
+					defaultMonth,
+					defaultDay,
+					defaultDays
+				}
+			},
+			getDval(){
+				let value=this.value;
+				let dVal=null;
+				let aDate=new Date();
+				let year=this.formatNum(aDate.getFullYear());
+				let month=this.formatNum(aDate.getMonth()+1);
+				let day=this.formatNum(aDate.getDate());
+				let date=this.formatNum(year)+"-"+this.formatNum(month)+"-"+this.formatNum(day);
+				let hour=aDate.getHours();
+				let minute=aDate.getMinutes();
+				if(value){
+					let flag=this.checkValue(value);
+					if(!flag){
+						dVal=[date,hour,minute]
+					}else{
+						let v=value.split(" ");
+						dVal=[v[0],...v[1].split(":")];
+					}
+				}else{
+					dVal=[date,hour,minute]
+				}
+				return dVal;
+			},
+			initData(){
+				let startDate,endDate,startYear,endYear,startMonth,endMonth,startDay,endDay;
+				let dates=[],hours=[],minutes=[];
+				let dVal=[],pickVal=[];
+				let value=this.value;
+				let reg=/-/g;
+				let range={};
+				let result="",full="",date,hour,minute,obj={};
+				let defaultDate=this.getDefaultDate();
+				let defaultYear=defaultDate.defaultYear;
+				let defaultMonth=defaultDate.defaultMonth;
+				let defaultDay=defaultDate.defaultDay;
+				let defaultDays=defaultDate.defaultDays;
+				let curFlag=this.current;
+				let disabledAfter=this.disabledAfter;
+				let dateData=[];
+				dVal=this.getDval();
+				dateData=this.getData(dVal);
+				dates=dateData.dates;
+				hours=dateData.hours;
+				minutes=dateData.minutes;
+				pickVal=[
+					dates.findIndex(n => n.value == dVal[0])!=-1?dates.findIndex(n => n.value == dVal[0]):0,
+					hours.findIndex(n => n.value == dVal[1])!=-1?hours.findIndex(n => n.value == dVal[1]):0,
+					minutes.findIndex(n => n.value == dVal[2])!=-1?minutes.findIndex(n => n.value == dVal[2]):0,
+				];
+				range={dates,hours,minutes};
+				date=dVal[0]?dVal[0]:dates[0].label;
+				hour=dVal[1]?dVal[1]:hours[0].label;
+				minute=dVal[2]?dVal[2]:minutes[0].label;
+				result=full=`${date+' '+hour+':'+minute}`;
+				obj={
+					date,
+					hour,
+					minute
+				}
+				this.range=range;
+				this.checkObj=obj;
+				this.$nextTick(()=>{
+					this.pickVal=pickVal;
+				});
+				this.$emit("change",{
+					result:result,
+					value:full,
+					obj:obj
+				})
+			},
+			handlerChange(e){
+				let arr=[...e.detail.value];
+				let data=this.range;
+				let date="",hour="",minute="";
+				let result="",full="",obj={};
+				let disabledAfter=this.disabledAfter;
+				date=(arr[0]||arr[0]==0)?data.dates[arr[0]]||data.dates[data.dates.length-1]:"";
+				hour=(arr[1]||arr[1]==0)?data.hours[arr[1]]||data.hours[data.hours.length-1]:"";
+				minute=(arr[2]||arr[2]==0)?data.minutes[arr[2]]||data.minutes[data.minutes.length-1]:"";
+				result=full=`${date.label+' '+hour.label+':'+minute.label+':00'}`;
+				obj={
+					date,
+					hour,
+					minute
+				}
+				this.checkObj=obj;
+				this.$emit("change",{
+					result:result,
+					value:full,
+					obj:obj
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "./w-picker.css";
+</style>
diff --git a/components/w-picker/time-picker.vue b/components/w-picker/time-picker.vue
new file mode 100644
index 0000000..b00b0ab
--- /dev/null
+++ b/components/w-picker/time-picker.vue
@@ -0,0 +1,218 @@
+<template>
+	<view class="w-picker-view">
+		<picker-view class="d-picker-view" :indicator-style="itemHeight" :value="pickVal" @change="handlerChange">
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.hours" :key="index">{{item}}时</view>
+			</picker-view-column>
+			<picker-view-column>
+				<view class="w-picker-item" v-for="(item,index) in range.minutes" :key="index">{{item}}分</view>
+			</picker-view-column>
+			<picker-view-column v-if="second">
+				<view class="w-picker-item" v-for="(item,index) in range.seconds" :key="index">{{item}}秒</view>
+			</picker-view-column>
+		</picker-view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				pickVal:[],
+				range:{},
+				checkObj:{}
+			};
+		},
+		props:{
+			itemHeight:{
+				type:String,
+				default:"44px"
+			},
+			value:{
+				type:[String,Array,Number],
+				default:""
+			},
+			current:{//是否默认选中当前日期
+				type:Boolean,
+				default:false
+			},
+			second:{
+				type:Boolean,
+				default:true
+			}
+		},
+		watch:{
+			value(val){
+				this.initData();
+			}
+		},
+		created() {
+			this.initData();
+		},
+		methods:{
+			formatNum(n){
+				return (Number(n)<10?'0'+Number(n):Number(n)+'');
+			},
+			checkValue(value){
+				let strReg=/^\d{2}:\d{2}:\d{2}$/,example="18:00:05";
+				if(!strReg.test(value)){
+					console.log(new Error("请传入与mode、fields匹配的value值，例value="+example+""))
+				}
+				return strReg.test(value);
+			},
+			resetData(year,month,day,hour,minute){
+				let curDate=this.getCurrenDate();
+				let curFlag=this.current;
+				let curHour=curDate.curHour;
+				let curMinute=curDate.curMinute;
+				let curSecond=curDate.curSecond;
+				for(let hour=0;hour<24;hour++){
+					hours.push(this.formatNum(hour));
+				}
+				for(let minute=0;minute<60;minute++){
+					minutes.push(this.formatNum(minute));
+				}
+				for(let second=0;second<60;second++){
+					seconds.push(this.formatNum(second));
+				}
+				return{
+					hours,
+					minutes,
+					seconds
+				}
+			},
+			getData(curDate){
+				//用来处理初始化数据
+				let hours=[],minutes=[],seconds=[];
+				let curFlag=this.current;
+				let disabledAfter=this.disabledAfter;
+				let fields=this.fields;
+				let curHour=curDate.curHour;
+				let curMinute=curDate.curMinute;
+				let curSecond=curDate.curSecond;
+				for(let hour=0;hour<24;hour++){
+					hours.push(this.formatNum(hour));
+				}
+				for(let minute=0;minute<60;minute++){
+					minutes.push(this.formatNum(minute));
+				}
+				for(let second=0;second<60;second++){
+					seconds.push(this.formatNum(second));
+				}
+				return this.second?{
+					hours,
+					minutes,
+					seconds
+				}:{
+					hours,
+					minutes
+				}
+			},
+			getCurrenDate(){
+				let curDate=new Date();
+				let curHour=curDate.getHours();
+				let curMinute=curDate.getMinutes();
+				let curSecond=curDate.getSeconds();
+				return this.second?{
+					curHour,
+					curMinute,
+					curSecond
+				}:{
+					curHour,
+					curMinute,
+				}
+			},
+			getDval(){
+				let value=this.value;
+				let fields=this.fields;
+				let dVal=null;
+				let aDate=new Date();
+				let hour=this.formatNum(aDate.getHours());
+				let minute=this.formatNum(aDate.getMinutes());
+				let second=this.formatNum(aDate.getSeconds());
+				if(value){
+					let flag=this.checkValue(value);
+					if(!flag){
+						dVal=[hour,minute,second]
+					}else{
+						dVal=value?value.split(":"):[];
+					}
+				}else{
+					dVal=this.second?[hour,minute,second]:[hour,minute]
+				}
+				return dVal;
+			},
+			initData(){
+				let curDate=this.getCurrenDate();
+				let dateData=this.getData(curDate);
+				let pickVal=[],obj={},full="",result="",hour="",minute="",second="";
+				let dVal=this.getDval();
+				let curFlag=this.current;
+				let disabledAfter=this.disabledAfter;
+				let hours=dateData.hours;
+				let minutes=dateData.minutes;
+				let seconds=dateData.seconds;
+				let defaultArr=this.second?[
+					dVal[0]&&hours.indexOf(dVal[0])!=-1?hours.indexOf(dVal[0]):0,
+					dVal[1]&&minutes.indexOf(dVal[1])!=-1?minutes.indexOf(dVal[1]):0,
+					dVal[2]&&seconds.indexOf(dVal[2])!=-1?seconds.indexOf(dVal[2]):0
+				]:[
+					dVal[0]&&hours.indexOf(dVal[0])!=-1?hours.indexOf(dVal[0]):0,
+					dVal[1]&&minutes.indexOf(dVal[1])!=-1?minutes.indexOf(dVal[1]):0
+				];
+				pickVal=disabledAfter?defaultArr:(curFlag?(this.second?[
+					hours.indexOf(this.formatNum(curDate.curHour)),
+					minutes.indexOf(this.formatNum(curDate.curMinute)),
+					seconds.indexOf(this.formatNum(curDate.curSecond)),
+				]:[
+					hours.indexOf(this.formatNum(curDate.curHour)),
+					minutes.indexOf(this.formatNum(curDate.curMinute))
+				]):defaultArr);
+				this.range=dateData;
+				this.checkObj=obj;
+				hour=dVal[0]?dVal[0]:hours[0];
+				minute=dVal[1]?dVal[1]:minutes[0];
+				if(this.second)second=dVal[2]?dVal[0]:seconds[0];
+				result=this.second?`${hour+':'+minute+':'+second}`:`${hour+':'+minute}`;
+				full=this.second?`${hour+':'+minute+':'+second}`:`${hour+':'+minute+':00'}`;
+				this.$nextTick(()=>{
+					this.pickVal=pickVal;
+				});
+				this.$emit("change",{
+					result:result,
+					value:full,
+					obj:obj
+				})
+			},
+			handlerChange(e){
+				let arr=[...e.detail.value];
+				let data=this.range;
+				let hour="",minute="",second="",result="",full="",obj={};
+				hour=(arr[0]||arr[0]==0)?data.hours[arr[0]]||data.hours[data.hours.length-1]:"";
+				minute=(arr[1]||arr[1]==0)?data.minutes[arr[1]]||data.minutes[data.minutes.length-1]:"";
+				if(this.second)second=(arr[2]||arr[2]==0)?data.seconds[arr[2]]||data.seconds[data.seconds.length-1]:"";
+				obj=this.second?{
+					hour,
+					minute,
+					second
+				}:{
+					hour,
+					minute
+				};
+				this.checkObj=obj;
+				result=this.second?`${hour+':'+minute+':'+second}`:`${hour+':'+minute}`;
+				full=this.second?`${hour+':'+minute+':'+second}`:`${hour+':'+minute+':00'}`;
+				this.$emit("change",{
+					result:result,
+					value:full,
+					obj:obj
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	@import "./w-picker.css";	
+</style>
+
diff --git a/components/w-picker/w-picker.css b/components/w-picker/w-picker.css
new file mode 100644
index 0000000..fb42e78
--- /dev/null
+++ b/components/w-picker/w-picker.css
@@ -0,0 +1,26 @@
+.w-picker-flex2{
+	flex:2;
+}
+.w-picker-flex1{
+	flex:1;
+}
+.w-picker-view {
+	width: 100%;
+	height: 476upx;
+	overflow: hidden;
+	background-color: rgba(255, 255, 255, 1);
+	z-index: 666;
+}
+.d-picker-view{
+	height: 100%;
+}
+
+.w-picker-item {
+  text-align: center;
+  width: 100%;
+  height: 88upx;
+  line-height: 88upx;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+  font-size: 30upx;
+}
\ No newline at end of file
diff --git a/components/w-picker/w-picker.vue b/components/w-picker/w-picker.vue
new file mode 100644
index 0000000..d8f7d76
--- /dev/null
+++ b/components/w-picker/w-picker.vue
@@ -0,0 +1,340 @@
+<template name="w-picker">
+	<view class="w-picker" :key="createKey" :data-key="createKey">
+		<view class="mask" :class="{'visible':visible}" @tap="onCancel" @touchmove.stop.prevent catchtouchmove="true"></view>
+		<view class="w-picker-cnt" :class="{'visible':visible}">
+			<view class="w-picker-header"  @touchmove.stop.prevent catchtouchmove="true">
+				<text @tap.stop.prevent="onCancel">取消</text>
+				<slot></slot>
+				<text :style="{'color':themeColor}" @tap.stop.prevent="pickerConfirm">确定</text>
+			</view>
+			<date-picker 
+				v-if="mode=='date'" 
+				class="w-picker-wrapper"
+				:startYear="startYear"
+				:endYear="endYear"
+				:value="value"
+				:fields="fields"
+				:item-height="itemHeight"
+				:current="current"
+				:disabled-after="disabledAfter"
+				@change="handlerChange"
+				@touchstart="touchStart" 
+				@touchend="touchEnd">
+			</date-picker>
+			
+			<range-picker
+				v-if="mode=='range'" 
+				class="w-picker-wrapper"
+				:startYear="startYear"
+				:endYear="endYear"
+				:value="value"
+				:item-height="itemHeight"
+				:current="current"
+				@change="handlerChange"
+				@touchstart="touchStart" 
+				@touchend="touchEnd">
+			</range-picker>
+			
+			<half-picker
+				v-if="mode=='half'" 
+				class="w-picker-wrapper"
+				:startYear="startYear"
+				:endYear="endYear"
+				:value="value"
+				:item-height="itemHeight"
+				:current="current"
+				:disabled-after="disabledAfter"
+				@change="handlerChange"
+				@touchstart="touchStart" 
+				@touchend="touchEnd">
+			</half-picker>
+			
+			<shortterm-picker
+				v-if="mode=='shortTerm'" 
+				class="w-picker-wrapper"
+				:startYear="startYear"
+				:endYear="endYear"
+				:value="value"
+				:item-height="itemHeight"
+				:current="current"
+				expand="60"
+				:disabled-after="disabledAfter"
+				@change="handlerChange"
+				@touchstart="touchStart" 
+				@touchend="touchEnd">
+			</shortterm-picker>
+			
+			<time-picker
+				v-if="mode=='time'"
+				class="w-picker-wrapper"
+				:value="value"
+				:item-height="itemHeight"
+				:current="current"
+				:disabled-after="disabledAfter"
+				:second="second"
+				@change="handlerChange"
+				@touchstart="touchStart" 
+				@touchend="touchEnd">
+			</time-picker>
+			
+			<selector-picker
+				v-if="mode=='selector'"
+				class="w-picker-wrapper"
+				:value="value"
+				:item-height="itemHeight"
+				:options="options"
+				:default-type="defaultType"
+				:default-props="defaultProps"
+				@change="handlerChange"
+				@touchstart="touchStart" 
+				@touchend="touchEnd">
+			</selector-picker>
+			
+			<region-picker
+				v-if="mode=='region'"
+				class="w-picker-wrapper"
+				:value="value"
+				:hide-area="hideArea"
+				:default-type="defaultType"
+				:item-height="itemHeight"
+				@change="handlerChange"
+				@touchstart="touchStart" 
+				@touchend="touchEnd">
+			</region-picker>
+			
+			<linkage-picker
+				v-if="mode=='linkage'"
+				class="w-picker-wrapper"
+				:value="value"
+				:options="options"
+				:level="level"
+				:default-type="defaultType"
+				:default-props="defaultProps"
+				:item-height="itemHeight"
+				@change="handlerChange"
+				@touchstart="touchStart" 
+				@touchend="touchEnd">
+			</linkage-picker>
+		</view>
+	</view>
+</template>
+
+<script>
+	import datePicker from "./date-picker.vue"
+	import rangePicker from "./range-picker.vue"
+	import halfPicker from "./half-picker.vue"
+	import shorttermPicker from "./shortterm-picker.vue"
+	import timePicker from "./time-picker.vue"
+	import selectorPicker from "./selector-picker.vue"
+	import regionPicker from "./region-picker.vue"
+	import linkagePicker from "./linkage-picker.vue"
+	export default {
+		name:"w-picker",
+		components:{
+			datePicker,
+			rangePicker,
+			halfPicker,
+			timePicker,
+			selectorPicker,
+			shorttermPicker,
+			regionPicker,
+			linkagePicker
+		},
+		props:{
+			mode:{
+				type:String,
+				default:"date"
+			},
+			value:{//默认值
+				type:[String,Array,Number],
+				default:""
+			},
+			current:{//是否默认显示当前时间，如果是，传的默认值将失效
+				type:Boolean,
+				default:false
+			},
+			themeColor:{//确认按钮主题颜色
+				type:String,
+				default:"#f5a200"
+			},
+			fields:{//日期颗粒度:year、month、day、hour、minute、second
+				type:String,
+				default:"date"
+			},
+			disabledAfter:{//是否禁用当前之后的日期
+				type:Boolean,
+				default:false
+			},
+			second:{//time-picker是否显示秒
+				type:Boolean,
+				default:true
+			},
+			options:{//selector,region数据源
+				type:[Array,Object],
+				default(){
+					return []
+				}
+			},
+			defaultProps:{//selector,linkagle字段转换配置
+				type:Object,
+				default(){
+					return{
+						label:"label",
+						value:"value",
+						children:"children"
+					}
+				}
+			},
+			defaultType:{
+				type:String,
+				default:"label"
+			},
+			hideArea:{//mode=region时，是否隐藏区县列
+				type:Boolean,
+				default:false
+			},
+			level:{
+				//多级联动层级，表示几级联动,区间2-4;
+				type:[Number,String],
+				default:2
+			},
+			timeout:{//是否开启点击延迟,当快速滚动 还没有滚动完毕点击关闭时得到的值是不准确的
+				type:Boolean,
+				default:false
+			},
+			expand:{//mode=shortterm 默认往后拓展天数
+				type:[Number,String],
+				default:30
+			},
+			startYear:{
+				type:[String,Number],
+				default:1970
+			},
+			endYear:{
+				type:[String,Number],
+				default:new Date().getFullYear()
+			},
+			visible:{
+				type:Boolean,
+				default:false
+			}
+		},
+		created() {
+			this.createKey=Math.random()*1000;
+		},
+		data() {
+			return {
+				itemHeight:`height: ${uni.upx2px(88)}px;`,
+				result:{},
+				confirmFlag:true
+			};
+		},
+		methods:{
+			touchStart(){
+				if(this.timeout){
+					this.confirmFlag=false;
+				}
+			},
+			touchEnd(){
+				if(this.timeout){
+					setTimeout(()=>{
+						this.confirmFlag=true;
+					},500)
+				}
+			},
+			handlerChange(res){
+				let _this=this;
+				this.result={...res};
+			},
+			show(){
+				this.$emit("update:visible",true);
+			},
+			hide(){
+				this.$emit("update:visible",false);
+			},
+			onCancel(res){
+				this.$emit("update:visible",false);
+				this.$emit("cancel");
+			},
+			pickerConfirm(){
+				if(!this.confirmFlag){
+					return;
+				};
+				this.$emit("confirm",this.result);
+				this.$emit("update:visible",false);
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.w-picker-item {
+	  text-align: center;
+	  width: 100%;
+	  height: 88upx;
+	  line-height: 88upx;
+	  text-overflow: ellipsis;
+	  white-space: nowrap;
+	  font-size: 30upx;
+	}
+	.w-picker{
+		z-index: 888;
+		.mask {
+		  position: fixed;
+		  z-index: 1000;
+		  top: 0;
+		  right: 0;
+		  left: 0;
+		  bottom: 0;
+		  background: rgba(0, 0, 0, 0.6);
+		  visibility: hidden;
+		  opacity: 0;
+		  transition: all 0.3s ease;
+		}
+		.mask.visible{
+			visibility: visible;
+			opacity: 1;
+		}
+		.w-picker-cnt {
+		  position: fixed;
+		  bottom: 0;
+		  left: 0;
+		  width: 100%;
+		  transition: all 0.3s ease;
+		  transform: translateY(100%);
+		  z-index: 3000;
+		  background-color: #fff;
+		}
+		.w-picker-cnt.visible {
+		  transform: translateY(0);
+		}
+		.w-picker-header{
+		  display: flex;
+		  align-items: center;
+		  padding: 0 30upx;
+		  height: 88upx;
+		  background-color: #fff;
+		  position: relative;
+		  text-align: center;
+		  font-size: 32upx;
+		  justify-content: space-between;
+		  border-bottom: solid 1px #eee;
+		  .w-picker-btn{
+		  	font-size: 30upx;
+		  }
+		}
+		
+		.w-picker-hd:after {
+		  content: ' ';
+		  position: absolute;
+		  left: 0;
+		  bottom: 0;
+		  right: 0;
+		  height: 1px;
+		  border-bottom: 1px solid #e5e5e5;
+		  color: #e5e5e5;
+		  transform-origin: 0 100%;
+		  transform: scaleY(0.5);
+		}
+	}
+</style>
diff --git a/components/wfalls-flow.vue b/components/wfalls-flow.vue
new file mode 100644
index 0000000..e30ab36
--- /dev/null
+++ b/components/wfalls-flow.vue
@@ -0,0 +1,183 @@
+<template>
+	<view class="wf-list-container">
+		<view id="wf-list" class="wf-list" v-for="(list,listIndex) of viewList" :key="listIndex">
+			<view @tap="goDetail(listIndex,index)" :data-id="item.id" class="wf-item-child rel"
+				v-for="(item,index) of list.list" :key="index">
+				<view class="examin-btn flex-center f-icontext c-base radius abs"
+					:style="{background:item.status==1?'#FC8218':'#FF6262'}" v-if="path==2&& item.status!=2">
+					{{item.status==1?'审核中':'已驳回'}}
+				</view>
+				<image mode="widthFix" class="cover" :id="'id'+item.id" @load="handleViewRender"
+					@error="handleViewRender" :src="item.cover"></image>
+				<view class="play-video-info flex-center c-base abs" v-if="item.type == 2">
+					<view class="play-video flex-center c-base radius">
+						<i class="iconfont icon-play-video"></i>
+					</view>
+				</view>
+				<view class="wf-item">
+					<view class="f-desc c-black text-bold">{{item.title}}</view>
+					<view class="flex-between mt-sm">
+						<view class="flex-center">
+							<image mode="aspectFill" class="avatar" :src="item.work_img"></image>
+							<view class="coach f-caption c-desc ellipsis">{{item.coach_name}}</view>
+						</view>
+						<view class="flex-y-baseline f-caption c-desc"> <i class="iconfont iconjuli"
+								:style="{color:primaryColor}"></i>
+							{{item.distance}}
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions
+	} from 'vuex';
+	export default {
+		props: {
+			list: {
+				type: Array, //实际请求获取的列表数据
+			},
+			path: {
+				type: String || Number, //跳转页面类型  1用户端；2技-师端
+			}
+		},
+		data() {
+			return {
+				viewList: [{
+					list: []
+				}, {
+					list: []
+				}],
+				//展示到视图的列表数据
+				everyNum: 2
+			}
+		},
+		mounted() {
+			if (this.list.length) {
+				this.init()
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			have: state => state.config.configInfo.subColor,
+		}),
+		methods: {
+			...mapActions(),
+			init() {
+				this.viewList = [{
+					list: []
+				}, {
+					list: []
+				}];
+				setTimeout(() => {
+					this.handleViewRender(0, 0)
+				}, 600)
+			},
+			handleViewRender(x, y) {
+				const index = this.viewList.reduce((total, current) => total + current.list.length, 0)
+				if (index > this.list.length - 1) {
+					// 加载完成触发事件并返回加载过的图片数
+					this.$emit('finishLoad', index)
+					return
+				};
+				const query = uni.createSelectorQuery().in(this);
+				let listFlag = 0;
+				query.selectAll('#wf-list').boundingClientRect(data => {
+					listFlag = data[0].bottom - data[1].bottom <= 0 ? 0 : 1;
+					this.viewList[listFlag].list.push(this.list[index])
+				}).exec()
+			},
+			async goDetail(a, b) {
+				let {
+					id
+				} = this.viewList[a].list[b]
+				let {
+					path
+				} = this
+				let page_url = path == 1 ? `` : `technician/`
+				let url = `/dynamic/pages/${page_url}detail?id=${id}`
+				this.$util.goUrl({
+					url,
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.wf-list-container {
+		display: flex;
+		justify-content: space-between;
+		align-items: flex-start;
+		padding: 0 20rpx;
+	}
+
+	.wf-list {
+		width: calc(50% - 10rpx);
+		display: flex;
+		flex-direction: column;
+	}
+
+	.wf-item-child {
+		background: white;
+		margin-bottom: 20rpx;
+		border-radius: 16rpx;
+		overflow: hidden;
+
+		.examin-btn {
+			top: 20rpx;
+			left: 15rpx;
+			width: 89rpx;
+			height: 37rpx;
+			z-index: 1;
+		}
+
+		.play-video-info {
+			top: 0rpx;
+			width: 100%;
+			height: calc(100% - 128rpx);
+			z-index: 9;
+
+			.play-video {
+				width: 66rpx;
+				height: 66rpx;
+				background: rgba(2, 2, 2, 0.5);
+
+				.iconfont {
+					font-size: 28rpx;
+				}
+			}
+		}
+	}
+
+
+	.cover {
+		width: 100%;
+		height: 100rpx;
+	}
+
+	.wf-item {
+		padding: 20rpx;
+
+		.avatar {
+			width: 40rpx;
+			height: 40rpx;
+			border-radius: 40rpx;
+			margin-right: 6rpx;
+		}
+
+		.coach {
+			max-width: 100rpx;
+		}
+
+		.iconfont {
+			font-size: 24rpx;
+		}
+	}
+</style>
diff --git a/components/xt-verify-code.vue b/components/xt-verify-code.vue
new file mode 100644
index 0000000..8ca8948
--- /dev/null
+++ b/components/xt-verify-code.vue
@@ -0,0 +1,280 @@
+<template>
+	<view class="xt__verify-code">
+		<!-- 输入框 -->
+		<input id="xt__input" :value="code" class="xt__input" :focus="isFocus" :password="isPassword" :type="inputType"
+			:maxlength="itemSize" @input="input" @focus="inputFocus" @blur="inputBlur" />
+
+		<!-- 光标 -->
+		<view id="xt__cursor" v-if="cursorVisible && type !== 'middle'" class="xt__cursor"
+			:style="{ left: codeCursorLeft[code.length] + 'px', height: cursorHeight + 'px', backgroundColor: cursorColor }">
+		</view>
+
+		<!-- 输入框 - 组 -->
+		<view id="xt__input-ground" class="xt__input-ground">
+			<template v-for="(item, index) in itemSize">
+				<view :key="index"
+					:style="{ borderColor: code.length === index && cursorVisible ? boxActiveColor : boxNormalColor }"
+					:class="['xt__box', `xt__box-${type + ''}`, `xt__box::after`]">
+					<view :style="{ borderColor: boxActiveColor }" class="xt__middle-line"
+						v-if="type === 'middle' && !code[index]"></view>
+					<text class="xt__code-text">{{ code[index] | codeFormat(isPassword) }}</text>
+				</view>
+			</template>
+		</view>
+	</view>
+</template>
+<script>
+	/**
+	 * @description 输入验证码组件
+	 * @property {string} type = [box|middle|bottom] - 显示类型 默认：box -eg:bottom
+	 * @property {string} inputType = [text|number] - 输入框类型 默认：number -eg:number
+	 * @property {number} size = [1|2|3|4|5|6] - 支持的验证码数量 默认：6 -eg:6
+	 * @property {boolean} isFocus - 是否立即聚焦 默认：true
+	 * @property {boolean} isPassword - 是否以密码形式显示 默认false -eg:false
+	 * @property {string} cursorColor - 光标颜色 默认：#cccccc
+	 * @property {string} boxNormalColor - 光标未聚焦到的框的颜色 默认：#f7f7f7
+	 * @property {string} boxActiveColor - 光标聚焦到的框的颜色 默认：#009254
+	 * @event {Function(data)} confirm - 输入完成
+	 */
+	export default {
+		name: 'xt-verify-code',
+		props: {
+			value: {
+				type: String,
+				default: () => ''
+			},
+			type: {
+				type: String,
+				default: () => 'box'
+			},
+			inputType: {
+				type: String,
+				default: () => 'number'
+			},
+			size: {
+				type: Number,
+				default: () => 6
+			},
+			isFocus: {
+				type: Boolean,
+				default: () => true
+			},
+			isPassword: {
+				type: Boolean,
+				default: () => false
+			},
+			cursorColor: {
+				type: String,
+				default: () => '#cccccc'
+			},
+			boxNormalColor: {
+				type: String,
+				default: () => '#f7f7f7'
+			},
+			boxActiveColor: {
+				type: String,
+				default: () => '#009254'
+			}
+		},
+		model: {
+			prop: 'value',
+			event: 'input'
+		},
+		data() {
+			return {
+				cursorVisible: false,
+				cursorHeight: 35,
+				code: '', // 输入的验证码
+				codeCursorLeft: [], // 向左移动的距离数组,
+				itemSize: 6
+			};
+		},
+		created() {
+			this.cursorVisible = this.isFocus;
+			this.validatorSize();
+		},
+		mounted() {
+			this.init();
+		},
+		methods: {
+			/**
+			 *
+			 */
+			validatorSize() {
+				if (this.size <= 6 && this.size > 0) {
+					this.itemSize = Math.floor(this.size);
+				} else {
+					this.itemSize = 6;
+				}
+			},
+			/**
+			 * @description 初始化
+			 */
+			init() {
+				this.getCodeCursorLeft();
+				this.setCursorHeight();
+			},
+			/**
+			 * @description 获取元素节点
+			 * @param {string} elm - 节点的id、class 相当于 document.querySelect的参数 -eg: #id
+			 * @param {string} type = [single|array] - 单个元素获取多个元素 默认是单个元素
+			 * @param {Function} callback - 回调函数
+			 */
+			getElement(elm, type = 'single', callback) {
+				uni
+					.createSelectorQuery()
+					.in(this)[type === 'array' ? 'selectAll' : 'select'](elm)
+					.boundingClientRect()
+					.exec(data => {
+						callback(data[0]);
+					});
+			},
+			/**
+			 * @description 计算光标的高度
+			 */
+			setCursorHeight() {
+				this.getElement('.xt__box', 'single', boxElm => {
+					this.cursorHeight = boxElm.height * 0.6;
+				});
+			},
+			/**
+			 * @description 获取光标在每一个box的left位置
+			 */
+			getCodeCursorLeft() {
+				// 获取父级框的位置信息
+				this.getElement('#xt__input-ground', 'single', parentElm => {
+					const parentLeft = parentElm.left;
+					// 获取各个box信息
+					this.getElement('.xt__box', 'array', elms => {
+						this.codeCursorLeft = [];
+						elms.forEach(elm => {
+							this.codeCursorLeft.push(elm.left - parentLeft + elm.width / 2);
+						});
+					});
+				});
+			},
+			// 输入框输入变化的回调
+			input(e) {
+				const value = e.detail.value;
+				this.cursorVisible = value.length !== this.itemSize;
+				this.$emit('input', value);
+				this.inputSuccess(value);
+			},
+			// 输入完成回调
+			inputSuccess(value) {
+				if (value.length === this.itemSize) {
+					this.$emit('confirm', value);
+				}
+			},
+			// 输入聚焦
+			inputFocus() {
+				this.cursorVisible = this.code.length !== this.itemSize;
+			},
+			// 输入失去焦点
+			inputBlur() {
+				this.cursorVisible = false;
+			}
+		},
+		watch: {
+			value(val) {
+				this.code = val;
+			}
+		},
+		filters: {
+			codeFormat(val, isPassword) {
+				let value = '';
+				if (val) {
+					value = isPassword ? '*' : val;
+				}
+				return value;
+			}
+		}
+	};
+</script>
+<style lang="scss" scoped>
+	.xt__verify-code {
+		position: relative;
+		width: 100%;
+		box-sizing: border-box;
+
+		.xt__input {
+			height: 100%;
+			width: 200%;
+			position: absolute;
+			left: -100%;
+			z-index: 1;
+		}
+
+		.xt__cursor {
+			position: absolute;
+			top: 50%;
+			transform: translateY(-50%);
+			display: inline-block;
+			width: 2px;
+			animation-name: cursor;
+			animation-duration: 0.8s;
+			animation-iteration-count: infinite;
+		}
+
+		.xt__input-ground {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+			width: 100%;
+			box-sizing: border-box;
+
+			.xt__box {
+				position: relative;
+				display: inline-block;
+				width: 88rpx;
+				height: 100rpx;
+				background: #F7F7F7;
+				border-radius: 12rpx;
+				margin-left: 20rpx;
+
+				&-bottom {
+					border-bottom: 1rpx solid #009254;
+				}
+
+				&-box {
+					border: 1rpx solid #009254;
+				}
+
+				&-middle {
+					border: none;
+				}
+
+				.xt__middle-line {
+					position: absolute;
+					top: 50%;
+					left: 50%;
+					width: 50%;
+					transform: translate(-50%, -50%);
+					border-bottom-width: 2px;
+					border-bottom-style: solid;
+				}
+
+				.xt__code-text {
+					position: absolute;
+					top: 50%;
+					left: 50%;
+					font-size: 58rpx;
+					transform: translate(-50%, -50%);
+				}
+			}
+			.xt__box:nth-child(1){
+				margin-left: 0;
+			}
+		}
+	}
+
+	@keyframes cursor {
+		0% {
+			opacity: 1;
+		}
+
+		100% {
+			opacity: 0;
+		}
+	}
+</style>
diff --git a/dynamic/pages/detail.vue b/dynamic/pages/detail.vue
new file mode 100644
index 0000000..1c588b5
--- /dev/null
+++ b/dynamic/pages/detail.vue
@@ -0,0 +1,1384 @@
+<template>
+	<view class="dynamic-detail rel" v-if="detail.id">
+		<block v-if="detail.status == 2 && detail.coach_info.status === 2">
+			<!-- #ifdef H5 -->
+			<view @tap="$util.goUrl({url:`/pages/service`})" class="abs"
+				:class="[{'back-user-ios': configInfo.isIos},{'back-user-android': !configInfo.isIos}]"
+				style="margin-top:25rpx;z-index: 999;" v-if="options.pid">
+				<view class="iconshouye iconfont"></view>
+				<view class="back-user_text">回到首页</view>
+			</view>
+			<!-- #endif -->
+			<!-- #ifndef H5 -->
+			<uni-nav-bar :fixed="true" :shadow="false" :statusBar="true"
+				:leftIcon="options.pid ? 'iconshouye11' : 'icon-left'" :title="detail.type == 1?'动态详情':' '"
+				color="#ffffff" :backgroundColor="detail.type == 1?primaryColor:'none'">
+			</uni-nav-bar>
+			<view :style="{height:`${configInfo.navBarHeight}px`}" v-if="detail.type == 1"></view>
+			<!-- #endif -->
+
+			<block v-if="detail.type == 1">
+				<view class="banner-info rel">
+					<!-- #ifdef H5 -->
+					<view @tap.stop="$refs.show_item.open()" class="menu-info flex-center c-base abs radius"
+						v-if="!detail.is_shield">
+						<i class="iconfont icon-caidan"></i>
+					</view>
+					<!-- #endif -->
+					<!-- #ifndef H5 -->
+					<view @tap.stop="$refs.show_item.open()" class="menu-info flex-center c-base abs radius">
+						<i class="iconfont icon-caidan"></i>
+					</view>
+					<!-- #endif -->
+					<banner @change="goBanner" :list="detail.imgs" :margin="0" :autoplay="true"
+						:indicatorActiveColor="primaryColor" :dotWidth="20" :dotBottom="30" :height="654"
+						v-if="detail.imgs.length > 0">
+					</banner>
+				</view>
+				<view class="pd-lg fill-base">
+					<view class="dynamic-info flex-center">
+						<image mode="aspectFill" class="avatar radius" :src="detail.coach_info.work_img"></image>
+						<view class="flex-1 ml-md">
+							<view class="flex-between">
+								<view>
+									<view class="f-mini-title c-black text-bold max-270 ellipsis">
+										{{detail.coach_info.coach_name}}
+									</view>
+									<view class="flex-y-center f-icontext c-caption mt-sm"
+										:style="{color:detail.coach_info.work_status == 4 ? '' :primaryColor}"><i
+											class="iconfont" :class="[iconType[detail.coach_info.work_status]]"
+											style="font-size: 24rpx;margin-right:5rpx"></i>{{textType[detail.coach_info.work_status]}}
+									</view>
+								</view>
+								<view class="flex-y-center f-caption">
+									<view @tap.stop="getServiceList" class="app-follow-btn flex-center radius"
+										:style="{color:primaryColor,border:`1rpx solid ${primaryColor}`}">预约</view>
+									<view @tap.stop="toChangeItem(1)" class="app-follow-btn flex-center radius ml-md"
+										:style="{background:detail.follow_status ? `linear-gradient(68deg, ${primaryColor}, ${subColor})`:'#fff',color:detail.follow_status ? '#fff' :primaryColor,border:`1rpx solid ${primaryColor}`}">
+										<i class="iconfont icon-jia-bold"
+											v-if="!detail.follow_status"></i>{{detail.follow_status?'已关注':'关注'}}
+									</view>
+								</view>
+							</view>
+						</view>
+					</view>
+					<view class="f-mini-title c-black text-bold mt-lg">{{detail.title}}</view>
+					<view class="dynamic-content f-paragraph mt-lg mb-lg">
+						<span v-if="!showText">
+							<span>{{detail.text.substring(0,42) + '...'}}</span>
+							<span @tap.stop="toShowHide('showText')" class="pl-md" :style="{color:primaryColor}"
+								v-if="detail.have_show_text">
+								展开
+								<text class="iconfont iconxia ml-sm" style="font-size: 24rpx;"></text>
+							</span>
+						</span>
+						<block v-if="showText">
+							<view>
+								<text decode="emsp" style="word-break:break-all;">{{detail.text}}</text>
+							</view>
+							<span @tap.stop="toShowHide('showText')" class="mt-sm" :style="{color:primaryColor}"
+								v-if="detail.have_show_text">
+								收起
+								<text class="iconfont iconshang ml-sm" style="font-size: 24rpx;"></text>
+							</span>
+						</block>
+					</view>
+					<view class="flex-between">
+						<view class="f-caption c-caption">{{detail.friend_time}}</view>
+						<view class="flex-y-center f-desc c-desc"> <i class="iconfont iconjuli"
+								:style="{color:primaryColor}"></i>
+							{{detail.distance}}
+						</view>
+					</view>
+				</view>
+				<view class="space-md"></view>
+				<view class="comment-list-info pl-lg pr-lg fill-base">
+					<view class="flex-y-center f-mini-title c-title text-bold b-1px-b" style="height: 95rpx;">全部评论
+					</view>
+					<view class="no-data-item flex-center mt-lg" v-if="list.data.length == 0">
+						<image mode="aspectFill" class="avatar radius"
+							src="https://lbqny.migugu.com/admin/anmo/mine/dynamic-user.png">
+						</image>
+						<view class="text flex-1 flex-y-center ml-md pl-lg f-icontext radius">评论千万条, 礼貌第一条</view>
+					</view>
+					<view @longpress="toDel(index)" class="list-item flex-warp pt-lg" v-for="(item,index) in list.data"
+						:key="index">
+						<image mode="aspectFill" class="avatar radius" :src="item.avatarUrl"></image>
+						<view class="flex-1 ml-md pb-lg" :class="[{'b-1px-b':index != list.total-1}]">
+							<view class="flex-between" style="height: 72rpx;">
+								<view class="text flex-y-center f-caption">
+									<view class="max-380 ellipsis">{{item.nickName}}</view>
+									<view class="examine-btn flex-center f-icontext ml-md radius" v-if="item.status==1">
+										审核中
+									</view>
+								</view>
+								<view class="f-icontext c-caption">{{item.friend_time}}</view>
+							</view>
+							<view class="comment f-paragraph mt-sm"> {{item.text}} </view>
+						</view>
+					</view>
+				</view>
+				<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading"
+					v-if="loading">
+				</load-more>
+				<view class="space-max-footer"></view>
+			</block>
+			<block v-if="detail.type == 2">
+				<view class="video-box rel">
+					<!-- #ifdef H5 -->
+					<view @tap.stop="$refs.show_item.open()" class="menu-info type-video flex-center c-title abs radius"
+						:style="{top:videoNavHeight}" v-if="!detail.is_shield">
+						<!-- #endif -->
+						<!-- #ifndef H5 -->
+						<view @tap.stop="$refs.show_item.open()"
+							class="menu-info type-video flex-center c-title abs radius" :style="{top:videoNavHeight}">
+							<!-- #endif -->
+							<i class="iconfont icon-caidan"></i>
+						</view>
+						<view class="video-poster rel" v-show="!isPlay && videoContexts == null">
+							<image mode="aspectFill" class="video-poster" :src="detail.cover"></image>
+							<view @tap.stop="playAndPauseVideo" class="video-poster flex-center abs">
+								<view class="play-video flex-center c-base radius">
+									<i class="iconfont icon-play-video"></i>
+								</view>
+							</view>
+						</view>
+						<!-- #ifdef APP-PLUS -->
+						<video :id="`video_${detail.id}`" class="video_item" :controls="true" :src="detail.imgs[0]"
+							@play="onPlay" @pause="onPause" @ended="onEnded" @timeupdate="onTimeUpdate"
+							@waiting="onWaiting" @progress="onProgress" @loadedmetadata="onLoadedMetaData"
+							@fullscreenchange="screenChange" v-show="isPlay">
+						</video>
+						<!-- #endif -->
+						<!-- #ifndef APP-PLUS -->
+						<video @tap.stop="playAndPauseVideo" :id="`video_${detail.id}`" class="video_item" :loop="false"
+							enable-play-gesture enable-progress-gesture :show-center-play-btn="true" :controls="false"
+							:src="detail.imgs[0]" object-fit="contain" @play="onPlay" @pause="onPause" @ended="onEnded"
+							@timeupdate="onTimeUpdate" @waiting="onWaiting" @progress="onProgress"
+							@loadedmetadata="onLoadedMetaData" v-show="isPlay">
+						</video>
+						<!-- #endif -->
+					</view>
+			</block>
+
+			<fixed position="bottom" zIndex="994">
+				<view class="bottom-info" :class="[{'b-1px-t': detail.type == 1},{'type-video': detail.type == 2}]">
+					<block v-if="detail.type == 2">
+						<view class="dynamic-info flex-center pd-lg">
+							<image mode="aspectFill" class="avatar radius" :src="detail.coach_info.work_img"></image>
+							<view class="flex-1 flex-y-center ml-sm c-base">
+								<view class="f-paragraph text-bold ellipsis"
+									:style="{maxWidth: detail.coach_info.is_work ? '270rpx' :'370rpx'}">
+									{{detail.coach_info.coach_name}}
+								</view>
+								<view class="flex-y-center f-icontext ml-sm"><i class="iconfont"
+										:class="[iconType[detail.coach_info.work_status]]"
+										style="font-size: 24rpx;margin-right:5rpx"></i>{{textType[detail.coach_info.work_status]}}
+								</view>
+								<view class="flex-y-center f-caption">
+									<view @tap.stop="getServiceList" class="app-follow-btn flex-center radius ml-sm">预约
+									</view>
+									<view @tap.stop="toChangeItem(1)" class="app-follow-btn flex-center radius ml-sm"
+										:style="{background:detail.follow_status ? primaryColor:'',border: detail.follow_status ? `1rpx solid ${primaryColor}`:``}">
+										<i class="iconfont icon-jia-bold"
+											v-if="!detail.follow_status"></i>{{detail.follow_status?'已关注':'关注'}}
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="pl-lg pr-lg c-base">
+							<view class="f-mini-title text-bold pb-lg">{{detail.title}}</view>
+							<view class="dynamic-content f-paragraph pb-lg">
+								<span v-if="!showText">
+									<span class="c-base">{{detail.text.substring(0,42) + '...'}}</span>
+									<span @tap.stop="toShowHide('showText')" class="pl-md" :style="{color:primaryColor}"
+										v-if="detail.have_show_text">
+										展开
+										<text class="iconfont iconxia ml-sm" style="font-size: 24rpx;"></text>
+									</span>
+								</span>
+								<block v-if="showText">
+									<view>
+										<text decode="emsp" class="c-base"
+											style="word-break:break-all;">{{detail.text}}</text>
+									</view>
+									<span @tap.stop="toShowHide('showText')" class="mt-sm" :style="{color:primaryColor}"
+										v-if="detail.have_show_text">
+										收起
+										<text class="iconfont iconshang ml-sm" style="font-size: 24rpx;"></text>
+									</span>
+								</block>
+							</view>
+							<view class="flex-between pb-lg">
+								<view class="f-caption">{{detail.friend_time}}</view>
+								<view class="flex-y-center f-desc"> <i class="iconfont iconjuli"></i>
+									{{detail.distance}}
+								</view>
+							</view>
+						</view>
+					</block>
+					<view class="comment-thumbs-info flex-between f-caption pl-lg pr-lg"
+						:class="[{'fill-black':detail.type == 2}]">
+						<view @tap.stop="toChangeItem(3)" class="input-text flex-y-center radius">
+							<i class="iconfont icon-edit ml-md mr-sm"></i>
+							<input class="input" type="text" placeholder="说点什么..." :disabled="true" />
+						</view>
+						<view class="flex-y-center">
+							<view @tap.stop="toChangeItem(2)" class="thumbs-comment-btn flex-y-center">
+								<i class="iconfont"
+									:class="[{'icon-shoucang':!detail.thumbs_status},{'icon-shoucang-fill':detail.thumbs_status}]"
+									:style="{color:detail.thumbs_status?primaryColor:''}"></i>
+								{{!detail.thumbs_num ? '点赞' : detail.thumbs_num}}
+							</view>
+							<view @tap.stop="toChangeItem(3)" class="thumbs-comment-btn flex-y-center pl-lg">
+								<i class="iconfont icon-pinglun"></i>
+								{{!detail.comment_num ? '评论' : detail.comment_num}}
+							</view>
+						</view>
+					</view>
+					<view class="space-safe" :class="[{'fill-black':detail.type == 2}]"></view>
+				</view>
+			</fixed>
+		</block>
+		<block v-else>
+			<!-- #ifndef H5 -->
+			<uni-nav-bar :fixed="true" :shadow="false" :statusBar="true"
+				:leftIcon="options.pid ? 'iconshouye11' : 'icon-left'" title="动态详情" color="#ffffff"
+				:backgroundColor="primaryColor">
+			</uni-nav-bar>
+			<view :style="{height:`${configInfo.navBarHeight}px`}"></view>
+			<!-- #endif -->
+			<view>
+				<abnor :tip="[{ text: detail.status === 1 ? '该动态正在审核中' :'该动态不存在', color: 0 }]">
+				</abnor>
+			</view>
+		</block>
+
+		<common-popup @confirm="confirmDel" ref="del_item" type="DELETE_ORDER" title="删除评论" desc="请确认是否删除评论，删除后将无法恢复"
+			:info="popupInfo"></common-popup>
+
+		<!-- 操作项 -->
+		<uni-popup ref="show_item" type="bottom">
+			<view class="show-popup pd-lg">
+				<view class="flex-center mb-lg">
+					<image mode="aspectFill" class="avatar radius" :src="detail.coach_info.work_img"></image>
+					<view class="flex-1 ml-md f-title c-black">{{detail.coach_info.coach_name}}</view>
+				</view>
+				<view @tap.stop="toChangeItem(4)" class="show-item flex-center f-paragraph text-bold mt-md radius-16"
+					v-if="!detail.is_shield">
+					不想看Ta的作品
+				</view>
+				<!-- #ifdef MP-WEIXIN -->
+				<button open-type="share" class="clear-btn show-item flex-center f-paragraph text-bold"
+					style="margin-top: 20rpx;border-radius: 16rpx;">分享该动态</button>
+				<!-- #endif -->
+				<!-- #ifdef APP-PLUS -->
+				<view @tap.stop="toAppShare" class="show-item flex-center f-paragraph text-bold mt-md radius-16">分享该动态
+				</view>
+				<!-- #endif -->
+				<view @tap.stop="$refs.show_item.close()"
+					class="show-item flex-center f-paragraph text-bold mt-md radius-16" :style="{color:primaryColor}">取消
+				</view>
+				<view class="space-safe"></view>
+			</view>
+		</uni-popup>
+
+		<!-- 查看全部评论 -->
+		<uni-popup ref="comment_item" type="bottom" :zIndex="995">
+			<view class="comment-popup fill-base rel">
+				<block v-if="detail.type == 2">
+					<i @tap.stop="$refs.comment_item.close()" class="iconfont icon-add rotate-45 abs"
+						style="z-index: 997;"></i>
+					<view class="flex-center f-mini-title c-title text-bold ml-lg mr-lg pt-lg pb-lg b-1px-b">全部评论
+					</view>
+					<scroll-view scroll-y @scrolltolower="scrolltolower" :scroll-with-animation="true"
+						lower-threshold="100" class="scroll-list">
+						<view class="no-data-item flex-center pd-lg" v-if="list.data.length == 0">
+							<image mode="aspectFill" class="avatar radius"
+								src="https://lbqny.migugu.com/admin/anmo/mine/dynamic-user.png">
+							</image>
+							<view class="text flex-1 flex-y-center ml-md pl-lg f-icontext radius">评论千万条, 礼貌第一条</view>
+						</view>
+						<view @longpress="toDel(index)" class="list-item flex-warp pt-lg pl-lg pr-lg"
+							v-for="(item,index) in list.data" :key="index">
+							<image mode="aspectFill" class="avatar radius" :src="item.avatarUrl"></image>
+							<view class="flex-1 ml-md pb-lg" :class="[{'b-1px-b':index != list.total-1}]">
+								<view class="flex-between" style="height: 72rpx;">
+									<view class="text flex-y-center f-caption">
+										<view class="max-380 ellipsis">{{item.nickName}}</view>
+										<view class="examine-btn flex-center f-icontext ml-md radius"
+											v-if="item.status==1">
+											审核中
+										</view>
+									</view>
+									<view class="f-icontext c-caption">{{item.friend_time}}</view>
+								</view>
+								<view class="comment f-paragraph mt-sm"> {{item.text}} </view>
+							</view>
+						</view>
+						<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading"
+							v-if="loading">
+						</load-more>
+					</scroll-view>
+				</block>
+				<view class="comment-thumbs-info flex-center pd-lg f-caption" :class="[{'b-1px-t':detail.type == 2}]">
+					<view class="input-text flex-y-center radius">
+						<i class="iconfont icon-edit ml-md mr-sm"></i>
+						<input ref="elInput" :adjust-position="true" :focus="inputFocus" @blur="inputBlur"
+							@confirm="toComment" v-model="subForm.text" maxlength="200" class="input" type="text"
+							placeholder="说点什么..." />
+					</view>
+				</view>
+				<view class="space-safe"></view>
+			</view>
+		</uni-popup>
+
+		<!-- 预约技-师 -->
+		<uni-popup ref="technician_item" type="bottom">
+			<view class="technician-popup fill-base">
+				<view @tap.stop="toTechnicianInfo" class="pd-lg flex-center">
+					<image mode="aspectFill" class="item-avatar radius" :src="detail.coach_info.work_img"></image>
+					<view class="flex-1 flex-between ml-md">
+						<view class="flex-y-center f-caption c-caption">
+							<view class="f-title c-title text-bold mr-sm max-350 ellipsis">
+								{{detail.coach_info.coach_name}}
+							</view>从业{{detail.coach_info.work_time}}年
+						</view>
+						<view class="flex-y-center f-caption c-caption">更多详情<i class="iconfont icongengduo"
+								style="font-size: 22rpx;"></i></view>
+					</view>
+				</view>
+				<view class="space-sm fill-body"></view>
+				<scroll-view scroll-y @touchmove.stop.prevent class="list-content">
+					<view class="technician-list-item flex-center pd-lg radius-16" :class="[{'b-1px-t':index != 0}]"
+						v-for="(item,index) in serviceList" :key="index">
+						<image @tap.stop="goDetail(index)" mode="aspectFill" class="avatar lg radius-16"
+							:src="item.cover"></image>
+						<view class="flex-1 ml-md">
+							<view @tap.stop="goDetail(index)" class="f-title c-title max-510 ellipsis">
+								{{item.title}}
+							</view>
+							<view class="f-caption c-caption mt-sm mb-sm ellipsis">{{item.total_sale}}人选择</view>
+							<view class="flex-between">
+								<view class="flex-y-baseline f-desc c-caption max-350 ellipsis">
+									<view class="text-delete mr-sm" v-if="item.init_price">¥{{item.init_price}}
+									</view>
+									<view class="f-title c-warning mr-sm">¥{{item.price}}</view>/
+									{{item.time_long}}分钟
+								</view>
+								<view class="flex-warp">
+									<block v-if="item.num">
+										<button @tap.stop="changeNum(-1,index)" class="reduce"
+											:style="{borderColor:primaryColor,color:primaryColor}"><i
+												class="iconfont icon-jian-bold"></i></button>
+										<button class="addreduce clear-btn">{{item.num || 0}}</button>
+									</block>
+									<button @tap.stop="changeNum(1,index)" class="add"
+										:style="{background:primaryColor,borderColor:primaryColor}"><i
+											class="iconfont icon-jia-bold"></i></button>
+								</view>
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+				<view style="margin: 0 100rpx;" v-if="!loading&&serviceList.length<=0">
+					<abnor></abnor>
+				</view>
+				<view class="space-sm fill-body"></view>
+				<view class="flex-between pd-lg b-1px-t" v-if="carList.car_count > 0">
+					<view class="flex-center">合计：<view class="f-title c-warning text-bold ml-sm">
+							¥{{carList.car_price}}
+						</view>
+					</view>
+					<view @tap.stop="toOrder" class="order-btn flex-center f-desc c-base radius"
+						:style="{background: primaryColor}">提交订单
+					</view>
+				</view>
+				<view class="space-safe"></view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	import siteInfo from '@/siteinfo.js';
+	export default {
+		data() {
+			return {
+				iconType: {
+					1: 'icon-kefuwu',
+					2: 'iconjishifuwu',
+					3: 'iconkeyuyue',
+					4: 'iconkeyuyue'
+				},
+				textType: {
+					1: '可服务',
+					2: '服务中',
+					3: '可预约',
+					4: '不可预约'
+				},
+				options: {},
+				detail: {},
+				videoNavHeight: '15px',
+				showText: false,
+				loading: true,
+				param: {
+					page: 1
+				},
+				list: {
+					data: []
+				},
+				serviceList: [],
+				videoContexts: null,
+				isPlay: false,
+				scrollTop: 0,
+				pageScrollTop: 0,
+				showComment: false,
+				inputFocus: false,
+				subForm: {
+					text: ''
+				},
+				rule: [{
+					name: "text",
+					checkType: "isNotNull",
+					errorMsg: "请输入评论内容",
+					regType: 2
+				}],
+				popupInfo: {},
+				lockTap: false,
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+			location: state => state.user.location,
+			isGzhLogin: state => state.user.isGzhLogin,
+			carList: state => state.order.carList,
+		}),
+		async onLoad(options) {
+			this.$util.showLoading()
+			this.options = options
+			this.param.dynamic_id = options.id
+			this.$util.showLoading()
+			await this.initIndex()
+		},
+		onUnload() {
+			console.log("====onUnload")
+			if (this.isPlay) {
+				this.videoContexts.pause()
+			}
+		},
+		onPageScroll(e) {
+			let {
+				scrollTop
+			} = e
+			this.pageScrollTop = scrollTop
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		onShareAppMessage(e) {
+			let {
+				id: pid = 0
+			} = this.userInfo
+			let {
+				id,
+				title,
+				cover: imageUrl
+			} = this.detail
+			let path = `/dynamic/pages/detail?pid=${pid}&id=${id}`
+			this.$util.log(path)
+			return {
+				title,
+				imageUrl,
+				path,
+			}
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getUserInfo', 'getCarList', 'getServiceCoachList']),
+			...mapMutations(['updateUserItem']),
+			async initIndex(refresh = false) {
+				if (!this.configInfo.id || refresh) {
+					await this.getConfigInfo()
+				}
+				let {
+					id: uid = 0
+				} = this.userInfo
+				let {
+					isGzhLogin
+				} = this
+				// #ifdef H5
+				if (isGzhLogin && !uid) {
+					setTimeout(() => {
+						this.getDetail(refresh)
+					}, 1000)
+				} else {
+					this.getDetail(refresh)
+				}
+				// #endif
+				// #ifndef H5
+				await this.getDetail(refresh)
+				// #endif
+
+				let {
+					navBarHeight
+				} = this.configInfo
+				let {
+					type: dynamic_type
+				} = this.detail
+				// #ifdef MP-WEIXIN
+				this.videoNavHeight = navBarHeight * 1 + 15 + 'px'
+				// #endif
+				// #ifdef APP-PLUS
+				this.videoNavHeight = navBarHeight * 1 / 2 + 'px'
+				// #endif
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					setTimeout(() => {
+						this.toAppShare()
+					}, 1200)
+				}
+				// #endif  
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			toAppShare() {
+				let {
+					id: pid = 0
+				} = this.userInfo
+				let {
+					id,
+					title,
+					cover: imageUrl
+				} = this.detail
+				let summary = ''
+
+				let {
+					siteroot
+				} = siteInfo
+				let url = siteroot.split('/index.php')[0]
+				let href = `${url}/h5/#/dynamic/pages/detail?id=${id}&pid=${pid}`
+
+				// #ifdef H5
+				this.$jweixin.wxReady(() => {
+					this.$jweixin.showOptionMenu()
+					this.$jweixin.shareAppMessage(title, summary, href, imageUrl)
+					this.$jweixin.shareTimelineMessage(title, href, imageUrl)
+				})
+				// #endif
+				// #ifdef APP-PLUS
+				uni.share({
+					provider: "weixin",
+					scene: 'WXSceneSession',
+					type: 0,
+					href,
+					title,
+					summary,
+					imageUrl,
+					success: function(res) {
+						console.log("success:" + JSON.stringify(res));
+					},
+					fail: function(err) {
+						console.log("fail:" + JSON.stringify(err));
+					}
+				});
+				this.$refs.show_item.close()
+				// #endif
+			},
+			async getDetail(refresh = false) {
+				let {
+					id
+				} = this.options
+				let {
+					location = {
+						lat: 0,
+						lng: 0
+					}
+				} = this
+				if (!location.lat) {
+					// #ifdef H5
+					if (this.$jweixin.isWechat()) {
+						this.$util.showLoading()
+						// await this.$jweixin.initJssdk();
+						await this.$jweixin.wxReady2();
+						let {
+							latitude: lat = 0,
+							longitude: lng = 0
+						} = await this.$jweixin.getWxLocation()
+						location = {
+							lng,
+							lat,
+							address: '定位失败',
+							province: '',
+							city: '',
+							district: ''
+						}
+						if (lat && lng) {
+							let key = `${lat},${lng}`
+							let data = await this.$api.base.getMapInfo({
+								location: key
+							})
+							let {
+								status,
+								result
+							} = JSON.parse(data)
+							if (status == 0) {
+								let {
+									address,
+									address_component
+								} = result
+								let {
+									province,
+									city,
+									district
+								} = address_component
+								location = {
+									lng,
+									lat,
+									address,
+									province,
+									city,
+									district
+								}
+							}
+						}
+					}
+					// #endif
+					// #ifndef H5
+					location = await this.$util.getBmapLocation()
+					// #endif
+					this.updateUserItem({
+						key: 'location',
+						val: location
+					})
+				}
+				let {
+					lat = 0, lng = 0
+				} = location
+				let data = await this.$api.dynamic.dynamicInfo({
+					id,
+					lat,
+					lng
+				})
+				let have_show_text = data.text.length > 42
+				data.have_show_text = have_show_text
+				this.showText = !have_show_text
+				this.detail = data
+				this.$util.hideAll()
+				await this.getList()
+			},
+			async getList() {
+				let {
+					list: oldList,
+					param
+				} = this
+				let newList = await this.$api.dynamic.commentList(param)
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+			},
+			goBanner(current) {
+				this.$util.previewImage({
+					current,
+					urls: this.detail.imgs
+				})
+			},
+			scrolltolower(e) {
+				if (this.list.current_page >= this.list.last_page || this.loading) return;
+				this.param.page = this.param.page + 1;
+				this.loading = true;
+				this.getList();
+			},
+			toShowHide(key) {
+				this[key] = !this[key]
+			},
+			inputBlur() {
+				if (this.showComment) {
+					this.$refs.comment_item.close()
+				}
+				this.$nextTick(() => {
+					this.showComment = false
+					this.inputFocus = false
+				})
+			},
+			// type 1关注，2点赞，3查看全部评论，4不喜欢TA的作品
+			async toChangeItem(type) {
+				let {
+					id,
+					coach_id,
+					type: dynamic_type,
+					follow_status,
+					thumbs_status,
+					thumbs_num,
+				} = this.detail
+				if (type == 3) {
+					this.showText = false
+					let {
+						scrollTop,
+						pageScrollTop
+					} = this
+					if (dynamic_type == 1 && (!scrollTop || (scrollTop && pageScrollTop < scrollTop))) {
+						if (!scrollTop) {
+							let {
+								navBarHeight = 88
+							} = this.configInfo
+							const query = uni.createSelectorQuery().in(this);
+							query.select('.comment-list-info').boundingClientRect(data => {
+								this.scrollTop = data.top - navBarHeight
+								uni.pageScrollTo({
+									scrollTop: data.top - navBarHeight,
+									duration: 0
+								})
+							}).exec();
+						} else {
+							uni.pageScrollTo({
+								scrollTop: scrollTop,
+								duration: 0
+							})
+						}
+					}
+					this.showComment = dynamic_type == 1
+					this.$refs.comment_item.open()
+					setTimeout(() => {
+						this.$nextTick(() => {
+							this.inputFocus = true
+							// this.$refs.elInput.focus()
+						}, 10)
+					}, 200)
+					return
+				}
+				let methodArr = {
+					1: {
+						methodKey: 'dynamic',
+						methodModel: 'followAddOrCancek',
+						param: {
+							dynamic_id: id,
+							coach_id
+						}
+					},
+					2: {
+						methodKey: 'dynamic',
+						methodModel: 'thumbsAddOrCancek',
+						param: {
+							dynamic_id: id
+						}
+					},
+					4: {
+						methodKey: 'mine',
+						methodModel: 'shieldCoachAdd',
+						param: {
+							type: 1,
+							coach_id
+						}
+					},
+				}
+				let {
+					methodKey,
+					methodModel,
+					param
+				} = methodArr[type]
+				await this.$api[methodKey][methodModel](param)
+
+				switch (type) {
+					case 1:
+						this.detail.follow_status = follow_status ? 0 : 1
+						break;
+					case 2:
+						let num = thumbs_status ? -1 : 1
+						this.detail.thumbs_num = thumbs_num + num
+						this.detail.thumbs_status = num > 0 ? 1 : 0
+						break;
+					case 4:
+						this.$util.showToast({
+							title: `操作成功`
+						})
+						setTimeout(() => {
+							this.$util.back()
+							this.$util.goUrl({
+								url: 1,
+								openType: `navigateBack`
+							})
+						}, 2000)
+						break
+				}
+			},
+			//表单验证
+			validate(param) {
+				let validate = new this.$util.Validate();
+				this.rule.map(item => {
+					let {
+						name,
+					} = item
+					validate.add(param[name], item);
+				})
+				let message = validate.start();
+				return message;
+			},
+			async toComment() {
+				let subForm = this.$util.deepCopy(this.subForm)
+				let {
+					id
+				} = this.options
+				subForm.dynamic_id = id
+				let msg = this.validate(subForm)
+				if (msg) return
+				subForm.text = subForm.text.substring(0, 200)
+				if (this.lockTap) return
+				this.lockTap = true
+				this.$util.showLoading()
+				try {
+					let {
+						status = 1
+					} = await this.$api.dynamic.commentAdd(subForm)
+					this.$util.hideAll()
+					this.$util.showToast({
+						title: status == 1 ? '正在审核中' : `评论成功`
+					})
+					this.lockTap = false
+					this.subForm.text = ''
+					if (this.showComment) {
+						this.$refs.comment_item.close()
+					}
+					this.$nextTick(() => {
+						this.showComment = false
+						this.inputFocus = false
+					})
+					setTimeout(() => {
+						this.initRefresh()
+					}, 1000)
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+			},
+			toDel(index) {
+				let {
+					id,
+					cover: image,
+					del_auth,
+					status
+				} = this.list.data[index]
+				if (del_auth) {
+					this.popupInfo = {
+						id,
+						name: ``,
+						image: ``,
+						index,
+						status
+					}
+					this.$refs.del_item.open()
+				}
+			},
+			// 确认：删除评论
+			async confirmDel() {
+				let {
+					id,
+					index,
+					status
+				} = this.popupInfo
+				let {
+					comment_num
+				} = this.detail
+				if (this.lockTap) return
+				this.lockTap = true
+				this.$util.showLoading()
+				try {
+					await this.$api.dynamic.commentDel({
+						id
+					})
+					this.lockTap = false
+					this.$util.hideAll()
+					this.list.data.splice(index, 1)
+					// await this.getList(1)
+					if (status != 1) {
+						this.detail.comment_num = comment_num - 1
+					}
+					this.$util.showToast({
+						title: `删除成功`
+					})
+					this.$refs.del_item.close()
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+			},
+			async getServiceList() {
+				let {
+					is_work
+				} = this.detail.coach_info
+				if (!is_work) {
+					this.$util.showToast({
+						title: `该${this.$t('action.attendantName')}未上班`
+					})
+					return
+				}
+				let {
+					coach_id
+				} = this.detail
+				await this.getCarList({
+					coach_id
+				})
+				let {
+					data
+				} = await this.$api.service.coachServiceList({
+					coach_id
+				})
+				let arr = []
+				if (this.carList.list && this.carList.list.length > 0) {
+					this.carList.list.map(item => {
+						arr.push(item.service_id)
+					})
+				}
+				if (data && data.length > 0) {
+					data.map(item => {
+						if (arr.includes(item.id)) {
+							let carInd = arr.findIndex(aitem => {
+								return aitem == item.id
+							})
+							item.num = this.carList.list[carInd].num
+							item.cart_id = this.carList.list[carInd].id
+						}
+					})
+				}
+				this.serviceList = data
+				this.$refs.technician_item.open()
+			},
+			// 加/减数量
+			async changeNum(mol, serInd) {
+				let {
+					coach_id
+				} = this.detail
+				let {
+					id: service_id,
+					cart_id = 0
+				} = this.serviceList[serInd]
+				if (this.lockTap) return;
+				this.lockTap = true;
+				let methodModel = mol > 0 ? 'addCar' : 'delCar'
+				let param = mol > 0 ? {
+					service_id,
+					coach_id,
+					num: 1
+				} : {
+					id: cart_id,
+					num: 1
+				}
+				if (methodModel == 'delCar' && !param.id) {
+					this.lockTap = false
+					return
+				}
+				try {
+					let add_cart_id = await this.$api.order[methodModel](param)
+					let {
+						num = 0,
+							cart_id = 0
+					} = this.serviceList[serInd]
+					this.serviceList[serInd].num = num + mol
+					if (add_cart_id && mol > 0 && !cart_id) {
+						this.serviceList[serInd].cart_id = add_cart_id
+					}
+					if (this.serviceList[serInd].num < 1) {
+						this.serviceList[serInd].cart_id = 0
+					}
+					await this.getCarList({
+						coach_id
+					})
+					this.lockTap = false
+				} catch (e) {
+					this.lockTap = false
+				}
+			},
+			// 下单
+			toOrder() {
+				if (this.carList.car_count < 1) {
+					this.$util.showToast({
+						title: `请选择服务`
+					})
+					return
+				}
+				let {
+					coach_id: id
+				} = this.detail
+				this.$refs.technician_item.close()
+				this.$util.goUrl({
+					url: `/user/pages/order?id=${id}`
+				})
+			},
+			toTechnicianInfo() {
+				let {
+					coach_id
+				} = this.detail
+				this.$refs.technician_item.close()
+				this.$util.goUrl({
+					url: `/user/pages/technician-info?id=${coach_id}`
+				})
+			},
+			screenChange(e) {
+				let {
+					fullScreen = false
+				} = e.detail
+				if (!fullScreen) {
+					this.$nextTick(() => {
+						this.videoContexts.pause()
+						this.videoContexts = null
+						this.isPlay = false
+					})
+				}
+			},
+			playAndPauseVideo() {
+				let {
+					videoContexts = null
+				} = this
+				let isPlay = this.$util.deepCopy(this.isPlay)
+				if (videoContexts == null) {
+					let {
+						id
+					} = this.detail
+					this.videoContexts = uni.createVideoContext(`video_${id}`, this)
+					this.isPlay = true
+				}
+				let methodModel = !isPlay ? 'play' : 'pause'
+				this.$nextTick(() => {
+					// #ifdef APP-PLUS
+					if (!isPlay) {
+						this.videoContexts.requestFullScreen({
+							direction: 0
+						})
+					}
+					// #endif
+					this.videoContexts[methodModel]()
+				})
+			},
+			onPlay(e) {
+				this.isPlay = true
+			},
+			onPause(e) {
+				this.isPlay = false
+			},
+			onEnded(e) {
+				// #ifdef APP-PLUS
+				this.videoContexts.exitFullScreen()
+				// #endif
+				// #ifndef APP-PLUS
+				this.isPlay = false
+				// #endif
+			},
+			onError(e) {},
+			onTimeUpdate(e) {},
+			onWaiting(e) {},
+			onProgress(e) {},
+			onLoadedMetaData(e) {},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.dynamic-detail {
+		.banner-info {
+			width: 750rpx;
+			height: 654rpx;
+		}
+
+		.menu-info {
+			top: 30rpx;
+			right: 30rpx;
+			width: 60rpx;
+			height: 60rpx;
+			background: rgba(2, 2, 2, 0.5);
+			z-index: 99991
+		}
+
+		.menu-info.type-video {
+			background: rgba(255, 255, 255, 0.5);
+		}
+
+		.dynamic-info {
+			.avatar {
+				width: 84rpx;
+				height: 84rpx;
+			}
+
+			.app-follow-btn {
+				width: 116rpx;
+				height: 56rpx;
+				transform: rotateZ(360deg);
+
+				.iconfont {
+					font-size: 24rpx;
+					margin-right: 6rpx;
+				}
+			}
+		}
+
+		.dynamic-content {
+			color: #222;
+			line-height: 40rpx;
+		}
+
+		.hide-text {
+			height: 180rpx;
+			overflow: hidden;
+		}
+
+		.video-box {
+			width: 100%;
+			height: calc(100vh - 100rpx);
+			padding-bottom: calc(env(safe-area-inset-bottom) / 2);
+
+			.video-poster {
+				width: 100%;
+				height: 100%;
+
+				.play-video {
+					width: 88rpx;
+					height: 88rpx;
+					background: rgba(2, 2, 2, 0.5);
+
+					.iconfont {
+						font-size: 38rpx;
+					}
+				}
+			}
+
+			.video-poster.abs {
+				top: 0;
+				left: 0;
+				z-index: 1;
+			}
+
+			.video_item {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.no-data-item {
+			padding-bottom: 280rpx;
+
+			.avatar {
+				width: 54rpx;
+				height: 54rpx;
+			}
+
+			.text {
+				width: 616rpx;
+				height: 56rpx;
+				color: #C7C7C7;
+				background: #F7F7F7;
+			}
+		}
+
+		.list-item {
+			.avatar {
+				width: 72rpx;
+				height: 72rpx;
+			}
+
+			.text {
+				color: #ADADAD;
+			}
+
+			.comment {
+				color: #3A3A3A;
+				line-height: 1.4;
+			}
+
+			.examine-btn {
+				width: 82rpx;
+				height: 34rpx;
+				color: #F96246;
+				background: rgba(249, 98, 70, 0.1);
+			}
+		}
+
+		.bottom-info {
+			width: 750rpx;
+			background: #fff;
+
+
+			.dynamic-info {
+				.avatar {
+					width: 66rpx;
+					height: 66rpx;
+				}
+
+				.ml-sm {
+					margin-left: 15rpx;
+				}
+
+				.app-follow-btn {
+					width: 100rpx;
+					height: 45rpx;
+					transform: rotateZ(360deg);
+					border: 1rpx solid #fff;
+
+					.iconfont {
+						font-size: 24rpx;
+						margin-right: 6rpx;
+					}
+				}
+			}
+
+			.dynamic-content {
+				max-height: 20vh;
+				overflow-y: auto;
+			}
+
+			.comment-thumbs-info {
+				height: 100rpx;
+
+				.input-text {
+					width: 372rpx;
+					height: 68rpx;
+					background: #F6F6F6;
+
+					.iconfont {
+						color: #C7C7C7;
+						font-size: 24rpx;
+					}
+
+					.input {
+						width: calc(100% - 78rpx);
+					}
+				}
+
+				.thumbs-comment-btn {
+					min-width: 102rpx;
+					color: #343434;
+
+					.iconfont {
+						font-size: 44rpx;
+						margin-right: 6rpx;
+					}
+				}
+			}
+		}
+
+		.bottom-info.type-video {
+			padding-top: 150rpx;
+			background: linear-gradient(180deg, rgba(0, 0, 0, 0) 0%, #000000 100%);
+
+			.input-text {
+				background: #191919;
+
+				.input {
+					color: #fff;
+				}
+			}
+
+			.thumbs-comment-btn {
+				color: #fff;
+			}
+		}
+
+		.show-popup {
+			width: 750rpx;
+			background: #F3F3F5;
+			border-radius: 30rpx 30rpx 0 0;
+
+			.avatar {
+				width: 84rpx;
+				height: 84rpx;
+			}
+
+			.show-item {
+				color: #222;
+				height: 100rpx;
+				background: #fff;
+			}
+		}
+
+		.comment-popup {
+			width: 750rpx;
+			border-radius: 30rpx 30rpx 0 0;
+
+			.icon-add {
+				font-size: 36rpx;
+				top: 32rpx;
+				right: 32rpx;
+			}
+
+			.scroll-list {
+				max-height: 70vh;
+			}
+
+			.comment-thumbs-info {
+				height: 100rpx;
+
+				.input-text {
+					width: 690rpx;
+					height: 68rpx;
+					background: #F6F6F6;
+
+					.iconfont {
+						color: #C7C7C7;
+						font-size: 24rpx;
+					}
+
+					.input {
+						width: calc(100% - 78rpx);
+					}
+				}
+			}
+		}
+
+		.technician-popup {
+			border-radius: 20rpx 20rpx 0 0;
+
+			.item-avatar {
+				width: 90rpx;
+				height: 90rpx;
+				background: #f4f6f8;
+			}
+
+			.icon-close {
+				font-size: 50rpx;
+			}
+
+			.technician-text {
+				max-height: 150rpx;
+			}
+
+			.list-content {
+				max-height: 50vh;
+			}
+
+			.order-btn {
+				width: 200rpx;
+				height: 72rpx;
+			}
+		}
+	}
+</style>
diff --git a/dynamic/pages/follow.vue b/dynamic/pages/follow.vue
new file mode 100644
index 0000000..11afe49
--- /dev/null
+++ b/dynamic/pages/follow.vue
@@ -0,0 +1,206 @@
+<template>
+	<view class="dynamic-follow">
+		<view @tap.stop="goDetail(index)"
+			class="list-item flex-center fill-base mt-md ml-md mr-md pd-lg radius-16 box-shadow"
+			v-for="(item,index) in list.data" :key="index">
+			<image mode="aspectFill" class="avatar radius" :src="item.work_img"></image>
+			<view class="flex-1 ml-md">
+				<view class="flex-between">
+					<view class="f-title c-black text-bold ellipsis" style="max-width: 150rpx;">{{item.coach_name}}
+					</view>
+					<view class="flex-y-baseline f-desc c-black"> <i class="iconfont iconjuli"
+							:style="{color:primaryColor}"></i>
+						{{item.distance}}
+					</view>
+				</view>
+				<view class="flex-y-baseline">
+					<view class="text flex-y-center f-desc">已接单<view class="ml-sm" :style="{color:primaryColor}">
+							{{item.order_num}}
+						</view>
+					</view>
+					<view class="flex-y-center f-caption c-caption ml-md"> 粉丝数 <view class="c-title ml-sm">
+							{{item.fans_num}}
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+		<view class="space-footer"></view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		data() {
+			return {
+				loading: true,
+				param: {
+					page: 1
+				},
+				list: {
+					data: []
+				}
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			userInfo: state => state.user.userInfo,
+			location: state => state.user.location,
+		}),
+		onLoad() {
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+			this.$util.showLoading()
+			this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			...mapMutations(['updateUserItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				this.getList();
+			},
+			handerTabChange(index) {
+				this.activeIndex = index
+				this.param.status = index
+				this.getList();
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			async getList() {
+				let {
+					list: oldList,
+					param,
+					location
+				} = this
+				if (!location.lat) {
+					// #ifdef H5
+					if (this.$jweixin.isWechat()) {
+						this.$util.showLoading()
+						// await this.$jweixin.initJssdk();
+						await this.$jweixin.wxReady2();
+						let {
+							latitude: lat = 0,
+							longitude: lng = 0
+						} = await this.$jweixin.getWxLocation()
+						location = {
+							lng,
+							lat,
+							address: '定位失败',
+							province: '',
+							city: '',
+							district: ''
+						}
+						if (lat && lng) {
+							let key = `${lat},${lng}`
+							let data = await this.$api.base.getMapInfo({
+								location: key
+							})
+							let {
+								status,
+								result
+							} = JSON.parse(data)
+							if (status == 0) {
+								let {
+									address,
+									address_component
+								} = result
+								let {
+									province,
+									city,
+									district
+								} = address_component
+								location = {
+									lng,
+									lat,
+									address,
+									province,
+									city,
+									district
+								}
+							}
+						}
+					}
+					// #endif
+					// #ifndef H5
+					location = await this.$util.getBmapLocation()
+					// #endif
+					this.updateUserItem({
+						key: 'location',
+						val: location
+					})
+				}
+				let {
+					lat = 0, lng = 0
+				} = location
+				param.lat = lat
+				param.lng = lng
+
+				let newList = await this.$api.dynamic.followCoachList(param)
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+			},
+			goDetail(index) {
+				let {
+					coach_id
+				} = this.list.data[index]
+				this.$util.goUrl({
+					url: `/user/pages/technician-info?id=${coach_id}`
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.dynamic-follow {
+		.list-item {
+			.avatar {
+				width: 124rpx;
+				height: 124rpx;
+			}
+
+			.text {
+				color: #4D4D4D;
+				margin-top: 6rpx;
+			}
+		}
+	}
+</style>
diff --git a/dynamic/pages/technician/comment.vue b/dynamic/pages/technician/comment.vue
new file mode 100644
index 0000000..6887ac3
--- /dev/null
+++ b/dynamic/pages/technician/comment.vue
@@ -0,0 +1,194 @@
+<template>
+	<view class="dynamic-technician-comment">
+		<view @longpress="toDel(index)" class="list-item flex-warp ml-lg mr-lg pt-lg pb-lg"
+			:class="[{'b-1px-t':index!==0}]" v-for="(item,index) in list.data" :key="index">
+			<image mode="aspectFill" class="avatar radius" :src="item.avatarUrl"></image>
+			<view class="flex-1 ml-md">
+				<view class="flex-between">
+					<view>
+						<view class="flex-y-center f-paragraph c-title text-bold">
+							<view class="max-400 ellipsis">{{item.nickName}}</view>
+							<view class="examine-btn flex-center f-icontext ml-md radius" v-if="item.status==1">审核中
+							</view>
+						</view>
+						<view class="text flex-y-center f-caption">评论了你的动态<view class="ml-md">{{item.friend_time}}
+							</view>
+						</view>
+					</view>
+					<image mode="aspectFill" class="cover radius-16" :src="item.cover"></image>
+				</view>
+				<view class="comment f-paragraph mt-md"> {{item.text}} </view>
+			</view>
+		</view>
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+		<view class="space-footer"></view>
+		<common-popup @confirm="confirmDel" ref="del_item" type="DELETE_ORDER" title="删除评论" desc="请确认是否删除评论，删除后将无法恢复"
+			:info="popupInfo"></common-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		data() {
+			return {
+				loading: true,
+				param: {
+					page: 1
+				},
+				list: {
+					data: []
+				},
+				popupInfo: {},
+				lockTap: false
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad() {
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+			this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				this.getList();
+			},
+			handerTabChange(index) {
+				this.activeIndex = index
+				this.param.status = index
+				this.getList();
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			async getList() {
+				this.$util.showLoading()
+				let {
+					list: oldList,
+					param
+				} = this
+				let newList = await this.$api.dynamic.coachCommentList(param)
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+			},
+			toDel(index) {
+				let {
+					id,
+					cover: image
+				} = this.list.data[index]
+				this.popupInfo = {
+					id,
+					name: ``,
+					image,
+					index,
+				}
+				this.$refs.del_item.open()
+			},
+			// 确认：删除评论
+			async confirmDel() {
+				let {
+					id,
+					index,
+				} = this.popupInfo
+				if (this.lockTap) return
+				this.lockTap = true
+				this.$util.showLoading()
+				try {
+					await this.$api.dynamic.commentDel({
+						id
+					})
+					this.lockTap = false
+					this.$util.hideAll()
+					this.list.data.splice(index, 1)
+					this.$util.showToast({
+						title: `删除成功`
+					})
+					this.$refs.del_item.close()
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background: #fff;
+	}
+
+	.dynamic-technician-comment {
+		.list-item {
+			.avatar {
+				width: 72rpx;
+				height: 72rpx;
+				margin-top: 16rpx;
+			}
+
+			.cover {
+				width: 107rpx;
+				height: 107rpx;
+			}
+
+			.text {
+				color: #ADADAD;
+				margin-top: 6rpx;
+			}
+
+			.comment {
+				color: #3A3A3A;
+				line-height: 1.4;
+			}
+
+			.examine-btn {
+				width: 82rpx;
+				height: 34rpx;
+				color: #F96246;
+				background: rgba(249, 98, 70, 0.1);
+			}
+		}
+	}
+</style>
diff --git a/dynamic/pages/technician/detail.vue b/dynamic/pages/technician/detail.vue
new file mode 100644
index 0000000..f9a56e6
--- /dev/null
+++ b/dynamic/pages/technician/detail.vue
@@ -0,0 +1,1342 @@
+<template>
+	<view class="dynamic-technician-detail" v-if="detail.id">
+		<!-- #ifdef H5 -->
+		<view @tap="$util.goUrl({url:`/pages/service`})" class="abs"
+			:class="[{'back-user-ios': configInfo.isIos},{'back-user-android': !configInfo.isIos}]"
+			style="margin-top:25rpx;z-index: 999;" v-if="options.pid">
+			<view class="iconshouye iconfont"></view>
+			<view class="back-user_text">回到首页</view>
+		</view>
+		<!-- #endif -->
+		<!-- #ifndef H5 -->
+		<uni-nav-bar :fixed="true" :shadow="false" :statusBar="true"
+			:leftIcon="options.pid ? 'iconshouye11' : 'icon-left'" :title="detail.type == 1?'动态详情':' '" color="#ffffff"
+			:backgroundColor="detail.type == 1?primaryColor:'none'">
+		</uni-nav-bar>
+		<view :style="{height:`${configInfo.navBarHeight}px`}" v-if="detail.type == 1"></view>
+		<!-- #endif -->
+
+		<block v-if="detail.type == 1">
+			<view class="banner-info rel">
+				<view @tap.stop="$refs.show_item.open()" class="menu-info flex-center c-base abs radius">
+					<i class="iconfont icon-caidan"></i>
+				</view>
+				<banner @change="goBanner" :list="detail.imgs" :margin="0" :autoplay="true"
+					:indicatorActiveColor="primaryColor" :dotWidth="20" :dotBottom="30" :height="654"
+					v-if="detail.imgs.length > 0">
+				</banner>
+			</view>
+			<view class="pd-lg fill-base">
+				<view class="dynamic-info flex-center">
+					<image mode="aspectFill" class="avatar radius" :src="detail.coach_info.work_img"></image>
+					<view class="flex-1 ml-md">
+						<view class="flex-between">
+							<view>
+								<view class="f-mini-title c-black text-bold max-270 ellipsis">
+									{{detail.coach_info.coach_name}}
+								</view>
+								<view class="flex-y-center f-icontext c-caption mt-sm" :style="{color:primaryColor}"><i
+										class="iconfont" :class="[iconType[detail.coach_info.work_status]]"
+										style="font-size: 24rpx;margin-right:5rpx"></i>{{textType[detail.coach_info.work_status]}}
+								</view>
+							</view>
+
+							<view class="flex-y-center f-caption">
+								<view class="app-follow-btn flex-center c-base radius"
+									:style="{background:detail.status==1?'#FC8218':'#FF6262'}" v-if="detail.status!=2">
+									{{detail.status==1?'审核中': '已驳回'}}
+								</view>
+								<block v-else>
+									<view @tap.stop="getServiceList" class="app-follow-btn flex-center radius"
+										:style="{color:primaryColor,border:`1rpx solid ${primaryColor}`}">预约</view>
+									<view @tap.stop="toChangeItem(1)" class="app-follow-btn flex-center radius ml-md"
+										:style="{background:detail.follow_status ? primaryColor:'#fff',color:detail.follow_status ? '#fff' :primaryColor,border:`1rpx solid ${primaryColor}`}">
+										<i class="iconfont icon-jia-bold"
+											v-if="!detail.follow_status"></i>{{detail.follow_status?'已关注':'关注'}}
+									</view>
+								</block>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="f-mini-title c-black text-bold mt-lg">{{detail.title}}</view>
+				<view class="dynamic-content f-paragraph mt-lg mb-lg">
+					<span v-if="!showText">
+						<span>{{detail.text.substring(0,42) + '...'}}</span>
+						<span @tap.stop="toShowHide('showText')" class="pl-md" :style="{color:primaryColor}"
+							v-if="detail.have_show_text">
+							展开
+							<text class="iconfont iconxia ml-sm" style="font-size: 24rpx;"></text>
+						</span>
+					</span>
+					<block v-if="showText">
+						<view>
+							<text decode="emsp" style="word-break:break-all;">{{detail.text}}</text>
+						</view>
+						<span @tap.stop="toShowHide('showText')" class="mt-sm" :style="{color:primaryColor}"
+							v-if="detail.have_show_text">
+							收起
+							<text class="iconfont iconshang ml-sm" style="font-size: 24rpx;"></text>
+						</span>
+					</block>
+				</view>
+				<view class="flex-between">
+					<view class="f-caption c-caption">{{detail.friend_time}}</view>
+					<view class="flex-y-center f-desc c-desc"> <i class="iconfont iconjuli"
+							:style="{color:primaryColor}"></i>
+						{{detail.distance}}
+					</view>
+				</view>
+			</view>
+			<view class="space-md"></view>
+			<view class="comment-list-info pl-lg pr-lg fill-base">
+				<view class="flex-y-center f-mini-title c-title text-bold b-1px-b" style="height: 95rpx;">全部评论</view>
+				<view class="no-data-item flex-center mt-lg" v-if="list.data.length == 0">
+					<image mode="aspectFill" class="avatar radius"
+						src="https://lbqny.migugu.com/admin/anmo/mine/dynamic-user.png">
+					</image>
+					<view class="text flex-1 flex-y-center ml-md pl-lg f-icontext radius">评论千万条, 礼貌第一条</view>
+				</view>
+				<view @longpress="toDel(index)" class="list-item flex-warp pt-lg" v-for="(item,index) in list.data"
+					:key="index">
+					<image mode="aspectFill" class="avatar radius" :src="item.avatarUrl"></image>
+					<view class="flex-1 ml-md pb-lg" :class="[{'b-1px-b':index != list.total-1}]">
+						<view class="flex-between" style="height: 72rpx;">
+							<view class="text flex-y-center f-caption">
+								<view class="max-380 ellipsis">{{item.nickName}}</view>
+								<view class="examine-btn flex-center f-icontext ml-md radius" v-if="item.status==1">
+									审核中
+								</view>
+							</view>
+							<view class="f-icontext c-caption">{{item.friend_time}}</view>
+						</view>
+						<view class="comment f-paragraph mt-sm"> {{item.text}} </view>
+					</view>
+				</view>
+			</view>
+			<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading"
+				v-if="loading">
+			</load-more>
+			<view :class="[{'space-footer':detail.status != 2},{'space-max-footer':detail.status == 2}]"></view>
+		</block>
+		<block v-if="detail.type == 2">
+			<view class="video-box rel">
+				<view @tap.stop="$refs.show_item.open()" class="menu-info type-video flex-center c-title abs radius"
+					:style="{top:videoNavHeight}">
+					<i class="iconfont icon-caidan"></i>
+				</view>
+				<view class="video-poster rel" v-show="!isPlay && videoContexts == null">
+					<image mode="aspectFill" class="video-poster" :src="detail.cover"></image>
+					<view @tap.stop="playAndPauseVideo" class="video-poster flex-center abs">
+						<view class="play-video flex-center c-base radius">
+							<i class="iconfont icon-play-video"></i>
+						</view>
+					</view>
+				</view>
+				<!-- #ifdef APP-PLUS -->
+				<video :id="`video_${detail.id}`" class="video_item" :controls="true" :src="detail.imgs[0]"
+					@play="onPlay" @pause="onPause" @ended="onEnded" @timeupdate="onTimeUpdate" @waiting="onWaiting"
+					@progress="onProgress" @loadedmetadata="onLoadedMetaData" @fullscreenchange="screenChange"
+					v-show="isPlay">
+				</video>
+				<!-- #endif -->
+				<!-- #ifndef APP-PLUS -->
+				<video @tap.stop="playAndPauseVideo" :id="`video_${detail.id}`" class="video_item" :loop="false"
+					enable-play-gesture enable-progress-gesture :show-center-play-btn="true" :controls="false"
+					:src="detail.imgs[0]" object-fit="contain" @play="onPlay" @pause="onPause" @ended="onEnded"
+					@timeupdate="onTimeUpdate" @waiting="onWaiting" @progress="onProgress"
+					@loadedmetadata="onLoadedMetaData" v-show="isPlay">
+				</video>
+				<!-- #endif -->
+			</view>
+		</block>
+
+		<fixed position="bottom" zIndex="994" v-if="(detail.type == 1 && detail.status == 2) || detail.type == 2">
+			<view class="bottom-info" :class="[{'b-1px-t': detail.type == 1},{'type-video': detail.type == 2}]">
+				<block v-if="detail.type == 2">
+					<view class="dynamic-info flex-center pd-lg">
+						<image mode="aspectFill" class="avatar radius" :src="detail.coach_info.work_img"></image>
+						<view class="flex-1 flex-y-center ml-sm c-base">
+							<view class="f-paragraph text-bold ellipsis"
+								:style="{maxWidth: detail.coach_info.is_work ? '240rpx' :'340rpx'}">
+								{{detail.coach_info.coach_name}}
+							</view>
+							<view class="flex-y-center f-icontext ml-sm"><i class="iconfont"
+									:class="[iconType[detail.coach_info.work_status]]"
+									style="font-size: 24rpx;margin-right:5rpx"></i>{{textType[detail.coach_info.work_status]}}
+							</view>
+							<view class="flex-y-center f-caption">
+								<block v-if="detail.status!=2">
+									<view class="app-follow-btn flex-center c-base radius ml-sm"
+										:style="{background:detail.status==1?'#FC8218':'#FF6262',borderColor:detail.status==1?'#FC8218':'#FF6262'}">
+										{{detail.status==1?'审核中': '已驳回'}}
+									</view>
+									<view @tap.stop="toChangeItem(3)"
+										class="app-follow-btn flex-center c-base radius ml-sm"
+										:style="{background:primaryColor,borderColor:primaryColor}">
+										全部评论
+									</view>
+								</block>
+								<block v-else>
+									<view @tap.stop="getServiceList" class="app-follow-btn flex-center radius ml-sm">预约
+									</view>
+									<view @tap.stop="toChangeItem(1)" class="app-follow-btn flex-center radius ml-sm"
+										:style="{background:detail.follow_status ? primaryColor:'',border: detail.follow_status ? `1rpx solid ${primaryColor}`:``}">
+										<i class="iconfont icon-jia-bold"
+											v-if="!detail.follow_status"></i>{{detail.follow_status?'已关注':'关注'}}
+									</view>
+								</block>
+							</view>
+						</view>
+					</view>
+					<view class="pl-lg pr-lg c-base">
+						<view class="f-mini-title text-bold pb-lg">{{detail.title}}</view>
+						<view class="dynamic-content f-paragraph pb-lg">
+							<span v-if="!showText">
+								<span class="c-base">{{detail.text.substring(0,42) + '...'}}</span>
+								<span @tap.stop="toShowHide('showText')" class="pl-md" :style="{color:primaryColor}"
+									v-if="detail.have_show_text">
+									展开
+									<text class="iconfont iconxia ml-sm" style="font-size: 24rpx;"></text>
+								</span>
+							</span>
+							<block v-if="showText">
+								<view>
+									<text decode="emsp" class="c-base"
+										style="word-break:break-all;">{{detail.text}}</text>
+								</view>
+								<span @tap.stop="toShowHide('showText')" class="mt-sm" :style="{color:primaryColor}"
+									v-if="detail.have_show_text">
+									收起
+									<text class="iconfont iconshang ml-sm" style="font-size: 24rpx;"></text>
+								</span>
+							</block>
+						</view>
+						<view class="flex-between pb-lg">
+							<view class="f-caption">{{detail.friend_time}}</view>
+							<view class="flex-y-center f-desc"> <i class="iconfont iconjuli"></i>
+								{{detail.distance}}
+							</view>
+						</view>
+						<view class="space-sm" v-if="detail.status != 2"></view>
+					</view>
+				</block>
+				<view class="comment-thumbs-info flex-between f-caption pl-lg pr-lg"
+					:class="[{'fill-black':detail.type == 2}]" v-if="detail.status == 2">
+					<view @tap.stop="toChangeItem(3)" class="input-text flex-y-center radius"
+						:class="[{'flex-1':showComment}]">
+						<i class="iconfont icon-edit ml-md mr-sm"></i>
+						<input class="input" type="text" placeholder="说点什么..." :disabled="true" />
+					</view>
+					<view v-if="showComment"></view>
+					<view class="flex-y-center" v-else>
+						<view @tap.stop="toChangeItem(2)" class="thumbs-comment-btn flex-y-center">
+							<i class="iconfont"
+								:class="[{'icon-shoucang':!detail.thumbs_status},{'icon-shoucang-fill':detail.thumbs_status}]"
+								:style="{color:detail.thumbs_status?primaryColor:''}"></i>
+							{{!detail.thumbs_num ? '点赞' : detail.thumbs_num}}
+						</view>
+						<view @tap.stop="toChangeItem(3)" class="thumbs-comment-btn flex-y-center pl-lg">
+							<i class="iconfont icon-pinglun"></i>
+							{{!detail.comment_num ? '评论' : detail.comment_num}}
+						</view>
+					</view>
+				</view>
+				<view class="video-comment-black fix" v-if="detail.type == 2 && detail.status != 2">
+				</view>
+				<view class="space-safe" :class="[{'fill-black':detail.type == 2}]"></view>
+			</view>
+		</fixed>
+
+
+		<common-popup @confirm="confirmDel" ref="del_item" type="DELETE_ORDER" title="删除评论" desc="请确认是否删除评论，删除后将无法恢复"
+			:info="popupInfo"></common-popup>
+		<common-popup @confirm="confirmDel" ref="del_dynamic_item" type="DELETE_ORDER" title="删除动态"
+			desc="请确认是否删除动态，删除后将无法恢复" :info="popupInfo"></common-popup>
+
+		<!-- 操作项 -->
+		<uni-popup ref="show_item" type="bottom">
+			<view class="show-popup pd-lg">
+				<view @tap.stop="toChangeItem(4)" class="show-item flex-center f-paragraph text-bold mt-md radius-16"
+					v-if="detail.status!=1">编辑
+				</view>
+				<view @tap.stop="toChangeItem(5)" class="show-item flex-center f-paragraph text-bold mt-md radius-16">删除
+				</view>
+				<view @tap.stop="toChangeItem(6)" class="show-item flex-center f-paragraph text-bold mt-md radius-16"
+					v-if="detail.status == 3 && detail.check_text && detail.check_text.length > 0">驳回原因
+				</view>
+				<view @tap.stop="$refs.show_item.close()"
+					class="show-item flex-center f-paragraph text-bold mt-md radius-16" :style="{color:primaryColor}">取消
+				</view>
+				<view class="space-safe"></view>
+			</view>
+		</uni-popup>
+
+		<!-- 查看驳回原因 -->
+		<uni-popup ref="check_text_item" type="bottom">
+			<view class="comment-popup fill-base rel">
+				<i @tap.stop="$refs.check_text_item.close()" class="iconfont icon-add rotate-45 abs"></i>
+				<view class="flex-center f-mini-title c-title text-bold pd-lg">驳回原因</view>
+				<view class="pd-lg f-paragraph" style="max-height: 70vh;overflow-y: auto;">
+					<text decode="emsp" style="word-break:break-all;">{{detail.check_text}}</text>
+				</view>
+				<view class="space-safe"></view>
+			</view>
+		</uni-popup>
+
+		<!-- 查看全部评论 -->
+		<uni-popup ref="comment_item" type="bottom" :zIndex="995">
+			<view class="comment-popup fill-base rel">
+				<i @tap.stop="$refs.comment_item.close()" class="iconfont icon-add rotate-45 abs"
+					style="z-index: 997;"></i>
+				<view class="flex-center f-mini-title c-title text-bold ml-lg mr-lg pt-lg pb-lg b-1px-b">全部评论
+				</view>
+				<scroll-view scroll-y @scrolltolower="scrolltolower" :scroll-with-animation="true" lower-threshold="100"
+					class="scroll-list">
+					<view class="no-data-item flex-center pd-lg" v-if="list.data.length == 0">
+						<image mode="aspectFill" class="avatar radius"
+							src="https://lbqny.migugu.com/admin/anmo/mine/dynamic-user.png">
+						</image>
+						<view class="text flex-1 flex-y-center ml-md pl-lg f-icontext radius">评论千万条, 礼貌第一条</view>
+					</view>
+					<view @longpress="toDel(index)" class="list-item flex-warp pt-lg pl-lg pr-lg"
+						v-for="(item,index) in list.data" :key="index">
+						<image mode="aspectFill" class="avatar radius" :src="item.avatarUrl"></image>
+						<view class="flex-1 ml-md pb-lg" :class="[{'b-1px-b':index != list.total-1}]">
+							<view class="flex-between" style="height: 72rpx;">
+								<view class="text flex-y-center f-caption">
+									<view class="max-380 ellipsis">{{item.nickName}}</view>
+									<view class="examine-btn flex-center f-icontext ml-md radius" v-if="item.status==1">
+										审核中
+									</view>
+								</view>
+								<view class="f-icontext c-caption">{{item.friend_time}}</view>
+							</view>
+							<view class="comment f-paragraph mt-sm"> {{item.text}} </view>
+						</view>
+					</view>
+					<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading"
+						v-if="loading">
+					</load-more>
+				</scroll-view>
+				<view class="comment-thumbs-info flex-center pd-lg f-caption b-1px-t" v-if="detail.status == 2">
+					<view class="input-text flex-y-center radius">
+						<i class="iconfont icon-edit ml-md mr-sm"></i>
+						<input ref="elInput" :adjust-position="true" :focus="inputFocus" @blur="inputBlur"
+							@confirm="toComment" v-model="subForm.text" maxlength="200" class="input" type="text"
+							placeholder="说点什么..." />
+					</view>
+				</view>
+				<view class="space-safe"></view>
+			</view>
+		</uni-popup>
+
+		<!-- 预约技-师 -->
+		<uni-popup ref="technician_item" type="bottom">
+			<view class="technician-popup fill-base">
+				<view @tap.stop="toTechnicianInfo" class="pd-lg flex-center">
+					<image mode="aspectFill" class="item-avatar radius" :src="detail.coach_info.work_img"></image>
+					<view class="flex-1 flex-between ml-md">
+						<view class="flex-y-center f-caption c-caption">
+							<view class="f-title c-title text-bold mr-sm max-350 ellipsis">
+								{{detail.coach_info.coach_name}}
+							</view>从业{{detail.coach_info.work_time}}年
+						</view>
+						<view class="flex-y-center f-caption c-caption">更多详情<i class="iconfont icongengduo"
+								style="font-size: 22rpx;"></i></view>
+					</view>
+				</view>
+				<view class="space-sm fill-body"></view>
+				<scroll-view scroll-y @touchmove.stop.prevent class="list-content">
+					<view class="technician-list-item flex-center pd-lg fill-base radius-16"
+						:class="[{'b-1px-t':index != 0}]" v-for="(item,index) in serviceList" :key="index">
+						<image @tap.stop="goDetail(index)" mode="aspectFill" class="avatar lg radius-16"
+							:src="item.cover"></image>
+						<view class="flex-1 ml-md">
+							<view @tap.stop="goDetail(index)" class="f-title c-title max-510 ellipsis">
+								{{item.title}}
+							</view>
+							<view class="f-caption c-caption mt-sm mb-sm ellipsis">{{item.total_sale}}人选择</view>
+							<view class="flex-between">
+								<view class="flex-y-baseline f-desc c-caption max-350 ellipsis">
+									<view class="text-delete mr-sm" v-if="item.init_price">¥{{item.init_price}}
+									</view>
+									<view class="f-title c-warning mr-sm">¥{{item.price}}</view>/
+									{{item.time_long}}分钟
+								</view>
+								<view class="flex-warp">
+									<block v-if="item.num">
+										<button @tap.stop="changeNum(-1,index)" class="reduce"
+											:style="{borderColor:primaryColor,color:primaryColor}"><i
+												class="iconfont icon-jian-bold"></i></button>
+										<button class="addreduce clear-btn">{{item.num || 0}}</button>
+									</block>
+									<button @tap.stop="changeNum(1,index)" class="add"
+										:style="{background:primaryColor,borderColor:primaryColor}"><i
+											class="iconfont icon-jia-bold"></i></button>
+								</view>
+							</view>
+						</view>
+					</view>
+				</scroll-view>
+				<view style="margin: 0 100rpx;" v-if="!loading&&serviceList.length<=0">
+					<abnor></abnor>
+				</view>
+				<view class="space-sm fill-body"></view>
+				<view class="flex-between pd-lg b-1px-t" v-if="carList.car_count > 0">
+					<view class="flex-center">合计：<view class="f-title c-warning text-bold ml-sm">
+							¥{{carList.car_price}}
+						</view>
+					</view>
+					<view @tap.stop="toOrder" class="order-btn flex-center f-desc c-base radius"
+						:style="{background: primaryColor}">提交订单
+					</view>
+				</view>
+				<view class="space-safe"></view>
+			</view>
+		</uni-popup>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		data() {
+			return {
+				iconType: {
+					1: 'icon-kefuwu',
+					2: 'iconjishifuwu',
+					3: 'iconkeyuyue'
+				},
+				textType: {
+					1: '可服务',
+					2: '服务中',
+					3: '可预约',
+					4: '不可预约'
+				},
+				options: {},
+				detail: {},
+				videoNavHeight: '15px',
+				showText: false,
+				loading: true,
+				param: {
+					page: 1
+				},
+				list: {
+					data: []
+				},
+				serviceList: [],
+				videoContexts: null,
+				isPlay: false,
+				scrollTop: 0,
+				pageScrollTop: 0,
+				showComment: false,
+				inputFocus: false,
+				subForm: {
+					text: ''
+				},
+				rule: [{
+					name: "text",
+					checkType: "isNotNull",
+					errorMsg: "请输入评论内容",
+					regType: 2
+				}],
+				popupInfo: {},
+				lockTap: false,
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+			location: state => state.user.location,
+			isGzhLogin: state => state.user.isGzhLogin,
+			carList: state => state.order.carList,
+		}),
+		onLoad(options) {
+			this.$util.showLoading()
+			this.options = options
+			this.param.dynamic_id = options.id
+			this.$util.showLoading()
+			this.initIndex()
+		},
+		onUnload() {
+			if (this.isPlay) {
+				this.videoContexts.pause()
+			}
+		},
+		onPageScroll(e) {
+			let {
+				scrollTop
+			} = e
+			this.pageScrollTop = scrollTop
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getUserInfo', 'getCarList', 'getServiceCoachList']),
+			...mapMutations(['updateUserItem']),
+			async initIndex(refresh = false) {
+				let {
+					pid = 0
+				} = this.options
+				
+				let {
+					isGzhLogin
+				} = this
+				let {
+					id: uid = 0
+				} = this.userInfo
+				if (pid && !uid) {
+					// #ifdef H5
+					if (isGzhLogin) {
+						setTimeout(() => {
+							this.getUserInfo()
+						}, 1000)
+					} else {
+						this.getUserInfo()
+					}
+					// #endif
+					// #ifndef H5
+					await this.getUserInfo()
+					// #endif 
+				}
+				
+				if (!this.configInfo.id || refresh) {
+					await this.getConfigInfo()
+				}
+				await this.getDetail()
+				await this.getList()
+				let {
+					navBarHeight
+				} = this.configInfo
+				// #ifdef MP-WEIXIN
+				this.videoNavHeight = navBarHeight * 1 + 15 + 'px'
+				// #endif
+				// #ifdef APP-PLUS
+				this.videoNavHeight = navBarHeight * 1 / 2 + 'px'
+				// #endif
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			async getDetail() {
+				let {
+					id
+				} = this.options
+
+				let {
+					location
+				} = this
+				if (!location.lat) {
+					// #ifdef H5
+					if (this.$jweixin.isWechat()) {
+						this.$util.showLoading()
+						// await this.$jweixin.initJssdk();
+						await this.$jweixin.wxReady2();
+						let {
+							latitude: lat = 0,
+							longitude: lng = 0
+						} = await this.$jweixin.getWxLocation()
+						location = {
+							lng,
+							lat,
+							address: '定位失败',
+							province: '',
+							city: '',
+							district: ''
+						}
+						if (lat && lng) {
+							let key = `${lat},${lng}`
+							let data = await this.$api.base.getMapInfo({
+								location: key
+							})
+							let {
+								status,
+								result
+							} = JSON.parse(data)
+							if (status == 0) {
+								let {
+									address,
+									address_component
+								} = result
+								let {
+									province,
+									city,
+									district
+								} = address_component
+								location = {
+									lng,
+									lat,
+									address,
+									province,
+									city,
+									district
+								}
+							}
+						}
+					}
+					// #endif
+					// #ifndef H5
+					location = await this.$util.getBmapLocation()
+					// #endif
+					this.updateUserItem({
+						key: 'location',
+						val: location
+					})
+				}
+				let {
+					lat = 0, lng = 0
+				} = location
+				let data = await this.$api.dynamic.coachDynamicInfo({
+					id,
+					lat,
+					lng
+				})
+				let have_show_text = data.text.length > 42
+				data.have_show_text = have_show_text
+				this.showText = !have_show_text
+				this.detail = data
+				this.$util.hideAll()
+			},
+			async getList() {
+				let {
+					list: oldList,
+					param
+				} = this
+				let newList = await this.$api.dynamic.commentList(param)
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+			},
+			goBanner(current) {
+				this.$util.previewImage({
+					current,
+					urls: this.detail.imgs
+				})
+			},
+			scrolltolower(e) {
+				if (this.list.current_page >= this.list.last_page || this.loading) return;
+				this.param.page = this.param.page + 1;
+				this.loading = true;
+				this.getList();
+			},
+			toShowHide(key) {
+				this[key] = !this[key]
+			},
+			inputBlur() {
+				if (this.showComment) {
+					this.$refs.comment_item.close()
+				}
+				this.$nextTick(() => {
+					this.showComment = false
+					this.inputFocus = false
+				}, 0)
+			},
+			// type 1关注，2点赞，3查看全部评论，4编辑评论，5删除评论，6驳回原因
+			async toChangeItem(type) {
+				let {
+					id,
+					coach_id,
+					cover: image,
+					type: dynamic_type,
+					follow_status,
+					thumbs_status,
+					thumbs_num,
+				} = this.detail
+				switch (type) {
+					case 1:
+					case 2:
+						let methodArr = {
+							1: {
+								methodKey: 'dynamic',
+								methodModel: 'followAddOrCancek',
+								param: {
+									dynamic_id: id,
+									coach_id
+								}
+							},
+							2: {
+								methodKey: 'dynamic',
+								methodModel: 'thumbsAddOrCancek',
+								param: {
+									dynamic_id: id
+								}
+							}
+						}
+						let {
+							methodKey,
+							methodModel,
+							param
+						} = methodArr[type]
+						await this.$api[methodKey][methodModel](param)
+						if (type == 1) {
+							this.detail.follow_status = follow_status ? 0 : 1
+						} else {
+							let num = thumbs_status ? -1 : 1
+							this.detail.thumbs_num = thumbs_num + num
+							this.detail.thumbs_status = num > 0 ? 1 : 0
+						}
+						break;
+					case 3:
+						this.showText = false
+						let {
+							scrollTop,
+							pageScrollTop
+						} = this
+						if (dynamic_type == 1 && (!scrollTop || (scrollTop && pageScrollTop < scrollTop))) {
+							if (!scrollTop) {
+								let {
+									navBarHeight = 88
+								} = this.configInfo
+								const query = uni.createSelectorQuery().in(this);
+								query.select('.comment-list-info').boundingClientRect(data => {
+									this.scrollTop = data.top - navBarHeight
+									uni.pageScrollTo({
+										scrollTop: data.top - navBarHeight,
+										duration: 0
+									})
+								}).exec();
+							} else {
+								uni.pageScrollTo({
+									scrollTop: scrollTop,
+									duration: 0
+								})
+							}
+						}
+						this.showComment = dynamic_type == 1
+						this.$refs.comment_item.open()
+						setTimeout(() => {
+							this.$nextTick(() => {
+								this.inputFocus = true
+								// this.$refs.elInput.focus()
+							}, 10)
+						}, 200)
+						break;
+					case 4:
+						this.$refs.show_item.close()
+						this.$util.goUrl({
+							url: `/dynamic/pages/technician/edit?id=${id}`
+						})
+						break;
+					case 5:
+					case 6:
+						this.$refs.show_item.close()
+						let refs_key = type == 5 ? 'del_dynamic_item' : 'check_text_item'
+						if (type == 5) {
+							this.popupInfo = {
+								id,
+								name: ``,
+								image,
+								index: -1,
+							}
+						}
+						this.$refs[refs_key].open()
+						break;
+				}
+			},
+			//表单验证
+			validate(param) {
+				let validate = new this.$util.Validate();
+				this.rule.map(item => {
+					let {
+						name,
+					} = item
+					validate.add(param[name], item);
+				})
+				let message = validate.start();
+				return message;
+			},
+			async toComment() {
+				let subForm = this.$util.deepCopy(this.subForm)
+				let {
+					id
+				} = this.options
+				subForm.dynamic_id = id
+				let msg = this.validate(subForm)
+				if (msg) return
+				subForm.text = subForm.text.substring(0, 200)
+				if (this.lockTap) return
+				this.lockTap = true
+				this.$util.showLoading()
+				try {
+					let {
+						status = 1
+					} = await this.$api.dynamic.commentAdd(subForm)
+					this.$util.hideAll()
+					this.$util.showToast({
+						title: status == 1 ? '正在审核中' : `评论成功`
+					})
+					this.lockTap = false
+					this.subForm.text = ''
+					if (this.showComment) {
+						this.$refs.comment_item.close()
+					}
+					this.$nextTick(() => {
+						this.showComment = false
+						this.inputFocus = false
+					}, 0)
+					setTimeout(() => {
+						this.initRefresh()
+					}, 1000)
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+			},
+			toDel(index) {
+				let {
+					id,
+					cover: image,
+					status
+				} = this.list.data[index]
+				this.popupInfo = {
+					id,
+					name: ``,
+					image: ``,
+					index,
+					status
+				}
+				this.$refs.del_item.open()
+			},
+			// 确认：删除评论/动态
+			async confirmDel() {
+				let {
+					id,
+					index,
+					status
+				} = this.popupInfo
+				let {
+					comment_num
+				} = this.detail
+				if (this.lockTap) return
+				this.lockTap = true
+				this.$util.showLoading()
+				let refs_key = index == -1 ? 'del_dynamic_item' : 'del_item'
+				let methodModel = index == -1 ? 'dynamicDel' : 'commentDel'
+				try {
+					await this.$api.dynamic[methodModel]({
+						id
+					})
+					this.lockTap = false
+					this.$util.hideAll()
+					this.$util.showToast({
+						title: `删除成功`
+					})
+					this.$refs[refs_key].close()
+					if (index != -1) {
+						this.list.data.splice(index, 1)
+						if (status != 1) {
+							this.detail.comment_num = comment_num - 1
+						}
+					} else {
+						setTimeout(() => {
+							this.$util.back()
+							this.$util.goUrl({
+								url: 1,
+								openType: `navigateBack`
+							})
+						}, 2000)
+					}
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+			},
+			async getServiceList() {
+				let {
+					is_work
+				} = this.detail.coach_info
+				if (!is_work) {
+					this.$util.showToast({
+						title: `该${this.$t('action.attendantName')}未上班`
+					})
+					return
+				}
+				let {
+					coach_id
+				} = this.detail
+				await this.getCarList({
+					coach_id
+				})
+				let {
+					data
+				} = await this.$api.service.coachServiceList({
+					coach_id
+				})
+				let arr = []
+				if (this.carList.list && this.carList.list.length > 0) {
+					this.carList.list.map(item => {
+						arr.push(item.service_id)
+					})
+				}
+				if (data && data.length > 0) {
+					data.map(item => {
+						if (arr.includes(item.id)) {
+							let carInd = arr.findIndex(aitem => {
+								return aitem == item.id
+							})
+							item.num = this.carList.list[carInd].num
+							item.cart_id = this.carList.list[carInd].id
+						}
+					})
+				}
+				this.serviceList = data
+				this.$refs.technician_item.open()
+			},
+			// 加/减数量
+			async changeNum(mol, serInd) {
+				let {
+					coach_id
+				} = this.detail
+				let {
+					id: service_id,
+					cart_id = 0
+				} = this.serviceList[serInd]
+				if (this.lockTap) return;
+				this.lockTap = true;
+				let methodModel = mol > 0 ? 'addCar' : 'delCar'
+				let param = mol > 0 ? {
+					service_id,
+					coach_id,
+					num: 1
+				} : {
+					id: cart_id,
+					num: 1
+				}
+				if (methodModel == 'delCar' && !param.id) {
+					this.lockTap = false
+					return
+				}
+				try {
+					let add_cart_id = await this.$api.order[methodModel](param)
+					let {
+						num = 0,
+							cart_id = 0
+					} = this.serviceList[serInd]
+					this.serviceList[serInd].num = num + mol
+					if (add_cart_id && mol > 0 && !cart_id) {
+						this.serviceList[serInd].cart_id = add_cart_id
+					}
+					if (this.serviceList[serInd].num < 1) {
+						this.serviceList[serInd].cart_id = 0
+					}
+					await this.getCarList({
+						coach_id
+					})
+					this.lockTap = false
+				} catch (e) {
+					this.lockTap = false
+				}
+			},
+			// 下单
+			toOrder() {
+				if (this.carList.car_count < 1) {
+					this.$util.showToast({
+						title: `请选择服务`
+					})
+					return
+				}
+				let {
+					coach_id: id
+				} = this.detail
+				this.$refs.technician_item.close()
+				this.$util.goUrl({
+					url: `/user/pages/order?id=${id}`
+				})
+			},
+			toTechnicianInfo() {
+				let {
+					coach_id
+				} = this.detail
+				this.$refs.technician_item.close()
+				this.$util.goUrl({
+					url: `/user/pages/technician-info?id=${coach_id}`
+				})
+			},
+			screenChange(e) {
+				let {
+					fullScreen = false
+				} = e.detail
+				if (!fullScreen) {
+					this.$nextTick(() => {
+						this.videoContexts.pause()
+						this.videoContexts = null
+						this.isPlay = false
+					})
+				}
+			},
+			playAndPauseVideo() {
+				let {
+					videoContexts = null
+				} = this
+				let isPlay = this.$util.deepCopy(this.isPlay)
+				if (videoContexts == null) {
+					let {
+						id
+					} = this.detail
+					this.videoContexts = uni.createVideoContext(`video_${id}`, this)
+					this.isPlay = true
+				}
+				let methodModel = !isPlay ? 'play' : 'pause'
+				this.$nextTick(() => {
+					// #ifdef APP-PLUS
+					if (!isPlay) {
+						this.videoContexts.requestFullScreen({
+							direction: 0
+						})
+					}
+					// #endif
+					this.videoContexts[methodModel]()
+				})
+			},
+			onPlay(e) {
+				this.isPlay = true
+			},
+			onPause(e) {
+				this.isPlay = false
+			},
+			onEnded(e) {
+				// #ifdef APP-PLUS
+				this.videoContexts.exitFullScreen()
+				// #endif
+				// #ifndef APP-PLUS
+				this.isPlay = false
+				// #endif
+			},
+			onError(e) {},
+			onTimeUpdate(e) {},
+			onWaiting(e) {},
+			onProgress(e) {},
+			onLoadedMetaData(e) {}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.dynamic-technician-detail {
+
+		.banner-info {
+			width: 750rpx;
+			height: 654rpx;
+		}
+
+		.menu-info {
+			top: 30rpx;
+			right: 30rpx;
+			width: 60rpx;
+			height: 60rpx;
+			background: rgba(2, 2, 2, 0.5);
+			z-index: 99991
+		}
+
+		.menu-info.type-video {
+			background: rgba(255, 255, 255, 0.5);
+		}
+
+		.dynamic-info {
+			.avatar {
+				width: 84rpx;
+				height: 84rpx;
+			}
+
+			.app-follow-btn {
+				width: 116rpx;
+				height: 56rpx;
+				transform: rotateZ(360deg);
+
+				.iconfont {
+					font-size: 24rpx;
+					margin-right: 6rpx;
+				}
+			}
+		}
+
+		.dynamic-content {
+			color: #222;
+			line-height: 40rpx;
+		}
+
+		.hide-text {
+			height: 180rpx;
+			overflow: hidden;
+		}
+
+		.video-box {
+			width: 100%;
+			height: calc(100vh - 100rpx);
+			padding-bottom: calc(env(safe-area-inset-bottom) / 2);
+
+			.video-poster {
+				width: 100%;
+				height: 100%;
+
+				.play-video {
+					width: 88rpx;
+					height: 88rpx;
+					background: rgba(2, 2, 2, 0.5);
+
+					.iconfont {
+						font-size: 38rpx;
+					}
+				}
+			}
+
+			.video-poster.abs {
+				top: 0;
+				left: 0;
+				z-index: 1;
+			}
+
+			.video_item {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+
+		.no-data-item {
+			padding-bottom: 280rpx;
+
+			.avatar {
+				width: 54rpx;
+				height: 54rpx;
+			}
+
+			.text {
+				width: 616rpx;
+				height: 56rpx;
+				color: #C7C7C7;
+				background: #F7F7F7;
+			}
+		}
+
+		.list-item {
+			.avatar {
+				width: 72rpx;
+				height: 72rpx;
+			}
+
+			.text {
+				color: #ADADAD;
+			}
+
+			.comment {
+				color: #3A3A3A;
+				line-height: 1.4;
+			}
+
+			.examine-btn {
+				width: 82rpx;
+				height: 34rpx;
+				color: #F96246;
+				background: rgba(249, 98, 70, 0.1);
+			}
+		}
+
+		.bottom-info {
+			width: 750rpx;
+			background: #fff;
+
+
+			.dynamic-info {
+				.avatar {
+					width: 66rpx;
+					height: 66rpx;
+				}
+
+				.ml-sm {
+					margin-left: 15rpx;
+				}
+
+				.app-follow-btn {
+					width: 110rpx;
+					height: 45rpx;
+					transform: rotateZ(360deg);
+					border: 1rpx solid #fff;
+
+					.iconfont {
+						font-size: 24rpx;
+						margin-right: 6rpx;
+					}
+				}
+			}
+
+			.dynamic-content {
+				max-height: 20vh;
+				overflow-y: auto;
+			}
+
+			.comment-thumbs-info {
+				height: 100rpx;
+
+				.input-text {
+					width: 372rpx;
+					height: 68rpx;
+					background: #F6F6F6;
+
+					.iconfont {
+						color: #C7C7C7;
+						font-size: 24rpx;
+					}
+
+					.input {
+						width: 294rpx;
+					}
+				}
+
+				.thumbs-comment-btn {
+					min-width: 102rpx;
+					color: #343434;
+
+					.iconfont {
+						font-size: 44rpx;
+						margin-right: 6rpx;
+					}
+				}
+			}
+
+			.video-comment-black {
+				bottom: 0;
+				height: 100rpx;
+				height: calc(100rpx + env(safe-area-inset-bottom) / 2);
+				padding-bottom: calc(env(safe-area-inset-bottom) / 2);
+				background: #000;
+				z-index: -1;
+			}
+		}
+
+		.bottom-info.type-video {
+			padding-top: 150rpx;
+			background: linear-gradient(180deg, rgba(0, 0, 0, 0) 0%, #000000 100%);
+
+			.input-text {
+				background: #191919;
+
+				.input {
+					color: #fff;
+				}
+			}
+
+			.thumbs-comment-btn {
+				color: #fff;
+			}
+		}
+
+		.show-popup {
+			width: 750rpx;
+			background: #F3F3F5;
+			border-radius: 30rpx 30rpx 0 0;
+
+			.avatar {
+				width: 84rpx;
+				height: 84rpx;
+			}
+
+			.show-item {
+				color: #222;
+				height: 100rpx;
+				background: #fff;
+			}
+		}
+
+		.comment-popup {
+			width: 750rpx;
+			border-radius: 30rpx 30rpx 0 0;
+
+			.icon-add {
+				font-size: 36rpx;
+				top: 32rpx;
+				right: 32rpx;
+			}
+
+			.scroll-list {
+				max-height: 70vh;
+			}
+
+			.comment-thumbs-info {
+				height: 100rpx;
+
+				.input-text {
+					width: 690rpx;
+					height: 68rpx;
+					background: #F6F6F6;
+
+					.iconfont {
+						color: #C7C7C7;
+						font-size: 24rpx;
+					}
+
+					.input {
+						width: 612rpx;
+					}
+				}
+			}
+		}
+
+		.technician-popup {
+			border-radius: 20rpx 20rpx 0 0;
+
+			.item-avatar {
+				width: 90rpx;
+				height: 90rpx;
+				background: #f4f6f8;
+			}
+
+			.icon-close {
+				font-size: 50rpx;
+			}
+
+			.technician-text {
+				max-height: 150rpx;
+			}
+
+			.list-content {
+				max-height: 50vh;
+			}
+
+			.order-btn {
+				width: 200rpx;
+				height: 72rpx;
+			}
+		}
+	}
+</style>
diff --git a/dynamic/pages/technician/edit.vue b/dynamic/pages/technician/edit.vue
new file mode 100644
index 0000000..dde2995
--- /dev/null
+++ b/dynamic/pages/technician/edit.vue
@@ -0,0 +1,273 @@
+<template>
+	<view class="dynamic-technician-add">
+		<view class="pd-lg">
+			<view class="pb-md" :class="[{'flex-warp': subForm.type == 2 }]">
+				<view class="mr-md" v-if="subForm.type == 2">
+					<upload @upload="imgUpload" @del="imgUpload" :imagelist="subForm.cover" filetype="picture"
+						imgtype="cover" text="上传封面" :imgsize="1">
+					</upload>
+				</view>
+				<upload @upload="imgUpload" @del="imgUpload" :imagelist="subForm.imgs"
+					:filetype="subForm.type == 1 ? 'picture' : 'video'" imgtype="imgs"
+					:text="subForm.type == 1 ? '上传图片' : '上传视频'" :imgsize="subForm.type == 1 ? 9 : 1">
+				</upload>
+			</view>
+			<view class="space-md"></view>
+			<input v-model="subForm.title" class="f-mini-title c-title" type="text" placeholder="填写标题有更多赞哟~"
+				placeholder-class="f-mini-title c-caption" maxlength="10" />
+			<view class="space-lg b-1px-b"></view>
+			<view class="space-lg"></view>
+			<textarea v-model="subForm.text" class="textarea f-desc c-title" maxlength="400"
+				placeholder="还有更多的想法也一起写到正文吧~" placeholder-class="f-desc c-caption"></textarea>
+		</view>
+		<view @tap.stop="toChooseLocation" class="pt-lg pl-lg pr-md flex-center f-desc">
+			<i class="iconfont icon-dingwei"></i>
+			<view class="flex-1 ml-sm mr-lg c-title ellipsis-2">
+				{{subForm.lat ? subForm.address : '添加地点'}}
+			</view>
+			<i class="iconfont icongengduo"></i>
+		</view>
+		<view class="space-max-footer"></view>
+		<fix-bottom-button @confirm="submit" :text="[{text:subForm.id?'编辑动态':'发布动态',type:'confirm'}]" bgColor="#fff">
+		</fix-bottom-button>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		data() {
+			return {
+				options: {},
+				subForm: {
+					id: 0,
+					cover: [],
+					imgs: [],
+					type: 1,
+					title: '',
+					text: '',
+					lat: '',
+					lng: '',
+					address: ''
+				},
+				rule: [{
+						name: "cover",
+						checkType: "isNotNull",
+						errorMsg: "请上传封面图"
+					}, {
+						name: "imgs",
+						checkType: "isNotNull",
+						errorMsg: ""
+					}, {
+						name: "title",
+						checkType: "isNotNull",
+						errorMsg: "请输入标题",
+						regType: 2
+					},
+					{
+						name: "text",
+						checkType: "isNotNull",
+						errorMsg: "请输入正文内容",
+						regType: 2
+					},
+					{
+						name: "address",
+						checkType: "isNotNull",
+						errorMsg: "请选择定位地点"
+					}
+				],
+				lockTap: false
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+			location: state => state.user.location,
+			haveShieldOper: state => state.user.haveShieldOper,
+		}),
+		onLoad(options) {
+			let {
+				type
+			} = options
+			type = type * 1
+			this.options = options
+			this.subForm.type = type
+			this.rule[1].errorMsg = type == 1 ? '请上传图片' : '请上传视频'
+			this.initIndex()
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+		},
+		methods: {
+			...mapMutations(['updateUserItem']),
+			async initIndex() {
+				let {
+					id = 0
+				} = this.options
+				if (!id) return
+				let data = await this.$api.dynamic.coachDynamicInfo({
+					id
+				})
+				data.cover = [{
+					path: data.cover
+				}]
+				data.imgs = data.imgs.map(item => {
+					return {
+						path: item
+					}
+				})
+				for (let key in this.subForm) {
+					this.subForm[key] = data[key]
+				}
+			},
+			imgUpload(e) {
+				let {
+					imagelist,
+					imgtype
+				} = e;
+				this.subForm[imgtype] = imagelist;
+			},
+			// 选择地区
+			async toChooseLocation(e) {
+				await this.$util.checkAuth({
+					type: 'userLocation'
+				})
+				let {
+					lat: locaLat = '',
+					lng: locaLng = ''
+				} = this.location
+				let {
+					id = 0,
+						lat: addrLat,
+						lng: addrLng
+				} = this.subForm
+
+				if (id) {
+					locaLat = addrLat
+					locaLng = addrLng
+				}
+
+				let param = {}
+				if (!locaLat && !locaLng) {
+					// #ifdef H5
+					if (this.$jweixin.isWechat()) {
+						this.$util.showLoading()
+						await this.$jweixin.wxReady2();
+						let {
+							latitude,
+							longitude
+						} = await this.$jweixin.getWxLocation()
+						locaLat = latitude
+						locaLng = longitude
+					}
+					// #endif
+					// #ifdef APP-PLUS
+					let location = await this.$util.getBmapLocation()
+					locaLat = location.lat
+					locaLng = location.lng
+					// #endif
+				}
+
+				// #ifndef MP-WEIXIN
+				param = {
+					latitude: locaLat,
+					longitude: locaLng
+				}
+				// #endif
+				let [, {
+					address = '',
+					longitude: lng,
+					latitude: lat,
+				}] = await uni.chooseLocation(param);
+				if (!lng) return
+				this.subForm.address = address
+				this.subForm.lat = lat
+				this.subForm.lng = lng
+			},
+			//表单验证
+			validate(param) {
+				let validate = new this.$util.Validate();
+				this.rule.map(item => {
+					let {
+						name,
+					} = item
+					validate.add(param[name], item);
+				})
+				let message = validate.start();
+				return message;
+			},
+			async submit() {
+				let subForm = this.$util.deepCopy(this.subForm)
+				subForm.imgs = subForm.imgs && subForm.imgs.length > 0 ? subForm.imgs.map(item => {
+					return item.path
+				}) : []
+				let url = subForm.type == 1 ? subForm.imgs.length > 0 ? subForm.imgs[0] : '' : subForm.cover && subForm
+					.cover.length > 0 ? subForm.cover[0].path : ''
+				subForm.cover = url
+				let msg = this.validate(subForm);
+				if (msg) {
+					this.$util.showToast({
+						title: msg
+					});
+					return;
+				}
+				if (this.lockTap) return
+				this.lockTap = true
+				this.$util.showLoading()
+				try {
+					let methodModel = subForm.id ? 'dynamicUpdate' : 'dynamicAdd'
+					let {
+						status = 1
+					} = await this.$api.dynamic[methodModel](subForm)
+					this.$util.hideAll()
+					this.$util.showToast({
+						title: status == 1 ? '正在审核中' : subForm.id ? `编辑成功` : `发布成功`
+					})
+					this.updateUserItem({
+						key: 'haveShieldOper',
+						val: 1
+					})
+					setTimeout(() => {
+						this.$util.back()
+						this.$util.goUrl({
+							url: 1,
+							openType: `navigateBack`
+						})
+					}, 2000)
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background: #fff;
+	}
+
+	.dynamic-technician-add {
+		.icon-dingwei {
+			font-size: 28rpx;
+		}
+
+		.icongengduo {
+			font-size: 26rpx;
+			color: #9B9B9B;
+		}
+
+		.textarea {
+			width: 690rpx;
+		}
+	}
+</style>
diff --git a/dynamic/pages/technician/follow.vue b/dynamic/pages/technician/follow.vue
new file mode 100644
index 0000000..4557753
--- /dev/null
+++ b/dynamic/pages/technician/follow.vue
@@ -0,0 +1,130 @@
+<template>
+	<view class="dynamic-technician-follow">
+		<view class="list-item flex-center ml-lg mr-lg pt-lg pb-lg" :class="[{'b-1px-t':index!==0}]"
+			v-for="(item,index) in list.data" :key="index">
+			<image mode="aspectFill" class="avatar radius" :src="item.avatarUrl"></image>
+			<view class="flex-1 flex-between ml-md">
+				<view>
+					<view class="f-paragraph c-title text-bold max-470 ellipsis">{{item.nickName}}</view>
+					<view class="text f-caption">开始关注了你</view>
+				</view>
+				<view class="time f-icontext">{{item.friend_time}}</view>
+			</view>
+		</view>
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+		<view class="space-footer"></view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		data() {
+			return {
+				loading: true,
+				param: {
+					page: 1
+				},
+				list: {
+					data: []
+				}
+
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad() {
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+			this.initIndex()
+		}, 
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				this.getList();
+			},
+			handerTabChange(index) {
+				this.activeIndex = index
+				this.param.status = index
+				this.getList();
+			},
+
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			async getList() {
+				this.$util.showLoading()
+				let {
+					list: oldList,
+					param
+				} = this
+				let newList = await this.$api.dynamic.followList(param)
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background: #fff;
+	}
+
+	.dynamic-technician-follow {
+		.list-item {
+			.avatar {
+				width: 72rpx;
+				height: 72rpx;
+			}
+
+			.text {
+				color: #ADADAD;
+				margin-top: 6rpx;
+			}
+
+			.time {
+				color: #9B9B9B;
+			}
+		}
+	}
+</style>
diff --git a/dynamic/pages/technician/list.vue b/dynamic/pages/technician/list.vue
new file mode 100644
index 0000000..0832e84
--- /dev/null
+++ b/dynamic/pages/technician/list.vue
@@ -0,0 +1,341 @@
+<template>
+	<view class="dynamic-technician-list" v-if="isLoad">
+		<fixed>
+			<view class="fill-body">
+				<view class="count-list flex-center fill-base">
+					<view @tap.stop="$util.goUrl({url:`/dynamic/pages/technician/thumbs`})"
+						class="count-item flex-center flex-column f-caption c-title">
+						<view class="tag thumbs flex-center rel">
+							<i class="iconfont icon-shoucang-fill"></i>
+							<view class="count-tag flex-center f-icontext c-base abs"
+								:style="{width: count.thumbs_num < 10 ? '26rpx':'50rpx',right:count.thumbs_num < 10 ? '-13rpx':'-38rpx'}"
+								v-if="count.thumbs_num">
+								{{count.thumbs_num < 100 ? count.thumbs_num : '99+'}}
+							</view>
+						</view>
+						<view class="mt-md">收获的赞</view>
+					</view>
+					<view @tap.stop="$util.goUrl({url:`/dynamic/pages/technician/follow`})"
+						class="count-item flex-center flex-column f-caption c-title">
+						<view class="tag follow flex-center rel">
+							<i class="iconfont iconxinzengguanzhu"></i>
+							<view class="count-tag flex-center f-icontext c-base abs"
+								:style="{width: count.follow_num < 10 ? '26rpx':'50rpx',right:count.follow_num < 10 ? '-13rpx':'-38rpx'}"
+								v-if="count.follow_num">
+								{{count.follow_num < 100 ? count.follow_num : '99+'}}
+							</view>
+						</view>
+						<view class="mt-md">新增关注</view>
+					</view>
+					<view @tap.stop="$util.goUrl({url:`/dynamic/pages/technician/comment`})"
+						class="count-item flex-center flex-column f-caption c-title">
+						<view class="tag comment flex-center rel">
+							<i class="iconfont iconshouhuodepinglun"></i>
+							<view class="count-tag flex-center f-icontext c-base abs"
+								:style="{width: count.comment_num < 10 ? '26rpx':'50rpx',right:count.comment_num < 10 ? '-13rpx':'-38rpx'}"
+								v-if="count.comment_num">
+								{{count.comment_num < 100 ? count.comment_num : '99+'}}
+							</view>
+						</view>
+						<view class="mt-md">收获的评论</view>
+					</view>
+				</view>
+				<view class="rel">
+					<view class="flex-between pd-lg">
+						<view class="f-title text-bold">我的发布</view>
+						<view @tap.stop="toChangeItem(-1)" class="flex-y-center f-desc">
+							{{statusList[statusInd].title}}<i class="iconfont c-desc ml-sm"
+								:class="[{'iconshaixuanxia-1':showSort},{'iconshaixuanshang-1':!showSort}]"
+								style="font-size: 20rpx"></i>
+						</view>
+					</view>
+					<view class="dynamic-sort pt-md pb-md f-desc abs" v-if="showSort">
+						<view @tap.stop="toChangeItem(index)" class="sort-item flex-center"
+							:style="{color:statusInd == index ? primaryColor : ''}" v-for="(item,index) in statusList"
+							:key="index">
+							{{item.title}}
+						</view>
+					</view>
+				</view>
+			</view>
+		</fixed>
+
+		<wfalls-flow :list="list.data" :path="2" ref="wfalls" v-if="list.data.length > 0"></wfalls-flow>
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+		<view class="space-footer"></view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	import wfallsFlow from "@/components/wfalls-flow.vue"
+	export default {
+		components: {
+			wfallsFlow
+		},
+		data() {
+			return {
+				isLoad: false,
+				statusList: [{
+					id: 0,
+					title: '全部'
+				}, {
+					id: 1,
+					title: '审核中'
+				}, {
+					id: 2,
+					title: '审核通过'
+				}, {
+					id: 3,
+					title: '已驳回'
+				}],
+				statusInd: 0,
+				showSort: false,
+				loading: true,
+				param: {
+					page: 1,
+					limit: 10,
+					status: 0
+				},
+				list: {
+					data: []
+				},
+				count: {}
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+			location: state => state.user.location,
+			haveShieldOper: state => state.user.haveShieldOper,
+		}),
+		onLoad() {
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+			this.$util.showLoading()
+			this.initIndex()
+		},
+		async onShow() {
+			if (this.haveShieldOper == 1) {
+				await this.initRefresh()
+				this.updateUserItem({
+					key: 'haveShieldOper',
+					val: 0
+				})
+			} else {
+				this.getDynamicData()
+			}
+		},
+		async onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			await this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		async onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			await this.getList();
+			setTimeout(() => {
+				this.$refs.wfalls.handleViewRender();
+			}, 0)
+		},
+		methods: {
+			...mapMutations(['updateUserItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				if (refresh) {
+					await Promise.all([this.getDynamicData(), this.getList(1)])
+				} else {
+					await this.getList(1)
+				}
+			},
+			async initRefresh() {
+				await this.initIndex(true)
+			},
+			async getDynamicData() {
+				this.count = await this.$api.dynamic.dynamicData()
+			},
+			async getList(flag) {
+				if (flag) {
+					this.showSort = false
+					this.param.page = 1
+					this.list.data = []
+				}
+				let {
+					location
+				} = this
+				if (!location.lat) {
+					// #ifdef H5
+					if (this.$jweixin.isWechat()) {
+						this.$util.showLoading()
+						// await this.$jweixin.initJssdk();
+						await this.$jweixin.wxReady2();
+						let {
+							latitude: lat = 0,
+							longitude: lng = 0
+						} = await this.$jweixin.getWxLocation()
+						location = {
+							lng,
+							lat,
+							address: '定位失败',
+							province: '',
+							city: '',
+							district: ''
+						}
+						if (lat && lng) {
+							let key = `${lat},${lng}`
+							let data = await this.$api.base.getMapInfo({
+								location: key
+							})
+							let {
+								status,
+								result
+							} = JSON.parse(data)
+							if (status == 0) {
+								let {
+									address,
+									address_component
+								} = result
+								let {
+									province,
+									city,
+									district
+								} = address_component
+								location = {
+									lng,
+									lat,
+									address,
+									province,
+									city,
+									district
+								}
+							}
+						}
+					}
+					// #endif
+					// #ifndef H5
+					location = await this.$util.getBmapLocation()
+					// #endif
+					this.updateUserItem({
+						key: 'location',
+						val: location
+					})
+				}
+				let {
+					lat = 0, lng = 0
+				} = location
+
+				let {
+					list: oldList,
+					param,
+					statusList,
+					statusInd
+				} = this
+				param.lat = lat
+				param.lng = lng
+				param.status = statusList[statusInd].id
+				let newList = await this.$api.dynamic.coachDynamicList(param)
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.isLoad = true
+				this.loading = false
+				this.$util.hideAll()
+			},
+			toChangeItem(index) {
+				if (index == -1) {
+					this.showSort = !this.showSort
+				} else {
+					this.statusInd = index
+					this.showSort = false
+					this.initRefresh()
+				}
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+	.dynamic-technician-list {
+		.count-list {
+			width: 750rpx;
+			height: 204rpx;
+
+			.count-item {
+				width: 33.33%;
+
+				.tag {
+					width: 85rpx;
+					height: 85rpx;
+					border-radius: 29rpx;
+
+					.iconfont {
+						font-size: 44rpx;
+					}
+
+					.count-tag {
+						top: 0;
+						right: -13rpx;
+						width: 26rpx;
+						height: 26rpx;
+						background: #E82F21;
+						border-radius: 26rpx;
+					}
+				}
+
+				.thumbs {
+					color: #ff6262;
+					background: #FFEFEF;
+				}
+
+				.follow {
+					color: #FC8218;
+					background: #FEF6E7;
+				}
+
+				.comment {
+					color: #44A860;
+					background: #ECF6EF;
+				}
+			}
+		}
+
+		.dynamic-sort {
+			top: 80rpx;
+			right: 32rpx;
+			width: 145rpx;
+			background: #FEFFFE;
+			box-shadow: 0 14rpx 20rpx 0 rgba(132, 132, 132, 0.08);
+			border-radius: 4rpx;
+			border: 1rpx solid #EFEFEF;
+			transform: rotateZ(360deg);
+			z-index: 1;
+
+			.sort-item {
+				padding: 15rpx 0;
+			}
+		}
+	}
+</style>
diff --git a/dynamic/pages/technician/thumbs.vue b/dynamic/pages/technician/thumbs.vue
new file mode 100644
index 0000000..56de56e
--- /dev/null
+++ b/dynamic/pages/technician/thumbs.vue
@@ -0,0 +1,126 @@
+<template>
+	<view class="dynamic-technician-thumbs">
+		<view class="list-item flex-center ml-lg mr-lg pt-lg pb-lg" :class="[{'b-1px-t':index!==0}]"
+			v-for="(item,index) in list.data" :key="index">
+			<image mode="aspectFill" class="avatar radius" :src="item.avatarUrl"></image>
+			<view class="flex-1 flex-between ml-md">
+				<view>
+					<view class="f-paragraph c-title text-bold max-470 ellipsis">{{item.nickName}}</view>
+					<view class="text flex-y-center f-caption">赞了你的动态<view class="ml-md">{{item.friend_time}}</view>
+					</view>
+				</view>
+				<image mode="aspectFill" class="cover radius-16" :src="item.cover"></image>
+			</view>
+		</view>
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+		<view class="space-footer"></view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		data() {
+			return {
+				loading: true,
+				param: {
+					page: 1
+				},
+				list: {
+					data: []
+				}
+
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad() {
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+			this.initIndex()
+		}, 
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				this.getList();
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			async getList() {
+				this.$util.showLoading()
+				let {
+					list: oldList,
+					param
+				} = this
+				let newList = await this.$api.dynamic.thumbsList(param)
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background: #fff;
+	}
+
+	.dynamic-technician-thumbs {
+		.list-item {
+			.avatar {
+				width: 72rpx;
+				height: 72rpx;
+			}
+
+			.cover {
+				width: 107rpx;
+				height: 107rpx;
+			}
+
+			.text {
+				color: #ADADAD;
+				margin-top: 6rpx;
+			}
+		}
+	}
+</style>
diff --git a/jweixin-module/README.md b/jweixin-module/README.md
new file mode 100644
index 0000000..7c91d7b
--- /dev/null
+++ b/jweixin-module/README.md
@@ -0,0 +1,30 @@
+# jweixin-module
+
+微信JS-SDK
+
+## 安装
+
+### NPM
+
+```shell
+npm install jweixin-module --save
+```
+
+### UMD
+
+```http
+https://unpkg.com/jweixin-module/out/index.js
+```
+
+## 使用
+
+```js
+var jweixin = require('jweixin-module')
+jweixin.ready(function(){
+    // TODO
+});
+```
+
+## 完整API
+
+>[微信JS-SDK说明文档](https://mp.weixin.qq.com/wiki?t=resource/res_main&id=mp1421141115)
diff --git a/jweixin-module/lib/index.js b/jweixin-module/lib/index.js
new file mode 100644
index 0000000..ae4baaf
--- /dev/null
+++ b/jweixin-module/lib/index.js
@@ -0,0 +1 @@
+!function(e,n){"function"==typeof define&&(define.amd||define.cmd)?define(function(){return n(e)}):n(e,!0)}(window,function(o,e){if(!o.jWeixin){var n,c={config:"preVerifyJSAPI",onMenuShareTimeline:"menu:share:timeline",onMenuShareAppMessage:"menu:share:appmessage",onMenuShareQQ:"menu:share:qq",onMenuShareWeibo:"menu:share:weiboApp",onMenuShareQZone:"menu:share:QZone",previewImage:"imagePreview",getLocation:"geoLocation",openProductSpecificView:"openProductViewWithPid",addCard:"batchAddCard",openCard:"batchViewCard",chooseWXPay:"getBrandWCPayRequest",openEnterpriseRedPacket:"getRecevieBizHongBaoRequest",startSearchBeacons:"startMonitoringBeacons",stopSearchBeacons:"stopMonitoringBeacons",onSearchBeacons:"onBeaconsInRange",consumeAndShareCard:"consumedShareCard",openAddress:"editAddress"},a=function(){var e={};for(var n in c)e[c[n]]=n;return e}(),i=o.document,t=i.title,r=navigator.userAgent.toLowerCase(),s=navigator.platform.toLowerCase(),d=!(!s.match("mac")&&!s.match("win")),u=-1!=r.indexOf("wxdebugger"),l=-1!=r.indexOf("micromessenger"),p=-1!=r.indexOf("android"),f=-1!=r.indexOf("iphone")||-1!=r.indexOf("ipad"),m=(n=r.match(/micromessenger\/(\d+\.\d+\.\d+)/)||r.match(/micromessenger\/(\d+\.\d+)/))?n[1]:"",g={initStartTime:L(),initEndTime:0,preVerifyStartTime:0,preVerifyEndTime:0},h={version:1,appId:"",initTime:0,preVerifyTime:0,networkType:"",isPreVerifyOk:1,systemType:f?1:p?2:-1,clientVersion:m,url:encodeURIComponent(location.href)},v={},S={_completes:[]},y={state:0,data:{}};O(function(){g.initEndTime=L()});var I=!1,_=[],w={config:function(e){B("config",v=e);var t=!1!==v.check;O(function(){if(t)M(c.config,{verifyJsApiList:C(v.jsApiList),verifyOpenTagList:C(v.openTagList)},function(){S._complete=function(e){g.preVerifyEndTime=L(),y.state=1,y.data=e},S.success=function(e){h.isPreVerifyOk=0},S.fail=function(e){S._fail?S._fail(e):y.state=-1};var t=S._completes;return t.push(function(){!function(){if(!(d||u||v.debug||m<"6.0.2"||h.systemType<0)){var i=new Image;h.appId=v.appId,h.initTime=g.initEndTime-g.initStartTime,h.preVerifyTime=g.preVerifyEndTime-g.preVerifyStartTime,w.getNetworkType({isInnerInvoke:!0,success:function(e){h.networkType=e.networkType;var n="https://open.weixin.qq.com/sdk/report?v="+h.version+"&o="+h.isPreVerifyOk+"&s="+h.systemType+"&c="+h.clientVersion+"&a="+h.appId+"&n="+h.networkType+"&i="+h.initTime+"&p="+h.preVerifyTime+"&u="+h.url;i.src=n}})}}()}),S.complete=function(e){for(var n=0,i=t.length;n<i;++n)t[n]();S._completes=[]},S}()),g.preVerifyStartTime=L();else{y.state=1;for(var e=S._completes,n=0,i=e.length;n<i;++n)e[n]();S._completes=[]}}),w.invoke||(w.invoke=function(e,n,i){o.WeixinJSBridge&&WeixinJSBridge.invoke(e,x(n),i)},w.on=function(e,n){o.WeixinJSBridge&&WeixinJSBridge.on(e,n)})},ready:function(e){0!=y.state?e():(S._completes.push(e),!l&&v.debug&&e())},error:function(e){m<"6.0.2"||(-1==y.state?e(y.data):S._fail=e)},checkJsApi:function(e){M("checkJsApi",{jsApiList:C(e.jsApiList)},(e._complete=function(e){if(p){var n=e.checkResult;n&&n.constructor === String&&(e.checkResult=JSON.parse(n))}e=function(e){var n=e.checkResult;for(var i in n){var t=a[i];t&&(n[t]=n[i],delete n[i])}return e}(e)},e))},onMenuShareTimeline:function(e){P(c.onMenuShareTimeline,{complete:function(){M("shareTimeline",{title:e.title||t,desc:e.title||t,img_url:e.imgUrl||"",link:e.link||location.href,type:e.type||"link",data_url:e.dataUrl||""},e)}},e)},onMenuShareAppMessage:function(n){P(c.onMenuShareAppMessage,{complete:function(e){"favorite"===e.scene?M("sendAppMessage",{title:n.title||t,desc:n.desc||"",link:n.link||location.href,img_url:n.imgUrl||"",type:n.type||"link",data_url:n.dataUrl||""}):M("sendAppMessage",{title:n.title||t,desc:n.desc||"",link:n.link||location.href,img_url:n.imgUrl||"",type:n.type||"link",data_url:n.dataUrl||""},n)}},n)},onMenuShareQQ:function(e){P(c.onMenuShareQQ,{complete:function(){M("shareQQ",{title:e.title||t,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},onMenuShareWeibo:function(e){P(c.onMenuShareWeibo,{complete:function(){M("shareWeiboApp",{title:e.title||t,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},onMenuShareQZone:function(e){P(c.onMenuShareQZone,{complete:function(){M("shareQZone",{title:e.title||t,desc:e.desc||"",img_url:e.imgUrl||"",link:e.link||location.href},e)}},e)},updateTimelineShareData:function(e){M("updateTimelineShareData",{title:e.title,link:e.link,imgUrl:e.imgUrl},e)},updateAppMessageShareData:function(e){M("updateAppMessageShareData",{title:e.title,desc:e.desc,link:e.link,imgUrl:e.imgUrl},e)},startRecord:function(e){M("startRecord",{},e)},stopRecord:function(e){M("stopRecord",{},e)},onVoiceRecordEnd:function(e){P("onVoiceRecordEnd",e)},playVoice:function(e){M("playVoice",{localId:e.localId},e)},pauseVoice:function(e){M("pauseVoice",{localId:e.localId},e)},stopVoice:function(e){M("stopVoice",{localId:e.localId},e)},onVoicePlayEnd:function(e){P("onVoicePlayEnd",e)},uploadVoice:function(e){M("uploadVoice",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},downloadVoice:function(e){M("downloadVoice",{serverId:e.serverId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},translateVoice:function(e){M("translateVoice",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},chooseImage:function(e){M("chooseImage",{scene:"1|2",count:e.count||9,sizeType:e.sizeType||["original","compressed"],sourceType:e.sourceType||["album","camera"]},(e._complete=function(e){if(p){var n=e.localIds;try{n&&(e.localIds=JSON.parse(n))}catch(e){}}},e))},getLocation:function(e){},previewImage:function(e){M(c.previewImage,{current:e.current,urls:e.urls},e)},uploadImage:function(e){M("uploadImage",{localId:e.localId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},downloadImage:function(e){M("downloadImage",{serverId:e.serverId,isShowProgressTips:0==e.isShowProgressTips?0:1},e)},getLocalImgData:function(e){!1===I?(I=!0,M("getLocalImgData",{localId:e.localId},(e._complete=function(e){if(I=!1,0<_.length){var n=_.shift();wx.getLocalImgData(n)}},e))):_.push(e)},getNetworkType:function(e){M("getNetworkType",{},(e._complete=function(e){e=function(e){var n=e.errMsg;e.errMsg="getNetworkType:ok";var i=e.subtype;if(delete e.subtype,i)e.networkType=i;else{var t=n.indexOf(":"),o=n.substring(t+1);switch(o){case"wifi":case"edge":case"wwan":e.networkType=o;break;default:e.errMsg="getNetworkType:fail"}}return e}(e)},e))},openLocation:function(e){M("openLocation",{latitude:e.latitude,longitude:e.longitude,name:e.name||"",address:e.address||"",scale:e.scale||28,infoUrl:e.infoUrl||""},e)},getLocation:function(e){M(c.getLocation,{type:(e=e||{}).type||"wgs84"},(e._complete=function(e){delete e.type},e))},hideOptionMenu:function(e){M("hideOptionMenu",{},e)},showOptionMenu:function(e){M("showOptionMenu",{},e)},closeWindow:function(e){M("closeWindow",{},e=e||{})},hideMenuItems:function(e){M("hideMenuItems",{menuList:e.menuList},e)},showMenuItems:function(e){M("showMenuItems",{menuList:e.menuList},e)},hideAllNonBaseMenuItem:function(e){M("hideAllNonBaseMenuItem",{},e)},showAllNonBaseMenuItem:function(e){M("showAllNonBaseMenuItem",{},e)},scanQRCode:function(e){M("scanQRCode",{needResult:(e=e||{}).needResult||0,scanType:e.scanType||["qrCode","barCode"]},(e._complete=function(e){if(f){var n=e.resultStr;if(n){var i=JSON.parse(n);e.resultStr=i&&i.scan_code&&i.scan_code.scan_result}}},e))},openAddress:function(e){M(c.openAddress,{},(e._complete=function(e){e=function(e){return e.postalCode=e.addressPostalCode,delete e.addressPostalCode,e.provinceName=e.proviceFirstStageName,delete e.proviceFirstStageName,e.cityName=e.addressCitySecondStageName,delete e.addressCitySecondStageName,e.countryName=e.addressCountiesThirdStageName,delete e.addressCountiesThirdStageName,e.detailInfo=e.addressDetailInfo,delete e.addressDetailInfo,e}(e)},e))},openProductSpecificView:function(e){M(c.openProductSpecificView,{pid:e.productId,view_type:e.viewType||0,ext_info:e.extInfo},e)},addCard:function(e){for(var n=e.cardList,i=[],t=0,o=n.length;t<o;++t){var r=n[t],a={card_id:r.cardId,card_ext:r.cardExt};i.push(a)}M(c.addCard,{card_list:i},(e._complete=function(e){var n=e.card_list;if(n){for(var i=0,t=(n=JSON.parse(n)).length;i<t;++i){var o=n[i];o.cardId=o.card_id,o.cardExt=o.card_ext,o.isSuccess=!!o.is_succ,delete o.card_id,delete o.card_ext,delete o.is_succ}e.cardList=n,delete e.card_list}},e))},chooseCard:function(e){M("chooseCard",{app_id:v.appId,location_id:e.shopId||"",sign_type:e.signType||"SHA1",card_id:e.cardId||"",card_type:e.cardType||"",card_sign:e.cardSign,time_stamp:e.timestamp+"",nonce_str:e.nonceStr},(e._complete=function(e){e.cardList=e.choose_card_info,delete e.choose_card_info},e))},openCard:function(e){for(var n=e.cardList,i=[],t=0,o=n.length;t<o;++t){var r=n[t],a={card_id:r.cardId,code:r.code};i.push(a)}M(c.openCard,{card_list:i},e)},consumeAndShareCard:function(e){M(c.consumeAndShareCard,{consumedCardId:e.cardId,consumedCode:e.code},e)},chooseWXPay:function(e){M(c.chooseWXPay,V(e),e)},openEnterpriseRedPacket:function(e){M(c.openEnterpriseRedPacket,V(e),e)},startSearchBeacons:function(e){M(c.startSearchBeacons,{ticket:e.ticket},e)},stopSearchBeacons:function(e){M(c.stopSearchBeacons,{},e)},onSearchBeacons:function(e){P(c.onSearchBeacons,e)},openEnterpriseChat:function(e){M("openEnterpriseChat",{useridlist:e.userIds,chatname:e.groupName},e)},launchMiniProgram:function(e){M("launchMiniProgram",{targetAppId:e.targetAppId,path:function(e){if("string"==typeof e&&0<e.length){var n=e.split("?")[0],i=e.split("?")[1];return n+=".html",void 0!==i?n+"?"+i:n}}(e.path),envVersion:e.envVersion},e)},openBusinessView:function(e){M("openBusinessView",{businessType:e.businessType,queryString:e.queryString||"",envVersion:e.envVersion},(e._complete=function(n){if(p){var e=n.extraData;if(e)try{n.extraData=JSON.parse(e)}catch(e){n.extraData={}}}},e))},miniProgram:{navigateBack:function(e){e=e||{},O(function(){M("invokeMiniProgramAPI",{name:"navigateBack",arg:{delta:e.delta||1}},e)})},navigateTo:function(e){O(function(){M("invokeMiniProgramAPI",{name:"navigateTo",arg:{url:e.url}},e)})},redirectTo:function(e){O(function(){M("invokeMiniProgramAPI",{name:"redirectTo",arg:{url:e.url}},e)})},switchTab:function(e){O(function(){M("invokeMiniProgramAPI",{name:"switchTab",arg:{url:e.url}},e)})},reLaunch:function(e){O(function(){M("invokeMiniProgramAPI",{name:"reLaunch",arg:{url:e.url}},e)})},postMessage:function(e){O(function(){M("invokeMiniProgramAPI",{name:"postMessage",arg:e.data||{}},e)})},getEnv:function(e){O(function(){e({miniprogram:"miniprogram"===o.__wxjs_environment})})}}},T=1,k={};return i.addEventListener("error",function(e){if(!p){var n=e.target,i=n.tagName,t=n.src;if("IMG"==i||"VIDEO"==i||"AUDIO"==i||"SOURCE"==i)if(-1!=t.indexOf("wxlocalresource://")){e.preventDefault(),e.stopPropagation();var o=n["wx-id"];if(o||(o=T++,n["wx-id"]=o),k[o])return;k[o]=!0,wx.ready(function(){wx.getLocalImgData({localId:t,success:function(e){n.src=e.localData}})})}}},!0),i.addEventListener("load",function(e){if(!p){var n=e.target,i=n.tagName;n.src;if("IMG"==i||"VIDEO"==i||"AUDIO"==i||"SOURCE"==i){var t=n["wx-id"];t&&(k[t]=!1)}}},!0),e&&(o.wx=o.jWeixin=w),w}function M(n,e,i){o.WeixinJSBridge?WeixinJSBridge.invoke(n,x(e),function(e){A(n,e,i)}):B(n,i)}function P(n,i,t){o.WeixinJSBridge?WeixinJSBridge.on(n,function(e){t&&t.trigger&&t.trigger(e),A(n,e,i)}):B(n,t||i)}function x(e){return(e=e||{}).appId=v.appId,e.verifyAppId=v.appId,e.verifySignType="sha1",e.verifyTimestamp=v.timestamp+"",e.verifyNonceStr=v.nonceStr,e.verifySignature=v.signature,e}function V(e){return{timeStamp:e.timestamp+"",nonceStr:e.nonceStr,package:e.package,paySign:e.paySign,signType:e.signType||"SHA1"}}function A(e,n,i){"openEnterpriseChat"!=e&&"openBusinessView"!==e||(n.errCode=n.err_code),delete n.err_code,delete n.err_desc,delete n.err_detail;var t=n.errMsg;t||(t=n.err_msg,delete n.err_msg,t=function(e,n){var i=e,t=a[i];t&&(i=t);var o="ok";if(n){var r=n.indexOf(":");"confirm"==(o=n.substring(r+1))&&(o="ok"),"failed"==o&&(o="fail"),-1!=o.indexOf("failed_")&&(o=o.substring(7)),-1!=o.indexOf("fail_")&&(o=o.substring(5)),"access denied"!=(o=(o=o.replace(/_/g," ")).toLowerCase())&&"no permission to execute"!=o||(o="permission denied"),"config"==i&&"function not exist"==o&&(o="ok"),""==o&&(o="fail")}return n=i+":"+o}(e,t),n.errMsg=t),(i=i||{})._complete&&(i._complete(n),delete i._complete),t=n.errMsg||"",v.debug&&!i.isInnerInvoke&&alert(JSON.stringify(n));var o=t.indexOf(":");switch(t.substring(o+1)){case"ok":i.success&&i.success(n);break;case"cancel":i.cancel&&i.cancel(n);break;default:i.fail&&i.fail(n)}i.complete&&i.complete(n)}function C(e){if(e){for(var n=0,i=e.length;n<i;++n){var t=e[n],o=c[t];o&&(e[n]=o)}return e}}function B(e,n){if(!(!v.debug||n&&n.isInnerInvoke)){var i=a[e];i&&(e=i),n&&n._complete&&delete n._complete,console.log('"'+e+'",',n||"")}}function L(){return(new Date).getTime()}function O(e){l&&(o.WeixinJSBridge?e():i.addEventListener&&i.addEventListener("WeixinJSBridgeReady",e,!1))}});
\ No newline at end of file
diff --git a/jweixin-module/package.json b/jweixin-module/package.json
new file mode 100644
index 0000000..3c1367f
--- /dev/null
+++ b/jweixin-module/package.json
@@ -0,0 +1,53 @@
+{
+  "_from": "jweixin-module",
+  "_id": "jweixin-module@1.6.0",
+  "_inBundle": false,
+  "_integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w==",
+  "_location": "/jweixin-module",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "tag",
+    "registry": true,
+    "raw": "jweixin-module",
+    "name": "jweixin-module",
+    "escapedName": "jweixin-module",
+    "rawSpec": "",
+    "saveSpec": null,
+    "fetchSpec": "latest"
+  },
+  "_requiredBy": [
+    "#USER"
+  ],
+  "_resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.6.0.tgz",
+  "_shasum": "4a7ea614083e3c9c3f49e2fdc2bb882cfa58dfcd",
+  "_spec": "jweixin-module",
+  "_where": "D:\\node-v12.12.0",
+  "author": {
+    "name": "Shengqiang Guo"
+  },
+  "bugs": {
+    "url": "https://github.com/zhetengbiji/jweixin-module/issues"
+  },
+  "bundleDependencies": false,
+  "deprecated": false,
+  "description": "微信JS-SDK",
+  "devDependencies": {},
+  "homepage": "https://github.com/zhetengbiji/jweixin-module#readme",
+  "keywords": [
+    "wxjssdk",
+    "weixin",
+    "jweixin",
+    "wechat",
+    "jssdk",
+    "wx"
+  ],
+  "license": "ISC",
+  "main": "lib/index.js",
+  "name": "jweixin-module",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/zhetengbiji/jweixin-module.git"
+  },
+  "scripts": {},
+  "version": "1.6.0"
+}
diff --git a/locale/index.js b/locale/index.js
new file mode 100644
index 0000000..4eb39de
--- /dev/null
+++ b/locale/index.js
@@ -0,0 +1,13 @@
+import zhCnLocale from './lang/zh-CN';
+import enUsLocale from './lang/en-US';
+import VueI18n from 'vue-i18n';
+import Vue from 'vue';
+Vue.use(VueI18n);
+const i18n = new VueI18n({
+	locale: 'zh',
+	messages: {
+		'en': enUsLocale,
+		'zh': zhCnLocale
+	}
+})
+export default i18n
\ No newline at end of file
diff --git a/locale/lang/en-US.js b/locale/lang/en-US.js
new file mode 100644
index 0000000..edeed65
--- /dev/null
+++ b/locale/lang/en-US.js
@@ -0,0 +1,5 @@
+export default {
+	action: {
+		attendantName: 'technician'
+	}
+}
diff --git a/locale/lang/zh-CN.js b/locale/lang/zh-CN.js
new file mode 100644
index 0000000..797cfda
--- /dev/null
+++ b/locale/lang/zh-CN.js
@@ -0,0 +1,12 @@
+export default {
+	action: {
+		attendantName: '技师',
+		agreeRefund: '立即退款',
+		transferOrder: '转单',
+		orderTaking: '技师接单',
+		setOut: '技师出发',
+		arrive: '技师到达',
+		startService: '开始服务',
+		serviceCompletion: '服务完成',
+	}
+}
diff --git a/main.js b/main.js
new file mode 100644
index 0000000..73500e2
--- /dev/null
+++ b/main.js
@@ -0,0 +1,59 @@
+import Vue from 'vue'
+import App from './App'
+
+import api from "api/index.js"
+import util from "@/utils/index.js"
+import i18n from '@/locale/index.js';
+// #ifdef H5
+import jweixin from "@/utils/jweixin.js"
+// #endif
+import store from "@/store/index.js"
+import banner from '@/components/banner.vue'
+import column from '@/components/column.vue'
+import fixed from '@/components/fixed.vue'
+import search from '@/components/search.vue'
+import auth from '@/components/auth.vue'
+import tab from '@/components/tab.vue'
+import abnor from '@/components/abnor.vue'
+import loadMore from '@/components/load-more.vue'
+import upload from '@/components/upload.vue'
+import minCountdown from '@/components/min-countdown.vue'
+import uniNavBar from '@/components/uni-nav-bar.vue'
+import uniPopup from '@/components/uni-popup.vue'
+import commonPopup from "@/components/common-popup.vue"
+import loginInfo from "@/components/login-info.vue"
+import fixBottomButton from "@/components/fix-bottom-button.vue"
+import uniSegmentedControl from "@/components/uni-segmented-control.vue"
+Vue.component('banner', banner)
+Vue.component('column', column)
+Vue.component('fixed', fixed)
+Vue.component('search', search)
+Vue.component('auth', auth)
+Vue.component('tab', tab)
+Vue.component('abnor', abnor)
+Vue.component('loadMore', loadMore)
+Vue.component('upload', upload)
+Vue.component('minCountdown', minCountdown)
+Vue.component('uniNavBar', uniNavBar)
+Vue.component('uniPopup', uniPopup)
+Vue.component('commonPopup', commonPopup)
+Vue.component('loginInfo', loginInfo)
+Vue.component('fixBottomButton', fixBottomButton)
+Vue.component('uniSegmentedControl', uniSegmentedControl)
+
+Vue.prototype.$api = api
+Vue.prototype.$util = util
+Vue.prototype._i18n = i18n;
+// #ifdef H5
+Vue.prototype.$jweixin = jweixin
+// #endif
+Vue.config.productionTip = false
+
+App.mpType = 'app'
+
+const app = new Vue({
+	...App,
+	store,
+	i18n
+})
+app.$mount()
diff --git a/manifest.json b/manifest.json
new file mode 100644
index 0000000..eba9f57
--- /dev/null
+++ b/manifest.json
@@ -0,0 +1,231 @@
+{
+    "name" : "登澜到家",
+    "appid" : "__UNI__B500DDB", // 改为自己的
+    "description" : "上门预约",
+    "versionName" : "1.0.7",
+    "versionCode" : 107,
+    "transformPx" : false,
+    "uniStatistics" : {
+        "enable" : false //全局关闭  
+    },
+    "mp-weixin" : {
+        "appid" : "wx39993b990ff4ab19",
+        "setting" : {
+            "urlCheck" : true,
+            "postcss" : true,
+            "minified" : true,
+            "es6" : true
+        },
+        "usingComponents" : true,
+        "optimization" : {
+            "subPackages" : true
+        },
+        "plugins" : {},
+        "permission" : {
+            "scope.userLocation" : {
+                "desc" : "你的位置信息将用于小程序距离展示"
+            }
+        },
+        "requiredPrivateInfos" : [
+            "getLocation",
+            "chooseLocation",
+            "startLocationUpdate",
+            "onLocationChange"
+        ],
+        "navigateToMiniProgramAppIdList" : [],
+        "preloadRule" : {},
+        "uniStatistics" : {
+            "enable" : false
+        }
+    },
+    "h5" : {
+        "title" : "登澜到家",
+        "domain" : "https://域名/", // 改为自己的
+        "devServer" : {
+            "https" : false
+        },
+        // "devServer" : {
+        //     "disableHostCheck" : true,
+        //     "proxy" : {
+        //         "/api" : {
+        //             "target" : "https://域名",
+        //             "changeOrigin" : true,
+        //             "secure" : false,
+        //             "pathRewrite" : {
+        //                 "^/api" : ""
+        //             }
+        //         }
+        //     }
+        // },
+        "router" : {
+            "base" : "/h5/"
+        },
+        "sdkConfigs" : {
+            "maps" : {
+                "qqmap" : {
+                    "key" : "4IJBZ-DLACP-3QBDS-LI4FT-U2MZZ-5KFFA" // 改为自己的 腾讯地图key
+                }
+            }
+        }
+    },
+    "app-plus" : {
+        /* 5+App特有相关 */
+        "compatible" : {
+            "ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持  
+        },
+        "usingComponents" : true,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : false,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
+        },
+        "modules" : {
+            "OAuth" : {},
+            "Geolocation" : {},
+            "Maps" : {},
+            "Payment" : {},
+            "Share" : {},
+            "VideoPlayer" : {}
+        },
+        /* 模块配置 */
+        "distribute" : {
+            "sdkConfigs" : {
+                "oauth" : {
+                    "weixin" : {
+                        "appid" : "wxe58f2d0fb0800868", // 改为自己的 微信开放平台应用信息
+                        "appsecret" : "86122c9823f78cdd6304695061d2424f", // 改为自己的
+                        "UniversalLinks" : "https://testapps.cncnconnect.com/uni-universallinks/__UNI__307A9A7/" // 改为自己的
+                    },
+                    "apple" : {}
+                },
+                "geolocation" : {
+                    "amap" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appkey_ios" : "d7600cb7133b50d3d27868984dacea0a", // 改为自己的  谷歌地图
+                        "appkey_android" : "6cbbd69cc7973aba0d1c834accb2ceb3" // 改为自己的
+                    }
+                },
+                "maps" : {
+                    "amap" : {
+                        "appkey_ios" : "d7600cb7133b50d3d27868984dacea0a", // 改为自己的  高德地图
+                        "appkey_android" : "6cbbd69cc7973aba0d1c834accb2ceb3" // 改为自己的
+                    }
+                },
+                "payment" : {
+                    "weixin" : {
+                        "__platform__" : [ "ios", "android" ],
+                        "appid" : "wxe58f2d0fb0800868", // 改为自己的
+                        "UniversalLinks" : "https://testapps.cncnconnect.com/uni-universallinks/__UNI__307A9A7/" // 改为自己的
+                    },
+                    "alipay" : {
+                        "__platform__" : [ "ios", "android" ]
+                    }
+                },
+                "share" : {
+                    "weixin" : {
+                        "appid" : "wxe58f2d0fb0800868", // 改为自己的
+                        "UniversalLinks" : "https://testapps.cncnconnect.com/uni-universallinks/__UNI__307A9A7/" // 改为自己的
+                    }
+                },
+                "ad" : {},
+                "push" : {
+                    "unipush" : {
+                        "version" : "2",
+                        "offline" : true,
+                        "hms" : {}
+                    }
+                }
+            },
+            "android" : {
+                "permissionExternalStorage" : {
+                    "request" : "none",
+                    "prompt" : "应用保存运行状态等信息，需要获取读写手机存储（系统提示为访问设备上的照片、媒体内容和文件）权限，请允许。"
+                },
+                "permissionPhoneState" : {
+                    "request" : "none",
+                    "prompt" : "为保证您正常、安全地使用，需要获取设备识别码（部分手机提示为获取手机号码）使用权限，请允许。"
+                },
+                "permissions" : [
+                    "<uses-feature android:name=\"android.hardware.camera\"/>",
+                    "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_SURFACE_FLINGER\"/>",
+                    "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+                    "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.CLEAR_APP_USER_DATA\"/>",
+                    "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+                    "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+                    "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_EXTERNAL_STORAGE\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+                    "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+                    "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+                    "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+                    "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+                ],
+                "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ],
+                "autoSdkPermissions" : true
+            },
+            "icons" : {
+                // 改为自己的 logo
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
+                },
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png"
+                    },
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png"
+                    }
+                }
+            },
+            "ios" : {
+                "capabilities" : {
+                    "entitlements" : {
+                        "com.apple.developer.associated-domains" : [ "applinks:testapps.cncnconnect.com" ] // 改为自己的
+                    }
+                },
+                "dSYMs" : false,
+                "privacyDescription" : {
+                    // ios隐私信息访问许可描述
+                    "NSPhotoLibraryUsageDescription" : "允许手机存储权限读写相册，注册服务人员/退款时需从相册中选择图片",
+                    "NSPhotoLibraryAddUsageDescription" : "允许手机存储权限读写相册，用于保存图片",
+                    "NSCameraUsageDescription" : "需要访问相册，以便于上传服务人员资格证书、工作形象照等功能",
+                    "NSLocationWhenInUseUsageDescription" : "允许获取您的位置信息，以便获取您附近的服务人员，更好的为您服务",
+                    "NSLocationAlwaysUsageDescription" : "允许获取您的位置信息，以便获取您附近的服务人员，更好的为您服务",
+                    "NSLocationAlwaysAndWhenInUseUsageDescription" : "允许获取您的位置信息，以便获取您附近的服务人员，更好的为您服务"
+                }
+            }
+        }
+    },
+    "nativePlugins" : {},
+    "_spaceID" : "8a1db412-049f-4be6-894a-755ffe5ebe5b"
+}
diff --git a/package (2).json b/package (2).json
new file mode 100644
index 0000000..f7d3409
--- /dev/null
+++ b/package (2).json	
@@ -0,0 +1,17 @@
+{
+    "id": "jarvis-timePickerPopup",
+    "name": "时间范围弹窗选择器",
+    "displayName": "时间范围弹窗选择器",
+    "version": "1.0.0",
+    "description": "时间范围弹窗选择器：使用uni-popup+picker-view实现",
+    "keywords": [
+        "时间选择器",
+        "时间范围"
+    ],
+    "dcloudext": {
+        "category": [
+            "前端组件",
+            "通用组件"
+        ]
+    }
+}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 0000000..1861f19
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,16 @@
+{
+  "requires": true,
+  "lockfileVersion": 1,
+  "dependencies": {
+    "jweixin-module": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/jweixin-module/-/jweixin-module-1.6.0.tgz",
+      "integrity": "sha512-dGk9cf+ipipHmtzYmKZs5B2toX+p4hLyllGLF6xuC8t+B05oYxd8fYoaRz0T30U2n3RUv8a4iwvjhA+OcYz52w=="
+    },
+    "vue-i18n": {
+      "version": "8.28.2",
+      "resolved": "https://registry.npmjs.org/vue-i18n/-/vue-i18n-8.28.2.tgz",
+      "integrity": "sha512-C5GZjs1tYlAqjwymaaCPDjCyGo10ajUphiwA922jKt9n7KPpqR7oM1PCwYzhB/E7+nT3wfdG3oRre5raIT1rKA=="
+    }
+  }
+}
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..5bd9dac
--- /dev/null
+++ b/package.json
@@ -0,0 +1,6 @@
+{
+	"dependencies": {
+		"jweixin-module": "^1.6.0",
+		"vue-i18n": "^8.18.2"
+	}
+}
diff --git a/pages.json b/pages.json
new file mode 100644
index 0000000..4cf9bfa
--- /dev/null
+++ b/pages.json
@@ -0,0 +1,807 @@
+{
+	"pages": [{
+			"path": "pages/service",
+			"style": {
+				"navigationBarTitleText": "首页",
+				//#ifndef  H5
+				"navigationStyle": "custom",
+				//#endif
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/map",
+			"style": {
+				"navigationBarTitleText": "技师",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/technician",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/shopstore",
+			"style": {
+				"navigationBarTitleText": "门店",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/dynamic",
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom",
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/order",
+			"style": {
+				"navigationBarTitleText": "订单",
+				//#ifndef  H5
+				"navigationStyle": "custom",
+				//#endif
+				"enablePullDownRefresh": true
+			}
+		},
+		{
+			"path": "pages/mine",
+			"style": {
+				"navigationBarTitleText": "我的",
+				//#ifndef  H5
+				"navigationStyle": "custom",
+				//#endif
+				"enablePullDownRefresh": true
+			}
+		}
+		//#ifndef  MP-WEIXIN
+		, {
+			"path": "pages/login", // app H5登陆页面 
+			"style": {
+				"navigationBarTitleText": "",
+				"navigationStyle": "custom",
+				"navigationBarTextStyle": "black",
+				"navigationBarBackgroundColor": "#ffffff"
+			}
+		},
+		{
+			"path" : "pages/test",
+			"style" : 
+			{
+				"navigationBarTitleText" : "",
+				"enablePullDownRefresh" : false
+			}
+		}
+		//#endif
+	],
+	"subPackages": [
+		// 用户端	
+		{
+			"root": "user/",
+			"pages": [{
+					"path": "pages/detail",
+					"style": {
+						"navigationBarTitleText": "服务详情"
+					}
+				},
+				{
+					"path": "pages/article",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "pages/protocol",
+					"style": {
+						"navigationBarTitleText": "隐私政策"
+					}
+				},
+				{
+					"path": "pages/information",
+					"style": {
+						"navigationBarTitleText": "服务协议"
+					}
+				},
+				{
+					"path": "pages/collect",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "pages/technician-info",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "pages/merchant-info",
+					"style": {
+						"navigationBarTitleText": "商户信息"
+					}
+				},
+				{
+					"path": "pages/comment",
+					"style": {
+						"navigationBarTitleText": "评论",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "pages/order",
+					"style": {
+						"navigationBarTitleText": "下单"
+					}
+				},
+				{
+					"path": "pages/choose-time",
+					"style": {
+						"navigationBarTitleText": "选择时间"
+					}
+				},
+				{
+					"path": "pages/choose-technician",
+					"style": {
+						"navigationBarTitleText": "",
+						"navigationStyle": "custom",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "pages/address/list",
+					"style": {
+						"navigationBarTitleText": "地址列表",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "pages/address/edit",
+					"style": {
+						"navigationBarTitleText": "添加新地址"
+					}
+				},
+				{
+					"path": "pages/order/bell-list",
+					"style": {
+						"navigationBarTitleText": "加钟订单",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "pages/order/sign",
+					"style": {
+						"navigationBarTitleText": "签名确认"
+					}
+				},
+				{
+					"path": "pages/order/detail",
+					"style": {
+						"navigationBarTitleText": "订单详情"
+					}
+				},
+				{
+					"path": "pages/order/refund",
+					"style": {
+						"navigationBarTitleText": "申请退款"
+					}
+				},
+				{
+					"path": "pages/order/evaluate",
+					"style": {
+						"navigationBarTitleText": "评价"
+					}
+				},
+				{
+					"path": "pages/refund/list",
+					"style": {
+						"navigationBarTitleText": "售后/退款",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "pages/refund/detail",
+					"style": {
+						"navigationBarTitleText": "售后详情"
+					}
+				}, {
+					"path": "pages/channel/apply",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				}, {
+					"path": "pages/channel/income",
+					"style": {
+						"navigationBarTitleText": "我是渠道商",
+						"enablePullDownRefresh": true
+					}
+				}, {
+					"path": "pages/channel/poster",
+					"style": {
+						"navigationBarTitleText": "渠道码"
+					}
+				}, {
+					"path": "pages/salesman/apply",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				}, {
+					"path": "pages/salesman/income",
+					"style": {
+						"navigationBarTitleText": "我是业务员",
+						"enablePullDownRefresh": true
+					}
+				}, {
+					"path": "pages/salesman/record",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "pages/service/list",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "pages/service/cate",
+					"style": {
+						"navigationBarTitleText": "全部分类"
+					}
+				}, {
+					"path": "pages/common/web",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "pages/common/video",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "pages/coupon/list",
+					"style": {
+						"navigationBarTitleText": "我的卡券",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "pages/coupon/use",
+					"style": {
+						"navigationBarTitleText": "选择卡券",
+						"enablePullDownRefresh": true
+					}
+				}, {
+					"path": "pages/coupon/share",
+					"style": {
+						"navigationBarTitleText": "分享有奖",
+						"enablePullDownRefresh": true
+					}
+				}, {
+					"path": "pages/coupon/poster",
+					"style": {
+						"navigationBarTitleText": "我的邀请码"
+					}
+				}, {
+					"path": "pages/stored/list",
+					"style": {
+						"navigationBarTitleText": "余额充值",
+						"enablePullDownRefresh": true
+					}
+				}, {
+					"path": "pages/stored/choose-technician",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": true
+					}
+				}, {
+					"path": "pages/stored/commission",
+					"style": {
+						"navigationBarTitleText": "佣金流水",
+						"enablePullDownRefresh": true
+					}
+				}, {
+					"path": "pages/stored/record",
+					"style": {
+						"navigationBarTitleText": "充值记录",
+						"enablePullDownRefresh": true
+					}
+				}, {
+					"path": "pages/stored/consume",
+					"style": {
+						"navigationBarTitleText": "消费明细",
+						"enablePullDownRefresh": true
+					}
+				}, {
+					"path": "pages/stored/poster",
+					"style": {
+						"navigationBarTitleText": "邀请好友"
+					}
+				}, {
+					"path": "pages/distribution/apply",
+					"style": {
+						"navigationBarTitleText": "申请分销商"
+					}
+				}, {
+					"path": "pages/distribution/income",
+					"style": {
+						"navigationBarTitleText": "我的收入",
+						"enablePullDownRefresh": true
+					}
+				}, {
+					"path": "pages/distribution/record",
+					"style": {
+						"navigationBarTitleText": "提现记录",
+						"enablePullDownRefresh": true
+					}
+				}, {
+					"path": "pages/distribution/team",
+					"style": {
+						"navigationBarTitleText": "我的邀请",
+						"enablePullDownRefresh": true
+					}
+				}, {
+					"path": "pages/distribution/poster",
+					"style": {
+						"navigationBarTitleText": "推广海报"
+					}
+				},
+				{
+					"path": "pages/distribution/bind-technician",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "pages/distribution/share-set",
+					"style": {
+						"navigationBarTitleText": "分享设置"
+					}
+				},
+				{
+					"path": "pages/distribution/agent",
+					"style": {
+						"navigationBarTitleText": "选择代理商"
+					}
+				}, {
+					"path": "pages/cash-out",
+					"style": {
+						"navigationBarTitleText": "提现"
+					}
+				},
+				//#ifndef  MP-WEIXIN
+				{
+					"path": "pages/alipay-account",
+					"style": {
+						"navigationBarTitleText": "绑定支付宝账号"
+					}
+				},
+				//#endif
+				{
+					"path": "pages/alipay-result",
+					"style": {
+						"navigationBarTitleText": "支付宝支付",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "pages/apply-result",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "pages/app-download",
+					"style": {
+						"navigationBarTitleText": "APP下载",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "pages/phone-code",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "pages/phone",
+					"style": {
+						"navigationBarTitleText": "绑定手机号"
+					}
+				},
+				{
+					"path": "pages/setting",
+					"style": {
+						"navigationBarTitleText": "设置"
+					}
+				},
+				{
+					"path": "pages/shield",
+					"style": {
+						"navigationBarTitleText": "屏蔽列表",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "pages/logout",
+					"style": {
+						"navigationBarTitleText": "注销账户"
+					}
+				},
+				{
+					"path": "pages/feedback/box",
+					"style": {
+						"navigationBarTitleText": "问题反馈"
+					}
+				},
+				{
+					"path": "pages/feedback/list",
+					"style": {
+						"navigationBarTitleText": "反馈记录",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "pages/feedback/detail",
+					"style": {
+						"navigationBarTitleText": "反馈详情"
+					}
+				},
+				{
+					"path": "pages/feedback/success",
+					"style": {
+						"navigationBarTitleText": "提交结果"
+					}
+				},
+				{
+					"path": "pages/bell/list",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "pages/bell/order",
+					"style": {
+						"navigationBarTitleText": "下单"
+					}
+				},
+				{
+					"path": "pages/gzh",
+					"style": {
+						"navigationBarTitleText": "关注公众号"
+					}
+				}
+			]
+		},
+		// 代理端
+		{
+			"root": "agent/",
+			"pages": [{
+				"path": "pages/index",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": true
+				}
+			}, {
+				"path": "pages/account",
+				"style": {
+					"navigationBarTitleText": "账号设置"
+				}
+			}, {
+				"path": "pages/apply",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": true
+				}
+			}, {
+				"path": "pages/income/commission",
+				"style": {
+					"navigationBarTitleText": "分佣明细",
+					"enablePullDownRefresh": true
+				}
+			}, {
+				"path": "pages/order/list",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": true
+				}
+			}, {
+				"path": "pages/order/change",
+				"style": {
+					"navigationBarTitleText": "拒单管理",
+					"enablePullDownRefresh": true
+				}
+			}, {
+				"path": "pages/order/detail",
+				"style": {
+					"navigationBarTitleText": "订单详情"
+				}
+			}, {
+				"path": "pages/refund/list",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": true
+				}
+			}, {
+				"path": "pages/refund/detail",
+				"style": {
+					"navigationBarTitleText": "退款详情"
+				}
+			}, {
+				"path": "pages/technician/list",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": true
+				}
+			}, {
+				"path": "pages/technician/user",
+				"style": {
+					"navigationBarTitleText": "选择用户",
+					"enablePullDownRefresh": true
+				}
+			}, {
+				"path": "pages/technician/apply",
+				"style": {
+					"navigationBarTitleText": ""
+				}
+			}, {
+				"path": "pages/poster/channel",
+				"style": {
+					"navigationBarTitleText": "邀请渠道商"
+				}
+			}, {
+				"path": "pages/poster/salesman",
+				"style": {
+					"navigationBarTitleText": "邀请业务员"
+				}
+			}]
+		},
+		// 技-师
+		{
+			"root": "technician/",
+			"pages": [{
+					"path": "pages/apply",
+					"style": {
+						"navigationBarTitleText": ""
+					}
+				},
+				{
+					"path": "pages/order/recorder",
+					"style": {
+						"navigationBarTitleText": "测试录音"
+					}
+				},
+				{
+					"path": "pages/edit",
+					"style": {
+						"navigationBarTitleText": "编辑信息"
+					}
+				},
+				{
+					"path": "pages/time-manage",
+					"style": {
+						"navigationBarTitleText": "时间管理"
+					}
+				},
+				{
+					"path": "pages/time-set",
+					"style": {
+						"navigationBarTitleText": "出行设置"
+					}
+				},
+				{
+					"path": "pages/income/index",
+					"style": {
+						"navigationBarTitleText": "服务费提现",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "pages/income/cash-integral",
+					"style": {
+						"navigationBarTitleText": "储值返佣明细",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "pages/income/commission-list",
+					"style": {
+						"navigationBarTitleText": "分成明细",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "pages/income/commission-detail",
+					"style": {
+						"navigationBarTitleText": "收益详情"
+					}
+				},
+				{
+					"path": "pages/order/label",
+					"style": {
+						"navigationBarTitleText": "评价客户"
+					}
+				},
+				{
+					"path": "pages/order/list",
+					"style": {
+						"navigationBarTitleText": "订单管理",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "pages/order/detail",
+					"style": {
+						"navigationBarTitleText": "订单详情"
+					}
+				},
+				{
+					"path": "pages/car-fare",
+					"style": {
+						"navigationBarTitleText": "车费明细"
+					}
+				},
+				{
+					"path": "pages/shop/detail",
+					"style": {
+						"navigationBarTitleText": "",
+						"navigationStyle": "custom",
+						"enablePullDownRefresh": true
+					}
+				},
+				{
+					"path": "pages/shop/list",
+					"style": {
+						"navigationBarTitleText": "物料商城",
+						"enablePullDownRefresh": true
+					}
+				}, {
+					"path": "pages/bad-comments/box",
+					"style": {
+						"navigationBarTitleText": "差评申诉"
+					}
+				}, {
+					"path": "pages/bad-comments/list",
+					"style": {
+						"navigationBarTitleText": "申诉记录",
+						"enablePullDownRefresh": true
+					}
+				}, {
+					"path": "pages/bad-comments/choice",
+					"style": {
+						"navigationBarTitleText": "选择订单",
+						"enablePullDownRefresh": true
+					}
+				}, {
+					"path": "pages/bad-comments/success",
+					"style": {
+						"navigationBarTitleText": "提交结果"
+					}
+				}, {
+					"path": "pages/level",
+					"style": {
+						"navigationBarTitleText": "等级管理"
+					}
+				}, {
+					"path": "pages/shield",
+					"style": {
+						"navigationBarTitleText": "拉黑用户",
+						"enablePullDownRefresh": true
+					}
+				}
+			]
+		},
+		// 门店
+		{
+			"root": "shopstore/",
+			"pages": [{
+				"path": "pages/store-info",
+				"style": {
+					"navigationBarTitleText": ""
+				}
+			}, {
+				"path": "pages/detail",
+				"style": {
+					"navigationBarTitleText": "商家详情",
+					"enablePullDownRefresh": true
+				}
+			}, {
+				"path": "pages/technician",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": true
+				}
+			}, {
+				"path": "pages/service",
+				"style": {
+					"navigationBarTitleText": "推荐服务",
+					"enablePullDownRefresh": true
+				}
+			}]
+		},
+		// 动态 
+		{
+			"root": "dynamic/",
+			"pages": [{
+				"path": "pages/technician/edit",
+				"style": {
+					"navigationBarTitleText": "发布动态"
+				}
+			}, {
+				"path": "pages/technician/comment",
+				"style": {
+					"navigationBarTitleText": "收获的评论",
+					"enablePullDownRefresh": true
+				}
+			}, {
+				"path": "pages/technician/detail",
+				"style": {
+					"navigationBarTitleText": "动态详情",
+					"navigationStyle": "custom",
+					"enablePullDownRefresh": true
+				}
+			}, {
+				"path": "pages/technician/follow",
+				"style": {
+					"navigationBarTitleText": "新增关注",
+					"enablePullDownRefresh": true
+				}
+			}, {
+				"path": "pages/technician/list",
+				"style": {
+					"navigationBarTitleText": "动态发布",
+					"enablePullDownRefresh": true
+				}
+			}, {
+				"path": "pages/technician/thumbs",
+				"style": {
+					"navigationBarTitleText": "收获的赞",
+					"enablePullDownRefresh": true
+				}
+			}, {
+				"path": "pages/detail",
+				"style": {
+					"navigationBarTitleText": "动态详情",
+					"navigationStyle": "custom",
+					"enablePullDownRefresh": true
+				}
+			}, {
+				"path": "pages/follow",
+				"style": {
+					"navigationBarTitleText": "我的关注",
+					"enablePullDownRefresh": true
+				}
+			}]
+		}
+	],
+	"globalStyle": {
+		"navigationBarTextStyle": "white",
+		"navigationBarTitleText": "",
+		"navigationBarBackgroundColor": "#F4F6F8",
+		"backgroundColor": "#F8F8F8",
+		"onReachBottomDistance": 140
+	},
+	"condition": { //模式配置，仅开发期间生效
+		"current": 0, //当前激活的模式(list 的索引项)
+		"list": [{
+			"name": "", //模式名称
+			"path": "", //启动页面，必选
+			"query": "" //启动参数，在页面的onLoad函数里面得到
+		}]
+	},
+	"requiredPrivateInfos": [
+		"getLocation",
+		"chooseLocation"
+	]
+}
\ No newline at end of file
diff --git a/pages/dynamic.vue b/pages/dynamic.vue
new file mode 100644
index 0000000..b6b208f
--- /dev/null
+++ b/pages/dynamic.vue
@@ -0,0 +1,396 @@
+<template>
+	<view class="pages-dynamic" v-if="isLoad">
+
+		<block v-if="configInfo.plugAuth.dynamic">
+			<fixed>
+				<uni-nav-bar :fixed="false" :shadow="false" :statusBar="true" title="动态" color="#ffffff"
+					:backgroundColor="primaryColor">
+				</uni-nav-bar>
+				<view class="fix-info fill-body rel">
+					<view class="space-top abs" :style="{background:primaryColor}"></view>
+					<view class="search-info fill-base pt-lg pl-lg pr-lg pb-md abs">
+						<view class="flex-center pb-md">
+							<view @tap.stop="$refs.show_item.open()"
+								class="dynamic-btn flex-center f-caption mr-lg radius"
+								:style="{color:primaryColor,border:`1rpx solid ${primaryColor}`}"
+								v-if="coach_status == 1">
+								<i class="iconfont icon-jia-bold"></i>
+								发动态
+							</view>
+							<view class="flex-1">
+								<search @input="toSearch" type="input" :padding="0" :radius="30"
+									backgroundColor="#F0F0F0" :placeholder="'请输入'+$t('action.attendantName')+'姓名'">
+								</search>
+							</view>
+						</view>
+						<tab @change="handerTabChange" :list="tabList" :activeIndex="activeIndex*1"
+							:activeColor="primaryColor" width="50%" height="90rpx" fontSize="28rpx" :numberType="2"
+							lineClass="sm"></tab>
+					</view>
+				</view>
+			</fixed>
+
+			<view class="space-md"></view>
+			<wfalls-flow :list="list.data" :path="1" ref="dynamic_wfalls" v-if="list.data.length > 0"></wfalls-flow>
+			<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading"
+				v-if="loading">
+			</load-more>
+			<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+
+
+		</block>
+		<block v-else>
+			<abnor :tip="[{ text: '当前页面没有权限，请点击导航栏切换页面', color: 0 }]"
+				image="https://lbqny.migugu.com/admin/anmo/technician/no_data.png"></abnor>
+		</block>
+
+
+		<view class="space-footer"></view>
+		<view :style="{height: `${configInfo.tabbarHeight}px`}"></view>
+		<tabbar :cur="3"></tabbar>
+
+		<!-- #ifdef APP-PLUS -->
+		<login-info></login-info>
+		<!-- #endif -->
+
+
+		<uni-popup ref="show_item" type="bottom">
+			<view class="show-popup pd-lg">
+				<view @tap.stop="toAddDynamic(1)" class="show-item flex-center f-paragraph mt-md radius-16">发布图片
+				</view>
+				<view @tap.stop="toAddDynamic(2)" class="show-item flex-center f-paragraph mt-md radius-16">发布视频
+				</view>
+				<view @tap.stop="$refs.show_item.close()" class="show-item flex-center f-paragraph mt-md radius-16"
+					:style="{color:primaryColor}">取消</view>
+				<view class="space-safe"></view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	import siteInfo from '@/siteinfo.js';
+	import tabbar from "@/components/tabbar.vue"
+	import wfallsFlow from "@/components/wfalls-flow.vue"
+	export default {
+		components: {
+			tabbar,
+			wfallsFlow
+		},
+		data() {
+			return {
+				isLoad: false,
+				options: {},
+				loading: true,
+				lockTap: false
+			}
+		},
+		computed: mapState({
+			pageActive: state => state.dynamic.pageActive,
+			activeIndex: state => state.dynamic.activeIndex,
+			tabList: state => state.dynamic.tabList,
+			param: state => state.dynamic.param,
+			list: state => state.dynamic.list,
+			coach_status: state => state.dynamic.coach_status,
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			autograph: state => state.user.autograph,
+			userInfo: state => state.user.userInfo,
+			location: state => state.user.location,
+			isGzhLogin: state => state.user.isGzhLogin,
+			haveShieldOper: state => state.user.haveShieldOper,
+		}),
+		async onLoad(options) {
+			this.$util.showLoading()
+			options = await this.updateCommonOptions(options)
+			this.options = options
+			// #ifndef H5
+			this.$util.showLoading()
+			// #endif
+			await this.initIndex()
+			this.updateDynamicItem({
+				key: 'pageActive',
+				val: true
+			})
+		},
+		async onShow() {
+			// #ifdef H5
+			if (this.$jweixin.isWechat()) {
+				await this.$jweixin.initJssdk();
+				this.toAppShare()
+			}
+			// #endif
+			if (this.haveShieldOper == 1) {
+				await this.initIndex()
+				this.updateUserItem({
+					key: 'haveShieldOper',
+					val: 0
+				})
+			}
+		},
+		async onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			await this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		async onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			await this.getList();
+			setTimeout(() => {
+				this.$refs.dynamic_wfalls.handleViewRender();
+			}, 0)
+		},
+		onShareAppMessage(e) {
+			let {
+				id: pid = 0
+			} = this.userInfo
+			let path = `/pages/dynamic?pid=${pid}`
+			this.$util.log(path)
+			return {
+				title: '',
+				imageUrl: '',
+				path,
+			}
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getUserInfo', 'updateCommonOptions', 'getDynamicIndex',
+				'getDynamicList'
+			]),
+			...mapMutations(['updateUserItem', 'updateDynamicItem']),
+			async initIndex(refresh = false) {
+				let {
+					pid = 0
+				} = this.options
+
+				if (!refresh && this.pageActive && !pid) {
+					this.isLoad = true
+					this.loading = false
+					this.$util.hideAll()
+					return
+				}
+
+				let {
+					isGzhLogin
+				} = this
+				let {
+					id: uid = 0
+				} = this.userInfo
+				if (pid && !uid) {
+					// #ifdef H5
+					if (isGzhLogin) {
+						setTimeout(() => {
+							this.getUserInfo()
+						}, 1000)
+					} else {
+						this.getUserInfo()
+					}
+					// #endif
+					// #ifndef H5
+					await this.getUserInfo()
+					// #endif 
+				}
+
+				if (!this.configInfo.id || refresh || (this.configInfo.id && !this.configInfo.plugAuth.hasOwnProperty(
+						'dynamic'))) {
+					await this.getConfigInfo()
+				}
+				
+				let {
+					dynamic = false
+				} = this.configInfo.plugAuth
+				if (!dynamic) {
+					this.isLoad = true
+					this.loading = false
+					this.$util.hideAll()
+					return
+				}
+				
+				await Promise.all([this.getDynamicIndex(), this.getList(1)])
+			},
+			async initRefresh() {
+				await this.initIndex(true)
+			},
+			toAppShare() {
+				let {
+					id: pid = 0
+				} = this.userInfo
+				let title = '动态'
+				let {
+					siteroot
+				} = siteInfo
+				let url = siteroot.split('/index.php')[0]
+				let href = `${url}/h5/#/pages/dynamic?pid=${pid}`
+				let imageUrl = ''
+				this.$jweixin.wxReady(() => {
+					this.$jweixin.showOptionMenu()
+					this.$jweixin.shareAppMessage(title, '', href, imageUrl)
+					this.$jweixin.shareTimelineMessage(title, href, imageUrl)
+				})
+			},
+			async handerTabChange(index) {
+				this.updateDynamicItem({
+					key: 'activeIndex',
+					val: index
+				})
+				this.$util.showLoading()
+				uni.pageScrollTo({
+					scrollTop: 0
+				})
+				await this.getList(1)
+				if (index == 1) {
+					await this.getDynamicIndex()
+				}
+			},
+			toSearch(val) {
+				this.param.coach_name = val
+				this.getList(1)
+			},
+			async getList(flag) {
+				if (flag) {
+					this.param.page = 1
+					this.list.data = []
+				}
+				let {
+					location
+				} = this
+				if (!location.lat) {
+					// #ifdef H5
+					if (this.$jweixin.isWechat()) {
+						this.$util.showLoading()
+						// await this.$jweixin.initJssdk();
+						await this.$jweixin.wxReady2();
+						let {
+							latitude: lat = 0,
+							longitude: lng = 0
+						} = await this.$jweixin.getWxLocation()
+						location = {
+							lng,
+							lat,
+							address: '定位失败',
+							province: '',
+							city: '',
+							district: ''
+						}
+						if (lat && lng) {
+							let key = `${lat},${lng}`
+							let data = await this.$api.base.getMapInfo({
+								location: key
+							})
+							let {
+								status,
+								result
+							} = JSON.parse(data)
+							if (status == 0) {
+								let {
+									address,
+									address_component
+								} = result
+								let {
+									province,
+									city,
+									district
+								} = address_component
+								location = {
+									lng,
+									lat,
+									address,
+									province,
+									city,
+									district
+								}
+							}
+						}
+					}
+					// #endif
+					// #ifndef H5
+					location = await this.$util.getBmapLocation()
+					// #endif
+					this.updateUserItem({
+						key: 'location',
+						val: location
+					})
+				}
+				let {
+					lat = 0, lng = 0
+				} = location
+
+				let {
+					list: oldList,
+				} = this
+				let param = Object.assign({}, this.param, {
+					lat,
+					lng
+				});
+				await this.getDynamicList(param)
+				this.isLoad = true
+				this.loading = false
+				this.$util.hideAll()
+			},
+			toAddDynamic(type) {
+				this.$refs.show_item.close()
+				this.$util.goUrl({
+					url: `/dynamic/pages/technician/edit?type=${type}`
+				})
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.pages-dynamic {
+		.fix-info {
+			height: 225rpx;
+
+			.space-top {
+				width: 100%;
+				height: 40rpx;
+				top: 0;
+			}
+
+			.search-info {
+				width: 100%;
+				top: 0;
+
+				.dynamic-btn {
+					width: 134rpx;
+					height: 56rpx;
+					transform: rotateZ(360deg);
+
+					.iconfont {
+						font-size: 24rpx;
+						margin-right: 6rpx;
+					}
+				}
+			}
+		}
+
+		.show-popup {
+			width: 750rpx;
+			background: #F3F3F5;
+			border-radius: 30rpx 30rpx 0 0;
+
+			.avatar {
+				width: 84rpx;
+				height: 84rpx;
+			}
+
+			.show-item {
+				color: #222;
+				height: 100rpx;
+				background: #fff;
+			}
+		}
+
+	}
+</style>
\ No newline at end of file
diff --git a/pages/login.vue b/pages/login.vue
new file mode 100644
index 0000000..a7bb915
--- /dev/null
+++ b/pages/login.vue
@@ -0,0 +1,326 @@
+<template>
+	<view class="pages-user-login" v-if="isLoad">
+		<view class="flex-center flex-column" style="height: 80vh">
+
+			<!-- #ifdef H5 -->
+			<view class="logo-img mb-md">
+				<view class="h5-image logo-img radius" :style="{ backgroundImage : `url('${configInfo.app_logo}')`}">
+				</view>
+			</view>
+			<!-- #endif -->
+			<!-- #ifndef H5 -->
+			<image mode="aspectFill" lazy-load class="logo-img mb-md radius" :src="configInfo.app_logo"></image>
+			<!-- #endif -->
+
+			<view class="title">Hi欢迎来到{{configInfo.app_text}}</view>
+			<view @tap.stop="toChooseLogin('weixin')" class="login-btn wechat flex-center f-title c-base radius" :style="{
+			background: `linear-gradient(90deg, ${primaryColor} 0%, ${subColor} 99%)`}"><i
+					class="iconfont icon-weixin mr-md"></i>微信登录（注册）
+			</view>
+			<!-- #ifdef APP-PLUS -->
+			<view @tap.stop="toChooseLogin('apple')" class="login-btn apple flex-center f-title c-black radius"
+				v-if="is_ios_login"><i class="iconfont icon-apple mr-sm"></i>Sign in with Apple
+			</view>
+			<!-- #endif -->
+		</view>
+
+		<uni-popup ref="show_rule_item" type="center" :maskClick="false">
+			<view class="common-popup-content fill-base pd-lg radius-34">
+				<view class="title">温馨提示</view>
+				<view class="f-desc c-title mt-lg">
+					登录即表示您已详细阅读并同意<span @tap.stop="$util.goUrl({url:`/user/pages/protocol`})"
+						:style="{color:primaryColor}">
+						《隐私政策》
+					</span>与<span @tap.stop="$util.goUrl({url:`/user/pages/information`})"
+						:style="{color:primaryColor}">
+						《服务协议》
+					</span>
+				</view>
+				<view class="button">
+					<view @tap.stop="$refs.show_rule_item.close()" class="item-child">取消</view>
+					<view @tap.stop="toConfirm" class="item-child" :style="{background: primaryColor,color:'#fff'}">确定
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from 'vuex';
+	import siteInfo from '@/siteinfo.js';
+	export default {
+		components: {},
+		data() {
+			return {
+				isLoad: false,
+				is_ios_login: false
+			}
+		},
+		async onLoad(options) {
+			let [syserr, sysinfo] = await uni.getSystemInfo()
+			let {
+				browserVersion = '',
+					platform
+			} = sysinfo
+			this.is_ios_login = platform === 'ios' && browserVersion.split('.')[0] * 1 > 12
+			if (!this.configInfo.id) {
+				await this.getConfigInfo()
+			}
+			this.isLoad = true
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			commonOptions: state => state.user.commonOptions,
+			autograph: state => state.user.autograph,
+			appLogin: state => state.user.appLogin,
+			loginType: state => state.user.loginType,
+			loginPage: state => state.user.loginPage,
+			userInfo: state => state.user.userInfo,
+		}),
+		methods: {
+			...mapActions(['getConfigInfo', 'getUserInfo']),
+			...mapMutations(['updateConfigItem', 'updateUserItem', 'updateOrderItem']),
+			toChooseLogin(type) {
+				this.updateUserItem({
+					key: 'loginType',
+					val: type
+				})
+				this.$refs.show_rule_item.open()
+			},
+			toConfirm() {
+				this.$refs.show_rule_item.close()
+				// #ifdef H5
+				this.toGzhLogin()
+				// #endif	
+				// #ifdef APP-PLUS
+				this.toAppLogin()
+				// #endif
+			},
+			// 公众号登录
+			async toGzhLogin() {
+				let {
+					siteroot,
+					gzh_appid
+				} = siteInfo
+				this.updateUserItem({
+					key: 'isGzhLogin',
+					val: true
+				})
+				this.updateUserItem({
+					key: 'autograph',
+					val: ''
+				})
+				this.updateUserItem({
+					key: 'commonOptions',
+					val: this.commonOptions
+				})
+				let {
+					loginPage
+				} = this
+				let url = siteroot.split('/index.php')[0]
+				let href = `${url}/h5/#${loginPage}`
+				let pageUrl = window.location.href;
+				let redirect_uri = encodeURIComponent(href)
+				let authUrl =
+					`https://open.weixin.qq.com/connect/oauth2/authorize?appid=${gzh_appid}&redirect_uri=${redirect_uri}&response_type=code&scope=snsapi_userinfo&state=1&connect_redirect=1#wechat_redirect`;
+				window.location.href = authUrl
+			},
+			//APP登录
+			async toAppLogin() {
+				this.$refs.show_rule_item.close()
+				let {
+					loginType: provider
+				} = this
+
+				try {
+					let [providerErr, providerData] = await uni.getProvider({
+						service: 'oauth',
+					});
+					if (providerErr) {
+						this.$util.showToast({
+							title: providerErr
+						})
+						return
+					}
+					let [loginErr, loginData] = await uni.login({
+						provider
+					});
+					if (loginErr) {
+						this.$util.showToast({
+							title: loginErr
+						})
+						return
+					}
+					let [infoErr, infoData] = await uni.getUserInfo({
+						provider
+					})
+					if (infoErr) {
+						this.$util.showToast({
+							title: infoErr
+						})
+						return
+					}
+
+					let {
+						userInfo = {}
+					} = infoData
+					let {
+						openId = ''
+					} = userInfo
+					if (!openId) return
+					this.$util.showLoading({
+						title: "登录中..."
+					})
+					try {
+						let param = {
+							type: provider == 'weixin' ? 2 : 3,
+							param: {
+								data: userInfo
+							},
+							init: 1
+						}
+						this.toConfirmLogin(param)
+					} catch (e) {
+						this.$util.hideAll()
+					}
+				} catch (e) {
+					this.$util.showToast({
+						title: `没有获取到用户信息，请确认已登录`
+					});
+				}
+			},
+			async toConfirmLogin(login_params) {
+				let {
+					loginType
+				} = this
+
+				let {
+					type,
+					param,
+					init = 0
+				} = login_params
+
+				let methodType = {
+					1: 'webLogin',
+					2: 'appLogin',
+					3: 'iosLogin'
+				}
+
+				let methodModel = methodType[type]
+				let user_info = await this.$api.base[methodModel](param)
+				if (init == 1) {
+					this.updateUserItem({
+						key: 'appLogin',
+						val: param.data
+					})
+				}
+				let {
+					autograph,
+					data
+				} = user_info
+				this.$util.hideAll()
+				this.updateUserItem({
+					key: 'isShowLogin',
+					val: false
+				})
+				this.updateUserItem({
+					key: 'userInfo',
+					val: data
+				})
+				this.updateUserItem({
+					key: 'autograph',
+					val: autograph
+				})
+
+				let {
+					phone = ''
+				} = data
+
+				let {
+					short_code_status = 0
+				} = this.configInfo
+
+				let isToPhone = loginType == 'weixin' && short_code_status && !phone
+				let url = isToPhone ? `/user/pages/phone` : this.loginPage || `/pages/service`
+				let pageArr = ['/pages/service', '/pages/technician', '/pages/order', '/pages/mine']
+				let openType = isToPhone || pageArr.includes(url) ? `reLaunch` : `navigateBack`
+				this.$util.goUrl({
+					url: (isToPhone || pageArr.includes(url)) ? url : 1,
+					openType
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background: #fff;
+		height: 100%;
+	}
+
+	.pages-user-login {
+
+
+		.logo-img {
+			width: 400rpx;
+			height: 400rpx;
+		}
+
+		.title {
+			padding-top: 35px;
+			padding-bottom: 52px;
+			font-size: 19px;
+			font-weight: 700;
+			color: #3d3d3d;
+		}
+
+		.login-btn {
+			width: 220pt;
+			height: 36pt;
+			font-size: 15pt;
+			border: 1rpx solid #000;
+			transform: rotateZ(360deg);
+
+			.iconfont {
+				font-size: 19pt;
+			}
+		}
+
+		.wechat {
+			border: none;
+			font-size: 13pt;
+			box-shadow: 0 18rpx 9rpx 0 rgba(0, 188, 82, 0.07);
+		}
+
+		.apple {
+			margin-top: 40rpx;
+		}
+
+		.banner-info {
+			width: 100%;
+
+			.banner-img {
+				width: 100%;
+				height: 100%;
+			}
+
+			.swiper-to-home {
+				width: 122rpx;
+				height: 47rpx;
+				z-index: 999;
+				right: 40rpx;
+				top: 80rpx;
+				background: rgba(0, 0, 0, 0.3);
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/map.vue b/pages/map.vue
new file mode 100644
index 0000000..b5d6ef3
--- /dev/null
+++ b/pages/map.vue
@@ -0,0 +1,866 @@
+<template>
+	<view class="pages-home" v-if="isLoad">
+
+		<block v-if="configInfo.plugAuth.map">
+			<fixed @height="initFixHeight" :zIndex="990">
+				<view class="fill-base" style="height:196rpx">
+					<view class="map-info flex-between pd-lg">
+						<view @tap.stop="toChooseLocation" class="flex-y-center">
+							<i class="iconfont iconjuli mr-sm"></i>
+							<view class="f-mini-title c-title max-400 ellipsis">
+								{{location&&location.address ?location.address : isLoad ? '定位失败' : '定位中...'}}
+							</view>
+							<i class="iconfont icon-down"></i>
+						</view>
+						<view class="map-list-item flex-y-center">
+							<view @tap.stop="toChangeItem('map')" class="list-btn flex-center f-icontext rel"
+								:style="{color:mapType=='map'?primaryColor:'',borderColor:mapType=='map'?primaryColor:'',borderRight: mapType=='list'?'none':''}">
+								<view class="list-btn abs" :style="{background:primaryColor}" v-if="mapType=='map'">
+								</view>
+								<i class="iconfont icondituzhaoren2"></i>
+								地图
+							</view>
+							<view @tap.stop="toChangeItem('list')" class="list-btn flex-center f-icontext rel"
+								:style="{color:mapType=='list'?primaryColor:'',borderColor:mapType=='list'?primaryColor:'',borderLeft: mapType=='map'?'none':''}">
+								<view class="list-btn abs" :style="{background:primaryColor}" v-if="mapType=='list'">
+								</view>
+								<i class="iconfont iconliebiaomoshi2"></i>
+								列表
+							</view>
+						</view>
+					</view>
+
+					<view class="tab-info flex-center pr-lg">
+						<view class="tab-list-item">
+							<tab @change="handerTabChange" :list="service_cate" :activeIndex="param.activeIndex*1"
+								:activeColor="primaryColor" height="80rpx" fontSize="28rpx" :numberType="2"
+								lineClass="sm">
+							</tab>
+						</view>
+						<view @tap.stop="$refs.search_item.open()" class="tab-select-item flex-1 flex-between ml-sm">
+							<view></view>
+							<i class="iconfont iconshaixuan"></i>
+						</view>
+					</view>
+				</view>
+			</fixed>
+			<block v-if="mapType=='map'">
+				<map class="map-box" :style="{height: `calc(100vh - ${popupHeight + configInfo.tabbarHeight}px)`}"
+					:controls="map.controls" :scale="map.scale" :latitude="map.latitude" :longitude="map.longitude"
+					:markers="covers" @callouttap="getDetail" @markertap="getDetail" @regionchange="regionchange"
+					v-if="location.lat && location.lng && location.address"></map>
+			</block>
+			<block v-if="mapType=='list'">
+				<block v-if="list.data && list.data.length>0">
+					<view class="mt-md ml-md mr-md" v-for="(item,index) in list.data" :key="index">
+						<technician-list-item @comment="toShowPopup(index,'message')" @collect="toCollect(index)"
+							@order="toShowPopup(index,'technician')" :info="item">
+						</technician-list-item>
+					</view>
+					<!-- #ifdef H5 -->
+					<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading"
+						v-if="loading">
+					</load-more>
+					<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+					<!-- #endif -->
+					<!-- #ifndef H5 -->
+					<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0&&location.lng"
+						:loading="loading" v-if="loading">
+					</load-more>
+					<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1&&location.lng"></abnor>
+					<abnor @confirm="toOpenLocation" :tip="[{ text: '定位失败，请开启地理位置授权后刷新页面重试~', color: 0 }]"
+						:button="[{ text: '开启定位' , type: 'confirm' }]" btnSize="" v-if="!loading && !location.lng">
+					</abnor>
+					<!-- #endif -->
+
+					<view class="space-footer"></view>
+					<technician-list-popup ref="technician_list_popup"></technician-list-popup>
+				</block>
+			</block>
+
+		</block>
+		<block v-else>
+			<abnor :tip="[{ text: '当前页面没有权限，请点击导航栏切换页面', color: 0 }]"
+				image="https://lbqny.migugu.com/admin/anmo/technician/no_data.png"></abnor>
+		</block>
+
+		<uni-popup ref="search_item" type="top" left="164rpx">
+			<view class="search-popup pd-lg fill-base">
+				<view class="f-desc c-title text-bold">{{$t('action.attendantName')}}性别
+				</view>
+				<view class="flex-warp">
+					<view @tap.stop="toChangeItem('sex',index)"
+						class="list-item flex-center mt-md mr-md f-paragraph c-paragraph radius"
+						:style="{background:check.sex==item.id?primaryColor:'',color:check.sex==item.id?'#fff':''}"
+						v-for="(item,index) in sexList" :key="index">{{item.title}}
+					</view>
+				</view>
+				<view class="f-desc c-title text-bold pt-lg mt-md">从业年份
+				</view>
+				<view class="flex-warp">
+					<view @tap.stop="toChangeItem('year',index)"
+						class="list-item flex-center mt-md mr-md f-paragraph c-paragraph radius"
+						:style="{background:check.year==item.id?primaryColor:'',color:check.year==item.id?'#fff':''}"
+						v-for="(item,index) in yearList" :key="index">{{item.title}}
+					</view>
+				</view>
+				<view class="f-desc c-title text-bold pt-lg mt-md">上门时间
+				</view>
+				<view @tap.stop="toShowDate"
+					class="list-item flex-center mt-md mr-md f-paragraph c-paragraph radius rel" style="width:100%">
+					{{check.service_time || '选择期望上门时间'}}
+					<i @tap.stop="toClearServiceTime" class="iconfont icon-guanbi-fill abs"
+						:style="{color:primaryColor}" v-if="check.service_time"></i>
+				</view>
+				<view class="f-desc c-title text-bold pt-lg mt-md">个性筛选
+				</view>
+				<input type="text" v-model="check.coach_name" :placeholder="'请输入'+$t('action.attendantName')+'姓名'"
+					class="list-item text-center mt-md f-paragraph c-paragraph radius" style="width:100%" />
+				<view style="height:60rpx"></view>
+				<view class="flex-center">
+					<view @tap.stop="toReset" class="search-btn flex-center f-mini-title c-title radius">重置</view>
+					<view @tap.stop="toConfirm" class="search-btn flex-center ml-lg f-mini-title c-base radius"
+						:style="{background:primaryColor,borderColor:primaryColor}">确定</view>
+				</view>
+			</view>
+		</uni-popup>
+
+		<uni-popup ref="technician_info_item" type="center">
+			<view class="technician-info-popup fill-base ml-lg mr-lg radius-16">
+				<image @tap.stop="goInfo" mode="aspectFill" class="work-img" :src="detail.work_img"></image>
+				<view @tap.stop="goInfo" class="pt-lg pl-lg pr-lg">
+					<view class="flex-between">
+						<view class="f-title c-black text-bold max-400">{{detail.coach_name || '-'}}</view>
+						<view class="flex-center">
+							<i class="iconfont iconjuli" :style="{color:primaryColor}"></i>
+							<view class="f-desc c-title">{{detail.distance}}</view>
+						</view>
+					</view>
+					<view class="flex-y-center mt-sm">
+						<view class="service-label flex-center f-icontext">
+							{{textType[detail.text_type]}}
+						</view>
+						<view class="time-label flex-y-center ml-md f-icontext c-paragraph" v-if="detail.near_time">
+							<view class="near-text flex-center">最早可约</view>
+							<view class="near-time flex-center c-base rel" :style="{color:primaryColor}">
+								<view class="bg abs" :style="{background:primaryColor}"></view>
+								{{detail.near_time}}
+							</view>
+						</view>
+					</view>
+					<view class="flex-y-center mt-lg f-icontext c-caption" v-if="detail.store_id && detail.store_name">
+						<i class="iconfont icondianpu"></i>
+						{{detail.store_name}}
+					</view>
+					<view class="flex-y-center f-icontext c-caption"
+						:class="[{'mt-sm':detail.store_id && detail.store_name},{'mt-lg':!detail.store_id}]">
+						<view class="flex-y-baseline">
+							<i class="iconfont iconpingfen1 icon-font-color"></i>
+							<view class="star-text flex-y-center f-caption">{{detail.star || 0}}</view>
+						</view>
+						<view class="line"></view>
+						<view>已服务{{detail.order_num||0}}单</view>
+						<view class="line"></view>
+						<view>从业{{detail.work_time}}年</view>
+					</view>
+				</view>
+				<view class="pd-lg">
+					<view class="introduce-info pd-lg f-paragraph c-title radius-16">
+						<text decode="emsp" style="word-break:break-all;">{{detail.text}}</text>
+					</view>
+				</view>
+			</view>
+			<view @tap.stop="$refs.technician_info_item.close()" class="flex-center mt-lg"><i
+					class="iconfont icon-close c-base"></i></view>
+		</uni-popup>
+
+
+		<w-picker mode="date" :startYear="startYear-100" :endYear="startYear" :value="toDay" :current="false"
+			fields="minute" @confirm="onConfirm($event)" :disabled-after="false" ref="day" :themeColor="primaryColor"
+			:visible.sync="showDate">
+		</w-picker>
+
+		<view :style="{height: `${configInfo.tabbarHeight}px`}"></view>
+		<tabbar :cur="7"></tabbar>
+
+		<!-- #ifdef APP-PLUS -->
+		<login-info></login-info>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	import siteInfo from '@/siteinfo.js';
+	import tabbar from "@/components/tabbar.vue"
+	import technicianListItem from "@/components/technician-list-item.vue"
+	import technicianListPopup from "@/components/technician-list-popup.vue"
+	import wPicker from "@/components/w-picker/w-picker.vue";
+	export default {
+		components: {
+			tabbar,
+			technicianListItem,
+			technicianListPopup,
+			wPicker
+		},
+		data() {
+			return {
+				isLoad: false,
+				options: {},
+				textType: {
+					1: '可服务',
+					2: '服务中',
+					3: '可预约',
+					4: '不可预约'
+				},
+				popupHeight: '',
+				startYear: '',
+				toDay: '',
+				showDate: false,
+				timer: null,
+				detail: {},
+				loading: true,
+				lockTap: false
+			}
+		},
+		computed: mapState({
+			pageActive: state => state.map.pageActive,
+			sexList: state => state.map.sexList,
+			yearList: state => state.map.yearList,
+			check: state => state.map.check,
+			param: state => state.map.param,
+			service_cate: state => state.map.service_cate,
+			mapList: state => state.map.mapList,
+			list: state => state.map.list,
+			mapType: state => state.map.mapType,
+			map: state => state.map.map,
+			covers: state => state.map.covers,
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			autograph: state => state.user.autograph,
+			userInfo: state => state.user.userInfo,
+			location: state => state.user.location,
+			isGzhLogin: state => state.user.isGzhLogin,
+		}),
+		async onLoad(options) {
+			this.$util.showLoading()
+			options = await this.updateCommonOptions(options)
+			this.options = options
+			uni.onNetworkStatusChange((res) => {
+				let {
+					isConnected
+				} = res
+				if (isConnected && !this.pageActive) {
+					this.initIndex()
+					return
+				}
+			})
+			await this.initIndex()
+		},
+		onUnload() {
+			if (this.timer) clearTimeout(this.timer)
+		},
+		async onShow() {
+			// #ifdef H5
+			if (this.$jweixin.isWechat()) {
+				await this.$jweixin.initJssdk();
+				this.toAppShare()
+			}
+			// #endif
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.loading = true;
+			this.getList(this.param.page + 1);
+		},
+		onShareAppMessage(e) {
+			let {
+				id: pid = 0
+			} = this.userInfo
+			let path = `/pages/map?pid=${pid}`
+			this.$util.log(path)
+			return {
+				title: '',
+				imageUrl: '',
+				path,
+			}
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getUserInfo', 'updateCommonOptions',
+				'getMapIndex', 'getMapList', 'getMapCoachList'
+			]),
+			...mapMutations(['updateMapItem', 'updateUserItem']),
+			async initIndex(refresh = false) {
+				let {
+					pid = 0,
+				} = this.options
+				if (!refresh && this.pageActive && !pid) {
+					this.isLoad = true
+					this.loading = false
+					this.$util.setNavigationBarColor({
+						bg: this.primaryColor
+					})
+					this.$util.hideAll()
+					return
+				}
+
+				let {
+					isGzhLogin
+				} = this
+				let {
+					id: uid = 0
+				} = this.userInfo
+				if (pid && !uid) {
+					// #ifdef H5
+					if (isGzhLogin) {
+						setTimeout(() => {
+							this.getUserInfo()
+						}, 1000)
+					} else {
+						this.getUserInfo()
+					}
+					// #endif
+					// #ifndef H5
+					await this.getUserInfo()
+					// #endif 
+				}
+
+				if (!this.configInfo.id || refresh || (this.configInfo.id && !this.configInfo.plugAuth.hasOwnProperty(
+						'map'))) {
+					await this.getConfigInfo()
+				}
+
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				let cur_time = new Date(Math.ceil(new Date().getTime()))
+				this.startYear = this.$util.formatTime(cur_time, 'YY')
+				this.toDay = this.$util.formatTime(cur_time, 'YY-M-D')
+
+				let {
+					map = false
+				} = this.configInfo.plugAuth
+				if (!map) {
+					this.isLoad = true
+					this.loading = false
+					this.$util.hideAll()
+					return
+				}
+
+				let {
+					lng = 0,
+						lat = 0
+				} = this.location
+				await this.getMapIndex()
+				await this.getList(1)
+				this.updateMapItem({
+					key: 'pageActive',
+					val: true
+				})
+				this.isLoad = true
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			handerTabChange(index) {
+				let {
+					id: cate_id
+				} = this.service_cate[index]
+				let param = Object.assign({}, this.param, {
+					cate_id,
+					page: 1,
+					activeIndex: index
+				})
+				this.updateMapItem({
+					key: 'param',
+					val: param
+				})
+				this.getList()
+			},
+			async getList(flag) {
+				if (flag) {
+					this.param.page = 1
+					if (this.timer) clearTimeout(this.timer)
+				}
+				let {
+					mapType
+				} = this
+
+				let {
+					lng = 0,
+						lat = 0
+				} = this.location
+				let param = Object.assign({}, this.param, {
+					lat,
+					lng
+				})
+
+				let {
+					cate_id = 0
+				} = param
+				let ind = this.service_cate.findIndex(item => {
+					return item.id == cate_id
+				})
+				ind = ind == -1 ? 0 : ind
+				cate_id = this.service_cate[ind].id
+				param.cate_id = cate_id
+
+				let params = Object.assign({}, this.param, {
+					cate_id,
+					activeIndex: ind
+				})
+				this.updateMapItem({
+					key: 'param',
+					val: params
+				})
+
+				let arr = this.yearList.filter(item => {
+					return item.id == param.year
+				})[0].year
+				param.work_time_start = arr[0]
+				param.work_time_end = arr[1]
+				param.service_time = param.service_time ? this.$util.DateToUnix(param.service_time) : ''
+				if (param.sex == -1) {
+					delete param.sex
+				}
+				if (this.mapType == 'map') {
+					delete param.page
+				}
+				delete param.activeIndex
+				delete param.year
+				let methodModel = mapType == 'map' ? 'getMapList' : 'getMapCoachList'
+				await this[methodModel](param)
+				this.$util.hideAll()
+				this.loading = false
+				if (this.mapType == 'map') {
+					this.timer = setTimeout(() => {
+						this.getList(1)
+					}, 600000)
+				}
+			},
+			toAppShare() {
+				let {
+					id: pid = 0
+				} = this.userInfo
+				let title = '首页'
+				let {
+					siteroot
+				} = siteInfo
+				let url = siteroot.split('/index.php')[0]
+				let href = `${url}/h5/#/pages/service?pid=${pid}`
+				let imageUrl = ''
+				this.$jweixin.wxReady(() => {
+					this.$jweixin.showOptionMenu()
+					this.$jweixin.shareAppMessage(title, '', href, imageUrl)
+					this.$jweixin.shareTimelineMessage(title, href, imageUrl)
+				})
+			},
+			initFixHeight(val) {
+				this.popupHeight = val
+			},
+			// 选择地区
+			async toChooseLocation(e) {
+				await this.$util.checkAuth({
+					type: 'userLocation'
+				})
+				let {
+					lat: locaLat = '',
+					lng: locaLng = ''
+				} = this.location
+				let param = {}
+				if (!locaLat && !locaLng) {
+					// #ifdef H5
+					if (this.$jweixin.isWechat()) {
+						this.$util.showLoading()
+						await this.$jweixin.wxReady2();
+						let {
+							latitude,
+							longitude
+						} = await this.$jweixin.getWxLocation()
+						locaLat = latitude
+						locaLng = longitude
+					}
+					// #endif
+					// #ifdef APP-PLUS
+					let location = await this.$util.getBmapLocation()
+					locaLat = location.lat
+					locaLng = location.lng
+					// #endif
+				}
+
+				// #ifndef MP-WEIXIN
+				param = {
+					latitude: locaLat,
+					longitude: locaLng
+				}
+				// #endif
+				let [, {
+					address = '',
+					longitude: lng,
+					latitude: lat,
+					province = '',
+					city = '',
+					district = '',
+				}] = await uni.chooseLocation(param);
+				if (!lng) return
+				let location = {
+					lng,
+					lat,
+					address,
+					province,
+					city,
+					district
+				}
+				this.updateUserItem({
+					key: 'location',
+					val: location
+				})
+				await this.getList(1)
+			},
+			toChangeItem(val, index) {
+				if (['sex', 'year'].includes(val)) {
+					let {
+						id
+					} = this[`${val}List`][index]
+					let params = val == 'sex' ? {
+						sex: id
+					} : {
+						year: id
+					}
+					let checkVal = Object.assign({}, this.check, params)
+					this.updateMapItem({
+						key: 'check',
+						val: checkVal
+					})
+					return
+				}
+				this.updateMapItem({
+					key: 'mapType',
+					val
+				})
+				this.getList(1)
+			},
+			toClearServiceTime() {
+				this.check.service_time = ''
+			},
+			toShowDate() {
+				this.showDate = true
+			},
+			async onConfirm(val) {
+				let {
+					result
+				} = val
+				
+				let cur = this.$util.formatTime(new Date().getTime(), 'YY-M-D h:m')
+				if (this.$util.DateToUnix(result) <= this.$util.DateToUnix(cur)) {
+					this.$util.showToast({
+						title: `只能选择未来时间哦`
+					})
+					return
+				}
+
+				let checkVal = Object.assign({}, this.check, {
+					service_time: result
+				})
+				this.updateMapItem({
+					key: 'check',
+					val: checkVal
+				})
+			},
+			toReset() {
+				this.updateMapItem({
+					key: 'check',
+					val: {
+						sex: -1,
+						year: 1,
+						coach_name: '',
+						service_time: ''
+					}
+				})
+				this.toConfirm()
+			},
+			toConfirm() {
+				let param = Object.assign({}, this.param, this.check)
+				this.updateMapItem({
+					key: 'param',
+					val: param
+				})
+				this.getList(1)
+				this.$refs.search_item.close()
+			},
+			async toShowPopup(index, key) {
+				this.$refs.technician_list_popup.toShowPopup(this.list.data[index], key)
+			},
+			async toCollect(index) {
+				let {
+					id,
+					is_collect,
+					collect_num
+				} = this.list.data[index]
+				let methodModel = is_collect ? 'delCollect' : 'addCollect'
+				await this.$api.mine[methodModel]({
+					coach_id: id
+				})
+				this.$util.showToast({
+					title: is_collect ? '取消成功' : '收藏成功'
+				})
+				this.list.data[index].is_collect = is_collect == 1 ? 0 : 1
+				this.list.data[index].collect_num = is_collect == 1 ? collect_num - 1 :
+					collect_num + 1
+			},
+			// 当视野发生改变
+			async regionchange(e) {
+				// console.log('当视野发生改变', e);
+				return
+				if (e.type == 'end') {
+					let {
+						latitude: lat = 0,
+						longitude: lng = 0
+					} = e.detail.centerLocation
+					if (lat && lng && (lat !== this.location.lat && lng !== this.location.lng)) {
+						if (this.lockTap) return
+						this.lockTap = true
+						let key = `${lat},${lng}`
+						try {
+							let data = await this.$api.base.getMapInfo({
+								location: key
+							})
+							let {
+								status,
+								result
+							} = JSON.parse(data)
+							if (status == 0) {
+								let {
+									address,
+									address_component
+								} = result
+								let {
+									province,
+									city,
+									district
+								} = address_component
+								this.updateUserItem({
+									key: 'location',
+									val: {
+										lng,
+										lat,
+										address,
+										province,
+										city,
+										district
+									}
+								})
+								this.getList()
+								this.lockTap = false
+							}
+						} catch (e) {
+							this.lockTap = false
+						}
+					}
+				}
+			},
+			async getDetail(e) {
+				let {
+					markerId
+				} = e.detail
+				let {
+					id,
+					distance
+				} = this.mapList[markerId]
+				let data = await this.$api.service.coachInfo({
+					id
+				})
+				data.distance = distance
+				this.detail = data
+				this.$refs.technician_info_item.open()
+			},
+			// 技-师详情
+			goInfo() {
+				let {
+					id,
+				} = this.detail
+				this.$refs.technician_info_item.close()
+				this.$util.goUrl({
+					url: `/user/pages/technician-info?id=${id}`
+				})
+			},
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.pages-home {
+		.map-info {
+			.iconjuli {
+				font-size: 30rpx;
+			}
+
+			.icon-down {
+				color: #868686;
+			}
+
+			.map-list-item {
+
+				.list-btn {
+					width: 92rpx;
+					height: 46rpx;
+					transform: rotateZ(360deg);
+					border-radius: 4rpx 0 0 4rpx;
+					border: 1rpx solid #DADFE3;
+
+					.iconfont {
+						font-size: 22rpx;
+						margin-right: 4rpx;
+					}
+				}
+
+
+				.list-btn:nth-child(2) {
+					border-radius: 0 4rpx 4rpx 0;
+				}
+
+				.list-btn.abs {
+					opacity: 0.3;
+					border: none;
+				}
+
+			}
+		}
+
+		.tab-info {
+			.tab-list-item {
+				width: 90%;
+			}
+
+			.tab-select-item {
+				height: 44rpx;
+				box-shadow: -5px 0 5px -5px rgba(0, 0, 0, 0.8);
+			}
+		}
+
+		.map-box {
+			width: 100%;
+		}
+
+		.search-popup {
+			width: calc(100% - 164rpx);
+			height: 100vh;
+
+			.list-item {
+				width: 160rpx;
+				height: 70rpx;
+				background: #F5F5F5;
+
+				.icon-guanbi-fill.abs {
+					top: -15rpx;
+					right: 0;
+					font-size: 50rpx;
+				}
+			}
+
+			.list-item:nth-child(3n) {
+				margin-right: 0;
+			}
+
+			.search-btn {
+				width: 230rpx;
+				height: 80rpx;
+				border: 1rpx solid #C7C7C7;
+				transform: rotateZ(360deg);
+			}
+		}
+
+		.technician-info-popup {
+			width: 690rpx;
+			overflow: hidden;
+			margin-top: 200rpx;
+
+			.work-img {
+				width: 100%;
+				height: 390rpx;
+			}
+
+			.service-label {
+				min-width: 88rpx;
+				height: 32rpx;
+				padding: 0 10rpx;
+				color: #EBDDB1;
+				background: linear-gradient(270deg, #4C545A 0%, #282B34 100%);
+				border-radius: 4rpx;
+			}
+
+			.time-label {
+
+				.near-text {
+					width: 100rpx;
+					height: 33rpx;
+					background: #F5F5F5;
+					border-radius: 3rpx 0 0 3rpx;
+				}
+
+				.near-time {
+					width: 66rpx;
+					height: 33rpx;
+					border-radius: 0 3rpx 3rpx 0;
+
+					.bg {
+						opacity: 0.1;
+						top: 0;
+						left: 0;
+						right: 0;
+						bottom: 0;
+						z-index: 1;
+						border-radius: 0 3rpx 3rpx 0;
+					}
+				}
+			}
+
+			.icondianpu {
+				margin-right: 6rpx;
+			}
+
+			.iconpingfen1 {
+				font-size: 24rpx;
+				background-image: -webkit-linear-gradient(270deg, #FAD961 0%, #F76B1C 100%);
+			}
+
+			.star-text {
+				height: 26rpx;
+				color: #FF9519;
+				margin-left: 6rpx;
+			}
+
+			.line {
+				width: 1rpx;
+				height: 11rpx;
+				background: #979797;
+				margin: 0 18rpx;
+			}
+
+			.introduce-info {
+				width: 630rpx;
+				max-height: 400rpx;
+				overflow-y: auto;
+				background: #F9F9F9;
+			}
+
+		}
+
+		.icon-close {
+			font-size: 60rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/mine.vue b/pages/mine.vue
new file mode 100644
index 0000000..b5b7fc3
--- /dev/null
+++ b/pages/mine.vue
@@ -0,0 +1,1530 @@
+<template>
+	<view class="pages-mine" v-if="isLoad">
+		<!-- #ifndef H5 -->
+		<uni-nav-bar :fixed="true" :shadow="false" :statusBar="true"
+			:title="userPageType == 2?'我是'+$t('action.attendantName'):'我的'" color="#ffffff"
+			:backgroundColor="primaryColor">
+		</uni-nav-bar>
+		<view :style="{height:`${configInfo.navBarHeight}px`}"></view>
+		<!-- #endif -->
+		<image mode="aspectFill" lazy-load class="mine-bg abs" :src="configInfo[image_type[userPageType]]"></image>
+
+		<!-- 用户 -->
+		<!-- coach_status 1申请中，2已通过，3已取消授权，4已拒绝 -->
+		<block v-if="userPageType == 1">
+			<view class="pd-lg" style="height: 212rpx">
+				<view class="pt-lg rel"
+					:class="[{ 'flex-warp':userInfo && userInfo.nickName }, { 'flex-center': !userInfo || (userInfo && !userInfo.nickName) } ]">
+					<auth :needAuth="true" :must="true" :haveGo="false" class="avatar_view" style="width:120rpx">
+						<view class="avatar_view">
+							<image mode="aspectFill" class="avatar radius"
+								:src="userInfo.avatarUrl || `/static/mine/default_user.png`">
+							</image>
+							<view class="text" :style="{color:primaryColor}"
+								v-if="userInfo.id && mineInfo.is_admin == 1">
+								代理商
+							</view>
+						</view>
+					</auth>
+					<auth :needAuth="true" :must="true" :haveGo="false" class="flex-1"
+						v-if="!userInfo || (userInfo && !userInfo.nickName)">
+						<view class="f-md-title text-bold ml-md" :style="{color:configInfo[font_type[userPageType]]}">
+							立即登录
+						</view>
+					</auth>
+					<view class="flex-1 ml-md mt-sm rel" :style="{color:configInfo[font_type[userPageType]]}" v-else>
+						<view class="flex-between">
+							<auth :needAuth="true" :must="true" :haveGo="false">
+								<view class="flex-y-center f-title text-bold">
+									<view class="mr-sm max-300 ellipsis">
+										{{ userInfo.nickName || '默认用户' }}
+									</view>
+								</view>
+							</auth>
+							<view @tap.stop="$util.goUrl({url:`/user/pages/setting`})" class="notice-item ml-md">
+								<i class="iconfont icon-xitong text-bold"></i>
+							</view>
+						</view>
+						<view class="flex-center">
+							<view class="member-tag flex-center mt-sm pl-md pr-md f-caption radius ">
+								<i class="iconfont iconhuiyuanka mr-sm"></i>
+								{{ mineInfo.coach_status === 2 ?  mineInfo.coach_level && mineInfo.coach_level.length > 0 && mineInfo.coach_level.title ? mineInfo.coach_level.title : $t('action.attendantName') : '普通用户' }}
+							</view>
+							<view class="flex-1"></view>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- 我的余额 -->
+			<auth :needAuth="userInfo && (!userInfo.phone || !userInfo.nickName)" :must="true"
+				:type="!userInfo.phone ? 'phone' : 'userInfo'" @go="$util.toCheckLogin({url:`/user/pages/stored/list`})"
+				v-if="configInfo.recharge_status">
+				<view class="space-ht mine-menu-list pd-lg radius-16 rel">
+					<image mode="aspectFill" class="vip-img" src="/static/mine/balance.png"></image>
+					<view class="flex-warp rel">
+						<image mode="aspectFill" class="flex-center vip" src="/static/mine/vip.png"></image>
+						<view class="flex-center f-title c-vip ml-sm">尊享VIP会员</view>
+					</view>
+					<view class="flex-between mt-sm rel">
+						<view>
+							<view class="f-icontext c-vip">账户余额</view>
+							<view class="f-sm-title c-vip">￥{{ mineInfo.balance || '0.00' }}</view>
+						</view>
+						<view
+							style="background-color: rgb(243, 204, 161); width: 72px; height: 26px; border-radius: 13px; position: relative;">
+							<view class="flex-center vip-base f-icontext">立即充值</view>
+							<image mode="aspectFill" class="flex-center vip-fx" src="/static/mine/fx.png"></image>
+						</view>
+					</view>
+				</view>
+			</auth>
+
+			<!-- 我的卡券/我的收藏 -->
+			<view class="share-list flex-between mt-md">
+				<view @tap.stop="$util.toCheckLogin({ url: `/user/pages/collect` })"
+					class="flex-between ml-lg mr-sm pt-lg pb-lg pl-lg pr-sm fill-base f-caption c-desc box-shadow radius-16"
+					style="width: 50%">
+					<view class="share-list flex-between" style="width: 32%">
+						<view class="item-icon rel flex-center">
+							<image mode="aspectFill" class="flex-center column-img" src="/static/mine/guanzhu.png">
+							</image>
+						</view>
+					</view>
+					<view class="flex-column ml-lg" style="width: 100%">
+						<view class="f-title">我的收藏</view>
+						<view class="f-desc mb-sm" :style="{ color: primaryColor }">{{ mineInfo.collect_count || 0 }}
+							<span class="c-grey">人</span>
+						</view>
+					</view>
+				</view>
+				<view @tap.stop="$util.toCheckLogin({ url: `/user/pages/coupon/list` })"
+					class="flex-between ml-sm mr-lg pt-lg pb-lg pl-lg pr-sm fill-base f-caption c-desc box-shadow radius-16"
+					style="width: 50%">
+					<view class="share-list flex-between" style="width: 32%">
+						<view class="item-icon rel flex-center">
+							<image mode="aspectFill" class="flex-center column-img" src="/static/mine/youhui.png">
+							</image>
+						</view>
+					</view>
+					<view class="flex-column ml-lg" style="width: 100%">
+						<view class="f-title">我的优惠劵</view>
+						<view class="f-desc mb-sm" :style="{ color: primaryColor }">{{ mineInfo.coupon_count || 0 }}
+							<span class="c-grey">张</span>
+						</view>
+					</view>
+				</view>
+			</view>
+
+			<!-- <auth :needAuth="userInfo && (!userInfo.phone || !userInfo.nickName)" :must="true"
+				:type="!userInfo.phone ? 'phone' : 'userInfo'" @go="toAtv" style="width: 100%"
+				v-if="mineInfo.is_atv_status === 1">
+				<view style="height: 14rpx;"></view>
+				<image mode="aspectFill" class="share-atv-img" src="/static/mine/coupon.png"></image>
+			</auth> -->
+
+			<view class="mine-menu-list box-shadow fill-base radius-16">
+				<view class="menu-title flex-between pl-lg pr-md b-1px-b">
+					<view class="f-st-title c-title text-bold">常用工具</view>
+				</view>
+				<view class="flex-warp pb-sm pt-lg pb-lg" v-if="toolLoad">
+					<block v-for="(item, index) in toolList" :key="index">
+						<!-- #ifdef MP-WEIXIN -->
+						<button style="width: 25%;margin:10rpx 0 20rpx 0"
+							:open-type="configInfo.im_type == 2 ?'contact':''"
+							class="item-child flex-center flex-column f-caption c-title clear-btn"
+							v-if="item.text == '联系客服' && configInfo.im_type == 2">
+							<image mode="aspectFill" class="mine-img radius" src="/static/mine/lianxikefu.png"></image>
+							<view class="mt-sm">{{ item.text }}</view>
+						</button>
+						<block v-else>
+							<view class="item-child flex-center flex-column f-caption c-title">
+								<auth :needAuth="userInfo && (!userInfo.phone || !userInfo.nickName)" :must="true"
+									:type="!userInfo.phone ? 'phone' : 'userInfo'" @go="toJump('toolList', index)">
+									<image mode="aspectFill" class="mine-img" :src="item.cover" v-if="item.cover">
+									</image>
+									<view class="mt-sm">{{ item.text }}</view>
+								</auth>
+							</view>
+						</block>
+						<!-- #endif -->
+						<!-- #ifndef MP-WEIXIN -->
+						<view @tap.stop="toJump('toolList', index)"
+							class="item-child flex-center flex-column f-caption c-title"
+							style="width: 25%;margin:10rpx 0 20rpx 0">
+							<image mode="aspectFill" class="mine-img" :src="item.cover" v-if="item.cover"></image>
+							<view class="mt-sm">{{ item.text }}</view>
+						</view>
+						<!-- #endif -->
+					</block>
+					<view @tap.stop="$util.goUrl({url:`/agent/pages/index?agent=0`})"
+						class="item-child flex-center flex-column f-caption c-title"
+						style="width: 25%;margin:10rpx 0 20rpx 0" v-if="mineInfo.mobilenode_auth">
+						<image mode="aspectFill" class="mine-img radius" src="/static/mine/guanli.png"></image>
+						<view class="mt-sm">切换管理员</view>
+					</view>
+					<view v-if="infoInitData.is_show == 1" style="width: 25%;margin:10rpx 0 20rpx 0" class="item-child flex-center flex-column f-caption c-title">
+						<view @tap.stop="toChange" class="item-child flex-center flex-column f-caption c-title"
+						style="width: 100%;"
+						v-if="mineInfo.coach_status == 2 || mineInfo.coach_status == 3">
+						<image mode="aspectFill" class="mine-img radius" src="/static/mine/qiehuan.png"></image>
+						<view class="mt-sm">切换{{$t('action.attendantName')}}端</view>
+					</view>
+						</view>
+				
+				</view>
+			</view>
+		</block>
+		<!-- 技-师 -->
+		<block v-if="userPageType == 2">
+			<view class="addr-time-help-list flex-x-center f-desc rel"
+				:style="{color:configInfo[font_type[userPageType]]}">
+				<view @tap.stop="toChooseLocation()" class="flex-center flex-column">
+					<i class="iconfont iconweizhigengxin1"></i>
+					<view>位置更新</view>
+				</view>
+				<view @tap.stop="$util.goUrl({url:`/technician/pages/time-manage`})" class="flex-center flex-column">
+					<i class="iconfont icon-shijian"></i>
+					<view>时间管理</view>
+				</view>
+				<view @tap.stop="toHelp" class="flex-center flex-column">
+					<i class="iconfont iconyijianbaojing"></i>
+					<view>一键报警</view>
+				</view>
+			</view>
+
+			<view class="coach-info fill-base ml-lg mr-lg pt-lg pl-lg pr-lg pb-sm radius-16 rel" v-if="coachInfo.id">
+				<view class="flex-center pb-lg">
+					<!-- #ifdef H5 -->
+					<view class="avatar radius">
+						<view @tap.stop="toPreviewImage(index,1)" class="h5-image avatar radius"
+							:style="{ backgroundImage : `url('${coachInfo.work_img}')`}">
+						</view>
+					</view>
+					<!-- #endif -->
+					<!-- #ifndef H5 -->
+					<image mode="aspectFill" class="avatar radius" :src="coachInfo.work_img"></image>
+					<!-- #endif -->
+					<view class="flex-1 ml-md">
+						<view class="flex-between">
+							<view class="coach-name text-bold max-300 ellipsis">{{coachInfo.coach_name}}</view>
+							<view @tap.stop="toEditInfo" class="coach-text f-paragraph flex-y-center">个人信息<i
+									class="iconfont icon-right"></i>
+							</view>
+						</view>
+						<view class="flex-warp mt-sm">
+							<view class="tag-item flex-center mr-sm"
+								:style="{color:primaryColor,border:`1rpx solid ${primaryColor}`}"
+								v-if="coachInfo.auth_status==2">
+								已认证</view>
+							<view class="tag-item flex-center mr-sm"
+								:style="{color:coachInfo.is_work?primaryColor:'#5A677E',border:`1rpx solid ${coachInfo.is_work?primaryColor:`#5A677E`}`}"
+								v-if="mineInfo.coach_status === 2">
+								{{coachInfo.is_work ? textType[coachInfo.text_type] : '请假中'}}
+							</view>
+							<view class="tag-item flex-center"
+								:style="{color:primaryColor,border:`1rpx solid ${primaryColor}`}">
+								{{coachInfo.coach_level.title}}
+							</view>
+						</view>
+						<view class="flex-between mt-sm" v-if="coachInfo.auth_status!=2">
+							<view class="f-desc">
+								{{coachInfo.auth_status==0?'补充剩余资料才可以上线接单哟':coachInfo.auth_status==1?'认证审核中':'认证已驳回'}}
+							</view>
+							<view>
+								<view @tap.stop="toEditInfo" class="tag-item flex-center"
+									:style="{color:primaryColor,border:`1rpx solid ${primaryColor}`}"
+									v-if="!coachInfo.fdd_auth_status || (coachInfo.fdd_auth_status && coachInfo.fdd_status != 2)">
+									去认证</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="map-addr-info pt-lg b-1px-t">
+					<view class="flex-center">
+						<view class="map-addr flex-center rel">
+							<view class="map-addr radius abs" :style="{background:primaryColor}"></view>
+							<view class="flex-y-center f-desc" :style="{color:primaryColor}">
+								<i class="iconfont icondangqianweizhi"></i>
+								当前
+							</view>
+						</view>
+						<view class="flex-1 text ml-md ellipsis">
+							{{coachInfo.address}}
+						</view>
+					</view>
+					<view class="location-change flex-between pt-sm">
+						<view class="text f-paragraph">实时定位</view>
+						<i @tap.stop="toChangeLocation" class="iconfont"
+							:class="[{'icon-switch':!userInfo.coach_position},{'icon-switch-on':userInfo.coach_position}]"
+							:style="{color:userInfo.coach_position?primaryColor:'#ddd'}"></i>
+					</view>
+				</view>
+			</view>
+
+			<view class="mine-count-list flex-between mt-md rel">
+				<view class="cancel-auth iconfont icon-biaoqian c-caption flex-center abs"
+					v-if="mineInfo.coach_status == 3">
+					<view class="text-bold f-icontext abs">取消授权</view>
+				</view>
+
+				<view @tap.stop="$util.goUrl({ url: `/technician/pages/income/index`})"
+					class="item-child ml-lg mr-sm fill-base f-caption box-shadow radius-16">
+					<view class="flex-y-baseline" :style="{color:primaryColor}">¥<view class="f-sm-title">
+							{{coachInfo.service_price || 0}}
+						</view>
+					</view>
+					<view class="flex-between mt-sm">
+						<view class="text f-paragraph">服务收入</view>
+						<view class="cash-btn flex-center f-desc c-base radius"
+							:style="{background: `linear-gradient(68deg, ${primaryColor}, ${subColor})`}">去提现
+						</view>
+					</view>
+				</view>
+				<view @tap.stop="$util.goUrl({ url: `/user/pages/cash-out?type=carfee` })"
+					class="item-child ml-sm mr-lg pt-lg pb-lg pl-md pr-sm fill-base f-caption c-desc box-shadow radius-16 ">
+					<view class="flex-y-baseline" :style="{color:primaryColor}">¥<view class="f-sm-title">
+							{{coachInfo.car_price || 0}}
+						</view>
+					</view>
+					<view class="flex-between mt-sm">
+						<view class="text f-paragraph">车费</view>
+						<view class="cash-btn flex-center f-desc c-base radius"
+							:style="{background: `linear-gradient(68deg, ${primaryColor}, ${subColor})`}">
+							去提现</view>
+					</view>
+				</view>
+			</view>
+
+			<view class="mine-menu-list box-shadow fill-base radius-16">
+				<view class="menu-title flex-between pl-lg pr-sm">
+					<view class="f-paragraph c-title text-bold">我的订单</view>
+				</view>
+				<view class="flex-warp pb-lg">
+					<view @tap.stop="toJump('orderList2', index)"
+						class="item-child flex-center flex-column f-caption c-title" v-for="(item, index) in orderList2"
+						:key="index">
+						<view class="item-img rel flex-center radius">
+							<view class="abs dot-unread-number flex-center"
+								:style="{width: item.number>99 ? '44rpx': item.number > 9 ? '34rpx' :'',right: item.number>99 ? '-32rpx': item.number > 9 ? '-22rpx' :'-12rpx'}"
+								v-if="item.number > 0">
+								{{item.number < 100 ? item.number : '99+'}}
+							</view>
+							<view class="item-img radius abs" :style="{background:primaryColor}"></view>
+							<i class="iconfont c-title" :class="item.icon" :style="{color:primaryColor}"></i>
+						</view>
+						<view class="mt-sm">{{ item.text }}</view>
+					</view>
+				</view>
+			</view>
+
+			<view class="mine-menu-list box-shadow fill-base radius-16">
+				<view class="menu-title flex-between pl-lg pr-sm">
+					<view class="f-paragraph c-title text-bold">其他功能</view>
+				</view>
+				<view class="flex-warp pb-sm">
+					<view @tap.stop="toJump('toolList2', index)"
+						class="item-child flex-center flex-column f-caption c-title rel" style="margin:10rpx 0 20rpx 0"
+						v-for="(item, index) in toolList2" :key="index">
+						<image mode="aspectFill" class="mine-img" :src="item.cover" v-if="item.cover"></image>
+						<view class="mt-sm">{{ item.text }}</view>
+						<view class="fdd-sign flex-center c-base abs radius"
+							v-if="item.text =='电签合同' && coachInfo.fdd_status != 2">
+							待签约</view>
+					</view>
+				</view>
+			</view>
+		</block>
+
+		<view class="space-footer"></view>
+		<view :style="{height: `${configInfo.tabbarHeight}px`}"></view>
+		<tabbar :cur="5"></tabbar>
+
+		<!-- #ifdef APP-PLUS -->
+		<login-info></login-info>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	import tabbar from "@/components/tabbar.vue"
+	export default {
+		components: {
+			tabbar
+		},
+		data() {
+			return {
+				isLoad: false,
+				toolLoad: false,
+				options: {},
+				textType: {
+					1: '可服务',
+					2: '服务中',
+					3: '可预约',
+					4: '不可预约'
+				},
+				is_share: true,
+				// 我的订单
+				orderList: [],
+				orderList2: [{
+					icon: 'icon-kdd2',
+					text: '待接单',
+					url: '/technician/pages/order/list',
+					number: 0
+				}, {
+					icon: 'iconyijiedan',
+					text: '待服务',
+					url: '/technician/pages/order/list?tab=1',
+					number: 0
+				}, {
+					icon: 'icon-kll',
+					text: '服务中',
+					url: '/technician/pages/order/list?tab=2',
+					number: 0
+				}],
+				commissionList: [],
+				// 其他
+				toolList: [{
+					cover: '/static/mine/dizhiguanli.png',
+					text: '地址管理',
+					url: '/user/pages/address/list'
+				}, {
+					cover: '/static/mine/yijianfank.png',
+					text: '问题反馈',
+					url: '/user/pages/feedback/box'
+				}, {
+					cover: '/static/mine/pingjia.png',
+					text: '我的评价',
+					url: '/pages/order?tab=4'
+				}, {
+					cover: '/static/mine/tuikuan.png',
+					text: '退款售后',
+					url: '/user/pages/refund/list'
+				}, {
+					cover: '/static/mine/tel.png',
+					text: '联系客服',
+					url: ''
+				}],
+				toolList2: [{
+						cover: '/static/mine/dengji.png',
+						text: '等级管理',
+						url: '/technician/pages/level'
+					},
+					// {
+					// 	cover: '/static/mine/Wallet.png',
+					// 	text: '储值返佣明细',
+					// 	url: '/technician/pages/income/cash-integral',
+					// 	number: 0
+					// },
+					// {
+					// 	cover: '/static/mine/fencheng.png',
+					// 	text: '分成明细',
+					// 	url: '/technician/pages/income/commission-list',
+					// 	number: 0
+					// },
+					{
+						cover: '/static/mine/cfmx.png',
+						text: '车费明细',
+						url: '/technician/pages/car-fare'
+					},
+					{
+						cover: '/static/mine/cftx.png',
+						text: '车费提现记录',
+						url: '/user/pages/distribution/record?type=3'
+					},
+					{
+						cover: '/static/mine/shop.png',
+						text: '物料商城',
+						url: '/technician/pages/shop/list'
+					},
+					{
+						cover: '/static/mine/shens.png',
+						text: '差评申诉',
+						url: '/technician/pages/bad-comments/box'
+					},
+					{
+						cover: '/static/mine/pingbi.png',
+						text: '屏蔽用户',
+						url: '/technician/pages/shield'
+					},
+					{
+						cover: '/static/mine/setTime2.png',
+						text: '出行配置',
+						url: '/technician/pages/time-set',
+					},
+					{
+						cover: '/static/mine/qiehuan.png',
+						text: '切换用户端',
+						url: 'change'
+					}
+				],
+				image_type: {
+					1: 'user_image',
+					2: 'coach_image' 
+				},
+				font_type: {
+					1: 'user_font_color',
+					2: 'coach_font_color'
+				},
+				showAuth: false,
+				offsetL: 360,
+				offsetT: 0,
+				infoInitData:{
+					is_show:0
+				}
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			commonOptions: state => state.user.commonOptions,
+			userInfo: state => state.user.userInfo,
+			userPageType: state => state.user.userPageType,
+			locationChange: state => state.user.locationChange,
+			location: state => state.user.location,
+			mineInfo: state => state.user.mineInfo,
+			coachInfo: state => state.user.coachInfo,
+		}),
+		onLoad(options) {
+			this.options = options
+			let {
+				type = 1
+			} = options
+			if (type) {
+				this.updateUserItem({
+					key: 'userPageType',
+					val: type
+				})
+			}
+			let {
+				id: mine_id = -1
+			} = this.mineInfo
+			if (mine_id == -1) {
+				this.$util.showLoading()
+			}
+			this.initIndex();
+			this.initInfoList()
+		},
+		async onShow() {
+			if (this.userPageType == 2) {
+				await Promise.all([this.getCoachInfo(), this.getOrderNumCall()])
+			}
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getUserInfo', 'getMineInfo', 'getCoachInfo',
+				'updateCommonOptions',
+			]),
+			...mapMutations(['updateUserItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif 
+				if (!this.configInfo.id || refresh || (this.configInfo.id && !this.configInfo.hasOwnProperty(
+						'recharge_status'))) {
+					await this.getConfigInfo()
+				}
+				await this.getMineInfo()
+				this.isLoad = true
+
+				let {
+					fx_check,
+					plugAuth = {}
+				} = this.configInfo
+				let {
+					coach_status,
+					is_admin = 0,
+					is_fx = 0
+				} = this.mineInfo
+
+				if (coach_status == 2 || coach_status == 3) {
+					await this.getCoachInfo()
+				}
+				this.updateUserItem({
+					key: 'userPageType',
+					val: coach_status == 2 || coach_status == 3 ? this.userPageType : 1
+				})
+
+				// 
+				let arr = ['coach_status', 'salesman_status']
+				let applyText = '申请' + this.$t('action.attendantName')
+				let textArr = {
+					coach_status: {
+						text: applyText,
+						list: {
+							cover: '/static/mine/jishizhaopin.png',
+							text: applyText,
+							url: '/user/pages/apply'
+						}
+					},
+					channel_status: {
+						text: '申请渠道商',
+						list: {
+							cover: '/static/mine/qudao.png',
+							text: '申请渠道商',
+							url: '/user/pages/channel/apply'
+						},
+						list2: {
+							cover: '/static/mine/qudao.png',
+							text: '我是渠道商',
+							url: '/user/pages/channel/income'
+						}
+					},
+					salesman_status: {
+						text: '申请业务员',
+						list: {
+							cover: '/static/mine/yewu.png',
+							text: '申请业务员',
+							url: '/user/pages/salesman/apply'
+						},
+						list2: {
+							cover: '/static/mine/yewu.png',
+							text: '我是业务员',
+							url: '/user/pages/salesman/income'
+						}
+					}
+				}
+				arr.map(item => {
+					if (this.mineInfo[item] != 2) {
+						let arr = this.toolList.filter(aitem => {
+							return aitem.text === textArr[item].text
+						})
+						if (arr.length === 0 && (item != 'salesman_status' || (item == 'salesman_status' &&
+								this.mineInfo[item] != -1))) {
+							this.toolList.unshift(textArr[item].list)
+						}
+						if (item !== 'coach_status') {
+							let aindex = this.toolList.findIndex(aitem => {
+								return aitem.text === textArr[item].list2.text
+							})
+							if (aindex != -1) {
+								this.toolList.splice(aindex, 1)
+							}
+						}
+					} else {
+						this.toolList.map((aitem, aindex) => {
+							if (aitem.text === textArr[item].text) {
+								this.toolList.splice(aindex, 1)
+							}
+						})
+						if (item !== 'coach_status') {
+							let arr = this.toolList.filter(aitem => {
+								return aitem.text === textArr[item].list2.text
+							})
+							if (arr.length === 0) {
+								this.toolList.unshift(textArr[item].list2)
+							}
+						}
+					}
+				})
+
+				// let agentInd = this.toolList.findIndex(item => {
+				// 	return item.text == '我是代理商' || item.text == '招商加盟'
+				// })
+
+				// if (agentInd == -1) {
+				// 	this.toolList.unshift({
+				// 		cover: '/static/mine/Add.png',
+				// 		text: is_admin ? '我是代理商' : '招商加盟',
+				// 		url: is_admin ? `/agent/pages/index?agent=1` : `/agent/pages/apply`
+				// 	})
+				// }
+
+				// if (agentInd !== -1) {
+				// 	this.toolList[agentInd] = {
+				// 		cover: '/static/mine/Add.png',
+				// 		text: is_admin ? '我是代理商' : '招商加盟',
+				// 		url: is_admin ? `/agent/pages/index?agent=1` : `/agent/pages/apply`
+				// 	}
+				// }
+
+				let fxInd = this.toolList.findIndex(item => {
+					return item.text == '申请分销商' || item.text == '分销商管理'
+				})
+
+				if (fxInd != -1) {
+					this.toolList.splice(fxInd, 1)
+				}
+				this.toolList.unshift({
+					cover: '/static/mine/fenxiao.png',
+					text: is_fx ? '分销商管理' : '申请分销商',
+					url: is_fx ? '/user/pages/distribution/income' : '/user/pages/distribution/apply'
+				})
+
+				if (this.userPageType == 2) {
+					this.getOrderNumCall()
+				}
+
+				let {
+					dynamic = false
+				} = plugAuth
+
+				if (dynamic) {
+					let dynamicInd = this.toolList2.findIndex(item => {
+						return item.text == '动态发布'
+					})
+					if (plugAuth.dynamic && dynamicInd == -1) {
+						let badInd = this.toolList2.findIndex(item => {
+							return item.text == '差评申诉'
+						})
+						// this.toolList2.splice(badInd + 1, 0, {
+						// 	cover: '/static/mine/jishizhaopin.png',
+						// 	text: '动态发布',
+						// 	url: '/dynamic/pages/technician/list'
+						// })
+					}
+				}
+				let {
+					fdd_auth_status
+				} = this.coachInfo
+
+				// console.log(12321312, this.coachInfo)
+				// console.log(12321312, fddInd)
+
+				let fddInd = this.toolList2.findIndex(item => {
+					return item.text == '电签合同'
+				})
+				if (fdd_auth_status && fddInd == -1) {
+					this.toolList2.unshift({
+						cover: '/static/mine/hetong.png',
+						text: '电签合同',
+						url: ''
+					})
+				}
+				// this.toolList2.unshift({
+				// 	cover: '/static/mine/hetong.png',
+				// 	text: '电签合同',
+				// 	url: ''
+				// })
+
+				if (!fdd_auth_status && fddInd !== -1) {
+					this.toolList2.splice(fddInd, 1)
+				}
+				this.toolLoad = true
+				this.$util.hideAll()
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			async getOrderNumCall() {
+				let data = await this.$api.technician.getOrderNum()
+				this.orderList2[0].number = data.wait //待接单
+				this.orderList2[1].number = data.start //待服务
+				this.orderList2[2].number = data.progress //服务中
+			},
+			async  initInfoList(){
+				
+			
+				
+		          let res  = await this.$api.mine.isShowwx()
+			    
+		         this.infoInitData = res
+					
+				
+			
+			},
+			// 选择地区
+			async toChooseLocation() {
+				let {
+					coach_status
+				} = this.mineInfo
+				if (coach_status != 2) return
+				await this.$util.checkAuth({
+					type: 'userLocation'
+				})
+				let {
+					lat: locaLat = '',
+					lng: locaLng = ''
+				} = this.coachInfo
+				let param = {}
+				// #ifndef MP-WEIXIN
+				param = {
+					latitude: locaLat,
+					longitude: locaLng
+				}
+				// #endif
+				let [, {
+					address = '',
+					longitude,
+					latitude
+				}] = await uni.chooseLocation(param);
+				if (!address) return
+				await this.coachUpdate(latitude,longitude,address);
+				this.$util.showToast({
+					title: `更新成功`
+				})
+			},
+			async coachUpdate(latitude,longitude,address){
+				
+				await this.$api.technician.coachUpdate({
+					address,
+					lng: longitude,
+					lat: latitude
+				})
+				let data = this.$util.deepCopy(this.coachInfo)
+				data.address = address
+				this.updateUserItem({
+					key: 'coachInfo',
+					val: data
+				})
+				this.updateUserItem({
+					key: 'locationChange',
+					val: true
+				})
+			},
+			// 实时定位
+			async toChangeLocation() {
+				let {
+					coach_status
+				} = this.mineInfo
+				if (coach_status != 2) return
+				let {
+					coach_position = 0
+				} = this.userInfo
+				let cur = coach_position == 0 ? 1 : 0
+				await this.$api.technician.coachUpdate({
+					coach_position: cur
+				})
+				await this.getUserInfo()
+				this.$util.showToast({
+					title: `操作成功`
+				})
+				this.updateUserItem({
+					key: 'locationChange',
+					val: cur == 1
+				})
+			},
+			toJump(key, index) {
+				let {
+					url,
+					text
+				} = this[key][index]
+				let applyText = '申请' + this.$t('action.attendantName')
+				if ([applyText, '申请分销合伙人', '申请渠道商', '申请业务员'].includes(text)) {
+					this.toApply(text == applyText ? 1 : text == '申请分销合伙人' ? 2 : text == '申请渠道商' ? 3 : 4)
+					return
+				}
+				if (text == '切换用户端') {
+					this.toChange()
+					return
+				}
+				if (text == '联系客服') {
+					let {
+						mobile: url,
+						im_type
+					} = this.configInfo
+					// #ifdef MP-WEIXIN
+					if (im_type == 2) return
+					// #endif
+					this.$util.goUrl({
+						url,
+						openType: 'call'
+
+					})
+					return
+				}
+				if (text == '电签合同') {
+					this.toFddSign()
+					return
+				}
+				let openType = key == 'orderList' && index !== 4 ? `reLaunch` : 'navigateTo'
+				this.$util.log(url)
+				this.$util.toCheckLogin({
+					url,
+					openType
+				})
+			},
+			toEditInfo() {
+				let {
+					status,
+					fdd_auth_status,
+					fdd_status
+				} = this.coachInfo
+				if (status == 2 && fdd_auth_status && fdd_status != 2) {
+					this.$util.showToast({
+						title: `请先签订合同哦`
+					})
+					return
+				}
+				this.$util.goUrl({
+					url: `/technician/pages/edit`
+				})
+			},
+			async toFddSign() {
+				this.updateUserItem({
+					key: 'fddExtsign',
+					val: ''
+				})
+				let {
+					status: coach_status,
+					admin_id = 0,
+					fdd_agreement = {}
+				} = this.coachInfo
+
+				let {
+					viewpdf_url = ''
+				} = fdd_agreement && fdd_agreement.hasOwnProperty('viewpdf_url') ? fdd_agreement : {
+					viewpdf_url: ''
+				}
+				if (!viewpdf_url) {
+					if (coach_status == 3) {
+						this.$util.showToast({
+							title: `平台管理员已取消授权，不能签约哦`
+						})
+						return
+					}
+
+					let fddRecord = await this.$api.technician.getFddRecord();
+					if (!fddRecord) {
+						this.updateUserItem({
+							key: 'authUrl',
+							val: ''
+						})
+						// let {
+						// 	status,
+						// 	authUrl
+						// } = await this.$api.technician.getAttestationInfo()
+						const resaa = await this.$api.technician.getAttestationInfo()
+						console.log(resaa);
+						// console.log(personVerifyUrl)
+						this.updateUserItem({
+							key: 'authUrl',
+							// val: resaa.actorSignTaskEmbedUrl
+							// val: 'https://80000501.uat-e.fadada.com/signtask/preview?signTaskId=1702006200189165140&redirectUrl='
+							val: resaa.data.fdd_link
+						})
+						// personVerifyUrl
+						window.location.href = resaa.data.fdd_link
+						return
+
+						if (status < 2) {
+							let personVerifyUrl = await this.$api.technician.getPersonVerifyUrl()
+							console.log(personVerifyUrl)
+							this.updateUserItem({
+								key: 'authUrl',
+								val: authUrl
+							})
+							// personVerifyUrl
+							this.$util.goUrl({
+								url: `/user/pages/common/web?url=authUrl`
+							})
+							return
+						} else {
+							// let Extsign = await this.$api.technician.Extsign({
+							// 	admin_id
+							// })
+							// viewpdf_url = Extsign
+							this.$util.goUrl({
+								url: `/technician/pages/edit`
+							})
+						}
+					}
+				}
+				this.updateUserItem({
+					key: 'fddExtsign',
+					val: viewpdf_url
+				})
+				this.$util.goUrl({
+					url: `/user/pages/common/web?url=fddExtsign`
+				})
+			},
+			async toAtv() {
+				if (!this.mineInfo.is_atv) {
+					this.$util.showToast({
+						title: `暂无活动`
+					})
+					return
+				}
+				let options = this.commonOptions
+				options.coupon_atv_id = 0
+				await this.updateCommonOptions(options)
+				this.$util.toCheckLogin({
+					url: `/user/pages/coupon/share`
+				})
+			},
+			// 申请技-师/分销合伙人/渠道商/业务员
+			async toApply(type) {
+				let {
+					coach_status = -1,
+						fx_status = -1,
+						channel_status = -1,
+						salesman_status = -1,
+				} = this.mineInfo
+
+				let statusArr = {
+					1: coach_status,
+					2: fx_status,
+					3: channel_status,
+					4: salesman_status
+				}
+				let status = statusArr[type]
+				let page = {
+					1: `/technician/pages/apply`,
+					2: `/user/pages/distribution/apply`,
+					3: `/user/pages/channel/apply`,
+					4: `/user/pages/salesman/apply`
+				}
+				// -1未申请，1审核中，2审核通过，3取消授权，4审核失败
+				let url = status == -1 ? page[type] :
+					`/user/pages/apply-result?type=${type}`
+				this.$util.log(url)
+				this.$util.toCheckLogin({
+					url
+				})
+			},
+			onShareAppMessage(e) {
+				let {
+					id: pid = 0
+				} = this.userInfo
+				let path = `/pages/service?pid=${pid}`
+				this.$util.log(path)
+				return {
+					title: '',
+					imageUrl: '',
+					path,
+				}
+			},
+			// 切换用户/技-师端
+			async toChange() {
+				uni.pageScrollTo({
+					duration: 500,
+					scrollTop: 0
+				})
+				let {
+					userPageType = 1
+				} = this
+				
+				// if(userPageType == 1){
+				// 	console.log(userPageType)
+				// 	// 调起其他小程序页面
+				// 	uni.navigateToMiniProgram({
+				// 	    appId: 'wx38591f38ef87f0ce', // 目标小程序的appid
+				// 	    path: '/pages/service', // 打开的页面路径，需要包含完整路径（不能为空）
+				// 	    // extraData: {
+				// 	    //     foo: 'bar' // 额外参数，可选项
+				// 	    // },
+				// 	    success(res) {
+				// 	        console.log('成功跳转到其他小程序');
+				// 	    }
+				// 	});
+				// 	return
+				// }
+				await this.getCoachInfo()
+				// console.log('userPageType',userPageType)
+				if (userPageType == 1) {
+					this.getOrderNumCall()
+					this.syncLocal()
+				}
+				this.updateUserItem({
+					key: 'userPageType',
+					val: userPageType == 2 ? 1 : 2
+				})
+			},
+			onChange(e) {
+				let {
+					x,
+					y
+				} = e.detail
+				this.$nextTick(() => {
+					this.offsetL = x
+					this.offsetT = y
+				})
+			},
+			// 自动同步位置
+			async syncLocal() {
+				// #ifdef H5
+				if (this.$jweixin.isWechat()) {
+					// this.$util.showLoading()
+					await this.$jweixin.wxReady2();
+					let {
+						latitude: lat = 0,
+						longitude: lng = 0
+					} = await this.$jweixin.getWxLocation()
+					if (!lat) {
+						this.$util.hideAll()
+						this.$util.showToast({
+							title: `请授权定位当前地址`
+						})
+						return
+					}
+					if (lat && lng) {
+						let key = `${lat},${lng}`
+						let data = await this.$api.base.getMapInfo({
+							location: key
+						})
+						let {
+							status,
+							result
+						} = JSON.parse(data)
+						if (status == 0) {
+							this.$util.hideAll()
+							let {
+								address
+							} = result
+							await this.coachUpdate(lat,lng,address);
+						}
+					}
+				}
+				// #endif
+				// #ifndef H5
+				// this.$util.showLoading()
+				let {
+					lat = '',
+						lng = '',
+						address = ''
+				} = await this.$util.getBmapLocation()
+				if (!lat) {
+					this.$util.hideAll()
+					this.$util.showToast({
+						title: `请授权定位当前地址`
+					})
+					return
+				}
+				await this.coachUpdate(lat,lng,address);
+				// #endif
+			},
+			// 求助
+			async toHelp() {
+				// #ifdef H5
+				if (this.$jweixin.isWechat()) {
+					this.$util.showLoading()
+					await this.$jweixin.wxReady2();
+					let {
+						latitude: lat = 0,
+						longitude: lng = 0
+					} = await this.$jweixin.getWxLocation()
+					if (!lat) {
+						this.$util.hideAll()
+						this.$util.showToast({
+							title: `请授权定位当前地址`
+						})
+						return
+					}
+					if (lat && lng) {
+						let key = `${lat},${lng}`
+						let data = await this.$api.base.getMapInfo({
+							location: key
+						})
+						let {
+							status,
+							result
+						} = JSON.parse(data)
+						if (status == 0) {
+							this.$util.hideAll()
+							let {
+								address
+							} = result
+							this.toPolice({
+								lat,
+								lng,
+								address
+							})
+						}
+					}
+				}
+				// #endif
+				// #ifndef H5
+				this.$util.showLoading()
+				let {
+					lat = '',
+						lng = '',
+						address = ''
+				} = await this.$util.getBmapLocation()
+				if (!lat) {
+					this.$util.hideAll()
+					this.$util.showToast({
+						title: `请授权定位当前地址`
+					})
+					return
+				}
+				this.toPolice({
+					lat,
+					lng,
+					address
+				})
+				// #endif
+			},
+			async toPolice(param) {
+				await this.$api.technician.police(param)
+				this.$util.hideAll()
+				this.$util.showToast({
+					title: `求救成功`
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.pages-mine {
+		.mine-bg {
+			width: 100%;
+			height: 318rpx;
+			/* #ifdef H5 */
+			z-index: 0;
+			/* #endif */
+			/* #ifndef H5 */
+			z-index: -1;
+			/* #endif */
+		}
+
+		.mine-master-bg {
+			width: 100%;
+			height: 514rpx;
+			z-index: -1;
+		}
+
+		.avatar_view {
+			width: 120rpx;
+			height: 120rpx;
+
+			.avatar {
+				width: 120rpx;
+				height: 120rpx;
+				overflow: hidden;
+
+				open-data {
+					width: 120rpx;
+					height: 120rpx;
+				}
+			}
+
+			.text {
+				width: 110rpx;
+				position: absolute;
+				bottom: -5rpx;
+				left: 5rpx;
+				height: 36rpx;
+				line-height: 36rpx;
+				background: #FFFFFF;
+				border-radius: 18rpx;
+				font-size: 24rpx;
+				text-align: center;
+			}
+		}
+
+
+		.member-tag {
+			min-width: 168rpx;
+			height: 42rpx;
+			background: rgba(255, 255, 255, 0.5);
+
+			.iconfont {
+				font-size: 28rpx;
+			}
+		}
+
+		.iconbianjiziliao {
+			font-size: 36rpx;
+		}
+
+		.icon-xitong {
+			font-size: 40rpx;
+		}
+
+		// 定位/时间/求救
+		.addr-time-help-list {
+			width: 100%;
+			padding: 40rpx 0;
+
+			.flex-center {
+				width: 33.33%;
+
+				.iconfont {
+					font-size: 60rpx;
+					margin-bottom: 10rpx;
+				}
+			}
+
+		}
+
+		// 技-师信息
+		.coach-info {
+			.avatar {
+				width: 140rpx;
+				height: 140rpx;
+			}
+
+			.coach-name {
+				font-size: 34rpx;
+				color: #142C57
+			}
+
+			.coach-text {
+				color: #5A677E
+			}
+
+			.icon-right {
+				font-size: 22rpx
+			}
+
+			.tag-item {
+				min-width: 92rpx;
+				height: 36rpx;
+				padding: 0 10rpx;
+				font-size: 24rpx;
+				border-radius: 6rpx;
+				transform: rotateZ(360deg);
+			}
+
+			.map-addr-info {
+				.map-addr {
+					width: 102rpx;
+					height: 46rpx;
+					padding-right: 6rpx;
+
+					.iconfont {
+						margin-right: 2rpx;
+						font-size: 26rpx;
+					}
+				}
+
+				.map-addr.abs {
+					top: 0;
+					left: 0;
+					opacity: 0.1;
+				}
+
+				.text {
+					color: #5A677E;
+				}
+
+				.location-change {
+					.iconfont {
+						font-size: 70rpx;
+					}
+				}
+
+			}
+		}
+
+		// 收入
+		.mine-count-list {
+			.cancel-auth {
+				width: 110rpx;
+				height: 100rpx;
+				font-size: 100rpx;
+				top: -230rpx;
+				right: 55rpx;
+
+				.text-bold {
+					height: 26rpx;
+					transform: rotate(-32deg);
+				}
+			}
+
+			.item-child {
+				width: 50%;
+				padding: 28rpx;
+
+				.text {
+					color: #5A677E;
+				}
+
+				.cash-btn {
+					width: 108rpx;
+					height: 46rpx;
+					transform: rotateZ(360deg);
+				}
+			}
+
+		}
+
+
+		.dot-unread-number {
+			top: 0;
+			right: 0;
+			width: 24rpx;
+			height: 24rpx;
+			line-height: 24rpx;
+			text-align: center;
+			color: #fff;
+			font-size: 18rpx;
+			border-radius: 24rpx;
+			background-color: #F1381F;
+		}
+
+		// 卡券/关注/收藏
+		.share-collect-list {
+			.share-item {
+				width: 50%;
+				height: 105rpx;
+			}
+		}
+
+		// 充值/收藏/卡券	
+		.item-btn {
+			width: 150rpx;
+			height: 52rpx;
+			border-radius: 100rpx;
+		}
+
+		.share-list {
+			.coupon-img {
+				width: 97rpx;
+				height: 87rpx;
+			}
+
+			.item-icon {
+				width: 74rpx;
+				height: 80rpx;
+
+				.iconfont {
+					font-size: 62rpx;
+				}
+
+				.item-icon {
+					top: 0;
+					left: 0;
+					opacity: 0.1;
+				}
+			}
+		}
+
+		.store-btn {
+			width: 320rpx;
+			height: 60rpx
+		}
+
+		.vip-img {
+			width: 100%;
+			height: 186rpx;
+			position: absolute;
+			top: 0px;
+			left: 0px;
+			z-index: 0;
+		}
+
+		.vip {
+			width: 44rpx;
+			height: 44rpx;
+		}
+
+		.vip-base {
+			height: 100%;
+			line-height: 100%;
+			color: #856534;
+		}
+
+		.vip-fx {
+			width: 110rpx;
+			height: 44rpx;
+			position: absolute;
+			top: -44rpx;
+			left: 50%;
+			margin-left: -54rpx;
+
+		}
+
+		// 分享-卡券
+		.share-atv-img {
+			width: 716rpx;
+			height: 190rpx;
+			margin: 0 auto;
+		}
+
+		// 我的订单/其他
+		.mine-menu-list {
+			margin: 20rpx 30rpx 0 30rpx;
+
+			.menu-title {
+				height: 90rpx;
+
+				.iconfont {
+					font-size: 24rpx;
+				}
+			}
+
+			.item-child {
+				width: 25%;
+				margin: 10rpx 0;
+
+				.iconfont {
+					font-size: 52rpx;
+				}
+
+				.item-img {
+					width: 88rpx;
+					height: 88rpx;
+
+					.iconfont {
+						font-size: 44rpx;
+					}
+
+					.item-img {
+						top: 0;
+						left: 0;
+						opacity: 0.1;
+					}
+				}
+
+				.fdd-sign {
+					width: 76rpx;
+					height: 30rpx;
+					background: #E82F21;
+					font-size: 20rpx;
+					transform: scale(0.9);
+					top: -10rpx;
+					right: 0;
+					border-radius: 20rpx 20rpx 20rpx 0;
+				}
+			}
+		}
+
+		.column-img {
+			width: 74rpx;
+			height: 80rpx;
+		}
+
+		.mine-img {
+			width: 68rpx;
+			height: 68rpx;
+			margin: auto;
+		}
+
+		// 工具
+		.mine-tool-list {
+			margin: 20rpx 30rpx 0 30rpx;
+			box-shadow: 0px 3px 6px 0px rgba(227, 227, 227, 0.47);
+
+			.list-item {
+				.left-icon {
+					width: 42rpx;
+					font-size: 42rpx;
+				}
+
+				.icon-right {
+					font-size: 28rpx;
+				}
+
+				.icon-switch {
+					font-size: 70rpx;
+					line-height: 48rpx;
+					color: #ddd;
+				}
+			}
+
+			.list-item.b-1px-t:before {
+				left: 60rpx;
+			}
+		}
+
+	}
+</style>
\ No newline at end of file
diff --git a/pages/order.vue b/pages/order.vue
new file mode 100644
index 0000000..ab2271e
--- /dev/null
+++ b/pages/order.vue
@@ -0,0 +1,417 @@
+<template>
+	<view class="order-pages">
+		<!-- #ifndef H5 -->
+		<uni-nav-bar :fixed="true" :shadow="false" :statusBar="true" title="订单" color="#ffffff"
+			:backgroundColor="primaryColor">
+		</uni-nav-bar>
+		<view :style="{height:`${configInfo.navBarHeight}px`}"></view>
+		<fixed :top="configInfo.navBarHeight">
+			<!-- #endif -->
+			<!-- #ifdef H5 -->
+			<fixed>
+				<!-- #endif -->
+				<tab @change="handerTabChange" :list="tabList" :activeIndex="activeIndex*1" :activeColor="primaryColor"
+					:width="100/tabList.length + '%'" height="100rpx"></tab>
+				<view class="b-1px-b"></view>
+			</fixed>
+
+			<view @tap.stop="goDetail(index,'detail')"
+				class="item-child mt-md ml-md mr-md pd-lg fill-base radius-16 rel" v-for="(item,index) in list.data"
+				:key="index">
+				<view v-if="item.is_add">
+					<view class="bell-tag flex-center f-icontext c-base abs" :style="{background:primaryColor}">加钟服务
+					</view>
+					<view class="space-md"></view>
+				</view>
+				<view class="flex-between pb-lg b-1px-b">
+					<view class="f-paragraph c-title max-450 ellipsis"
+						@tap.stop="$util.goUrl({openType:'copy',url:item.order_code})">订单号：{{item.order_code}}
+					</view>
+					<!-- // pay_type 1待支付，2待服务，3技-师接单，4技-师出发，5技-师到达，6服务中，7服务完成 -->
+					<view class="f-caption text-bold"
+						:style="{color:item.pay_type==1?primaryColor: [2,3,4,5,6].includes(item.pay_type)?subColor: item.pay_type == 7 ? '#11C95E' : '#333'}">
+						{{statusType[item.pay_type]}}
+					</view>
+				</view>
+				<view class="flex-center mt-lg" v-for="(aitem,aindex) in item.order_goods" :key="aindex">
+					<!-- #ifdef H5 -->
+					<view class="cover radius-16">
+						<view class="h5-image cover radius-16"
+							:style="{ backgroundImage : `url('${aitem.goods_cover}')`}">
+						</view>
+					</view>
+					<!-- #endif -->
+					<!-- #ifndef H5 -->
+					<image mode="aspectFill" class="cover radius-16" :src="aitem.goods_cover"></image>
+					<!-- #endif -->
+					<view class="flex-1 ml-md">
+						<view class="flex-between">
+							<view class="f-mini-title c-title text-bold max-400 ellipsis">
+								{{aitem.goods_name}}
+							</view>
+							<view class="f-desc c-desc">x{{aitem.num}}</view>
+						</view>
+						<view class="flex-center" :style="{marginTop:aindex==item.order_goods.length-1?'6rpx':'20rpx'}">
+							<view class="flex-1 flex-y-center f-caption c-caption">服务{{$t('action.attendantName')}}
+								<view class="ml-md max-280 ellipsis">
+									{{item.coach_info ? item.coach_info.coach_name : '-'}}
+								</view>
+							</view>
+							<view class="f-caption c-warning" v-if="aitem.refund_num>0">已退x{{aitem.refund_num}}
+							</view>
+						</view>
+						<view class="flex-y-center f-caption c-caption">预约时间<view class="ml-md">{{item.start_time}}
+							</view>
+						</view>
+						<view class="flex-y-center f-caption c-caption" v-if="aindex==item.order_goods.length-1">总计：
+							<view class="flex-y-baseline c-warning text-bold">¥
+								<view class="f-title">{{item.pay_price}}</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="flex-between pt-lg">
+					<view></view>
+					<view class="flex-warp">
+						<!-- 待支付 -->
+						<block v-if="item.pay_type == 1">
+							<button @tap.stop="toCancel(index)" class="clear-btn order">取消订单</button>
+							<button @tap.stop="toPay(index)" class="clear-btn order"
+								:style="{color:'#fff',background:primaryColor,borderColor:primaryColor}">去支付</button>
+						</block>
+						<!-- 支付超时 -->
+						<block v-if="item.pay_type == -1 || item.pay_type == 7">
+							<button @tap.stop="toCancel(index)" class="clear-btn order">删除</button>
+						</block>
+						<!-- 待服务 -->
+						<button @tap.stop="goDetail(index,'refund')" class="clear-btn order"
+							v-if="item.can_refund > 0">申请退款</button>
+						<!-- 服务中 -->
+						<!-- is_add 加钟订单 -->
+						<block v-if="item.pay_type == 6 && (item.is_add || (!item.is_add && item.can_add_order))">
+					<!-- 		<button
+								@tap.stop="$util.goUrl({url:`/user/pages/bell/list?id=${item.id}&coach_id=${item.coach_id}`})"
+								class="clear-btn order"
+								:style="{color:'#fff',background:primaryColor,borderColor:primaryColor}"
+								v-if="">{{item.is_add?'升级项目':'升级/加钟'}}</button> -->
+								<button
+									@tap.stop="$util.goUrl({url:`/user/pages/bell/list?id=${item.id}&coach_id=${item.coach_id}`})"
+									class="clear-btn order"
+									:style="{color:'#fff',background:primaryColor,borderColor:primaryColor}"
+									>加钟</button>
+						</block>
+						<!-- 已完成 -->
+						<block v-if="item.coach_id && item.pay_type == 7 && !item.is_add">
+							<button @tap.stop="goDetail(index,'evaluate')" class="clear-btn order"
+								v-if="!item.is_comment">去评价</button>
+							<button @tap.stop="toAgain(index)" class="clear-btn order"
+								:style="{color:'#fff',background:primaryColor,borderColor:primaryColor}"
+								v-if="item.can_again">再来一单</button>
+						</block>
+					</view>
+				</view>
+			</view>
+
+			<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading"
+				v-if="loading">
+			</load-more>
+			<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+			<view class="space-footer"></view>
+
+			<common-popup @confirm="confirmCancel" ref="cancel_item" type="CANCEL_ORDER" :info="popupInfo">
+			</common-popup>
+			<common-popup @confirm="confirmDel" ref="del_item" type="DELETE_ORDER" :info="popupInfo"></common-popup>
+
+			<view :style="{height: `${configInfo.tabbarHeight}px`}"></view>
+			<tabbar :cur="4"></tabbar>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	import tabbar from "@/components/tabbar.vue"
+	export default {
+		components: {
+			tabbar
+		},
+		data() {
+			return {
+				options: {},
+				statusType: {
+					'-1': '已取消',
+					1: '待支付',
+					2: '待服务',
+					3: this.$t('action.attendantName') + '接单',
+					4: this.$t('action.attendantName') + '出发',
+					5: this.$t('action.attendantName') + '到达',
+					6: '服务中',
+					7: '已完成',
+					8: '待转单'
+				},
+				loading: true,
+				popupInfo: {},
+				lockTap: false
+			}
+		},
+		computed: mapState({
+			activeIndex: state => state.order.activeIndex,
+			tabList: state => state.order.tabList,
+			param: state => state.order.param,
+			list: state => state.order.list,
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		async onLoad(options) {
+			let {
+				tab = 0
+			} = options
+			this.updateOrderItem({
+				key: 'activeIndex',
+				val: tab
+			})
+			// 支付后需刷新页面
+			await this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.loading = true;
+			this.getList(this.param.page + 1);
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getOrderList']),
+			...mapMutations(['updateOrderItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				if (!this.configInfo.id || refresh) {
+					await this.getConfigInfo()
+				}
+				await this.getList(1)
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			async getList(page = 0) {
+				if (page) {
+					let param = this.$util.deepCopy(this.param)
+					param.page = page
+					this.updateOrderItem({
+						key: 'param',
+						val: param
+					})
+				}
+				let {
+					list: oldList,
+					param,
+					tabList,
+					activeIndex
+				} = this
+				param.pay_type = tabList[activeIndex].id
+				try {
+					await this.getOrderList(param)
+					this.loading = false
+					this.$util.hideAll()
+				} catch (e) {
+					this.loading = false
+					this.$util.hideAll()
+				}
+			},
+			handerTabChange(index) {
+				this.updateOrderItem({
+					key: 'activeIndex',
+					val: index
+				})
+				uni.pageScrollTo({
+					scrollTop: 0
+				})
+				this.$util.showLoading()
+				this.getList(1)
+			},
+			// 取消/删除订单
+			async toCancel(index) {
+				let {
+					id,
+					order_code,
+					order_goods,
+					pay_type,
+				} = this.list.data[index]
+				let {
+					goods_cover: image,
+				} = order_goods[0]
+				this.popupInfo = {
+					id,
+					name: `系统单号：${order_code}`,
+					image,
+					index,
+				}
+				let refs_key = pay_type == 1 ? 'cancel_item' : 'del_item'
+				this.$refs[refs_key].open()
+			},
+			// 确认：取消订单
+			async confirmCancel() {
+				let {
+					id,
+					index,
+				} = this.popupInfo
+				await this.$api.order.cancelOrder({
+					id
+				})
+				if (this.activeIndex == 0) {
+					this.list.data[index].pay_type = -1
+				} else {
+					this.list.data.splice(index, 1)
+				}
+				this.$util.showToast({
+					title: `取消成功`
+				})
+				this.$refs.cancel_item.close()
+			},
+			// 确认：删除订单
+			async confirmDel() {
+				let {
+					id,
+					index,
+				} = this.popupInfo
+				await this.$api.order.delOrder({
+					id
+				})
+				this.list.data.splice(index, 1)
+				this.$util.showToast({
+					title: `删除成功`
+				})
+				this.$refs.del_item.close()
+			},
+			// 去支付
+			async toPay(index) {
+				if (this.lockTap) return;
+				this.lockTap = true;
+				this.$util.showLoading()
+				let {
+					id,
+					pay_model
+				} = this.list.data[index]
+
+				try {
+					let {
+						pay_list
+					} = await this.$api.order.rePayOrder({
+						id
+					})
+					this.$util.hideAll()
+					if (pay_list) {
+						if (pay_model == 3) {
+							pay_list = {
+								orderInfo: pay_list,
+								provider: 'alipay'
+							}
+						}
+
+						// #ifdef H5
+
+						if (pay_model == 3) {
+							pay_list = Object.assign({}, pay_list, {
+								order_id: id,
+								page_url: `/pages/order?tab=2`
+							})
+							this.updateOrderItem({
+								key: 'alipayOrderParams',
+								val: pay_list
+							})
+							this.$util.goUrl({
+								url: '/user/pages/alipay-result'
+							})
+							this.lockTap = false
+							setTimeout(() => {
+								this.initRefresh()
+							}, 3000)
+							return
+						}
+						// #endif
+
+						try {
+							await this.$util.pay(pay_list)
+							this.$util.showToast({
+								title: `支付成功`
+							})
+							if (this.activeIndex == 0) {
+								this.list.data[index].pay_type = 2
+							} else {
+								this.list.data.splice(index, 1)
+							}
+							this.lockTap = false;
+						} catch (e) {
+							this.$util.showToast({
+								title: `支付失败`
+							})
+							this.lockTap = false;
+							return
+						}
+					}
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+			},
+			// 去核销
+			async toHx(index) {
+				let {
+					id,
+					qr: image
+				} = this.list.data[index]
+				this.popupInfo = {
+					id,
+					image
+				}
+				this.$refs.hx_item.open()
+			},
+			// 订单详情/申请退款/去评价
+			goDetail(index, page) {
+				let {
+					id
+				} = this.list.data[index]
+				let url = `/user/pages/order/${page}?id=${id}`
+				this.$util.goUrl({
+					url
+				})
+			},
+			// 再来一单
+			async toAgain(index) {
+				let {
+					id: order_id,
+					coach_id
+				} = this.list.data[index]
+				await this.$api.order.onceMoreOrder({
+					order_id
+				})
+				this.$util.goUrl({
+					url: `/user/pages/order?id=${coach_id}`
+				})
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+</style>
diff --git a/pages/service.vue b/pages/service.vue
new file mode 100644
index 0000000..6b00534
--- /dev/null
+++ b/pages/service.vue
@@ -0,0 +1,793 @@
+<template>
+	<view class="pages-home" v-if="isLoad">
+		<!-- #ifndef H5 -->
+		<uni-nav-bar :fixed="true" :shadow="false" :statusBar="true" title="首页" color="#ffffff"
+			:backgroundColor="primaryColor">
+		</uni-nav-bar>
+		<view :style="{height:`${configInfo.navBarHeight}px`}"></view>
+		<!-- #endif -->
+		<view :class="[{'rel':banner.length >0}]" :style="{height:banner.length > 0?`484rpx`:`84rpx`}">
+			<banner @change="goBanner" :list="banner" :margin="0" :autoplay="true" :indicatorActiveColor="primaryColor"
+				:dotWidth="20" :dotBottom="30" v-if="banner.length > 0">
+			</banner>
+			<view class="search-box flex-center fill-base"
+				:class="[{'mt-md':banner.length ==0},{'abs':banner.length>0}]" :style="{ color: primaryColor }">
+				<view style="width: 100%;">
+					<view class="servetip pl-lg pr-lg pt-sm pb-sm">
+						<view @tap.stop="toJump('servefc', index)" v-for="(item, index) in servefc"
+						:key="index" class="servefc">
+							<i class="iconfont" :class="item.icon"></i>
+							<span class="ml-sm">{{ item.text }}</span>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<!-- 分类 -->
+		<view class="fill-base pl-md pr-md" style="overflow: hidden;" v-if="service_cate.length>0">
+			<column @change="goCate" :list="service_cate" :indicatorActiveColor="primaryColor" :colNum="5" :rowNum="2">
+			</column>
+		</view>
+
+		<view class="fill-base pl-lg pr-lg pb-lg" v-if="recommend_list && recommend_list.length > 0">
+			<view @tap.stop="$util.goUrl({url: `/pages/technician`,openType: `reLaunch`})" class="flex-between pb-lg">
+				<view class="f-st-title text-bold flex-between">
+					<view class="mr-md" style="width: 15px;height: 17px;">
+						<image src="/static/img/icon_technician.png" class="van-img" style="object-fit: cover;"></image>
+					</view>
+					{{`推荐${$t('action.attendantName')}`}}
+				</view>
+				<view class="flex-y-center f-caption c-caption">查看更多<i class="iconfont icon-right"
+						style="font-size: 24rpx;"></i></view>
+			</view>
+			<scroll-view scroll-x class="recommend-technician">
+				<block v-for="(item,index) in recommend_list" :key="index">
+					<view @tap.stop="toTechnician(index)" class="recommend-item type-1" v-if="recommend_style == 1">
+						<!-- #ifdef H5 -->
+						<view class="cover radius-16">
+							<view class="h5-image cover radius-16"
+								:style="{ backgroundImage : `url('${item.work_img}')`}">
+							</view>
+						</view>
+						<!-- #endif -->
+						<!-- #ifndef H5 -->
+						<image mode="aspectFill" lazy-load class="cover radius-16" :src="item.work_img"></image>
+						<!-- #endif -->
+						<view class="flex-center f-desc c-title text-bold mt-md">
+							<view class="ellipsis">{{item.coach_name}}</view>			
+						</view>						
+						<view class="flex-center">
+							<view class="new-technician flex-center f-icontext radius"
+								:style="{height:`33rpx`,width:`80rpx`,color:primaryColor,border:`1rpx solid ${primaryColor}`}" v-if="item.is_new">新人
+							</view>							
+							<view class="f-icontext c-caption" v-else>30天接单{{item.order_count||0}}
+							</view>
+						</view>	
+					</view>
+					<view @tap.stop="toTechnician(index)" class="recommend-item type-2 pd-md"
+						v-if="recommend_style == 2">
+						<view class="flex-center pb-sm">
+							<!-- #ifdef H5 -->
+							<view class="cover radius">
+								<view class="h5-image cover radius"
+									:style="{ backgroundImage : `url('${item.work_img}')`}">
+								</view>
+							</view>
+							<!-- #endif -->
+							<!-- #ifndef H5 -->
+							<image mode="aspectFill" lazy-load class="cover radius" :src="item.work_img"></image>
+							<!-- #endif -->
+							<view class="flex-1 ml-sm">
+								<view class="f-desc ellipsis">{{item.coach_name}}</view>
+								<view class="flex-y-baseline" style="margin-top: 4rpx;">
+									<i class="iconfont iconyduixingxingshixin icon-font-color"></i>
+									<view class="star-text flex-y-center f-caption">{{item.star}}</view>
+								</view>
+							</view>
+						</view>
+						<view class="flex-center">
+							<view class="new-technician flex-center f-icontext radius"
+								:style="{height:`33rpx`,width:`80rpx`,color:primaryColor,border:`1rpx solid ${primaryColor}`}" v-if="item.is_new">新人
+							</view>
+							<view class="f-icontext c-caption" v-else>30天接单{{item.order_count||0}}
+							</view>
+						</view>
+					</view>
+				</block>
+			</scroll-view>
+		</view>
+		
+	
+		<view class="fill-base pl-lg pr-lg">	
+			<view class="fill-base flex-between">
+				<view class="f-st-title text-bold flex-between">
+					<view class="mr-md" style="width: 15px;height: 17px;">
+						<image src="/static/img/icon_project.png" class="van-img" style="object-fit: cover;"></image>
+					</view>
+					推荐项目
+				</view>
+			</view>
+		</view>
+		<view class="fill-base pd-lg b-1px-b" v-for="(item,index) in list.data" :key="index">
+			<service-list-item :info="item"></service-list-item>
+		</view>
+		
+		<load-more :noMore="list.current_page >= list.last_page && list.data.length > 0" :loading="loading"
+			v-if="loading">
+		</load-more>
+		<abnor v-if="!loading && list.data.length <= 0 && list.current_page == 1"></abnor>
+
+		<view class="space-footer"></view>
+
+		<uni-popup ref="coupon_item" type="center" :maskClick="false">
+			<view class="coupon-popup flex-center">
+				<!-- #ifdef H5 -->
+				<view class="h5-image bg-img"
+					:style="{ backgroundImage : `url('https://lbqnyv2.migugu.com/bianzu3.png')`}">
+				</view>
+				<!-- #endif -->
+				<!-- #ifndef H5 -->
+				<image mode="aspectFill" lazy-load class="bg-img" src="https://lbqnyv2.migugu.com/bianzu3.png"></image>
+				<!-- #endif -->
+
+				<i @tap.stop="$refs.coupon_item.close()" class="iconfont icon-close c-base"></i>
+				</image>
+				<view class="coupon-info flex-center flex-column">
+					<view class="tops flex-center flex-column">
+						<view class="">
+							成功领取
+						</view>
+						<view class="">
+							卡券将放入“我的-我的卡券”
+						</view>
+					</view>
+					<view class="lists flex-center">
+						<scroll-view scroll-y style="width: 420rpx;height:100%;">
+							<view class="list flex-between" v-for="(item, index) in couponList" :key="index">
+								<image src="https://lbqny.migugu.com/admin/anmo/coupon/coupon.png" mode="aspectFill">
+								</image>
+								<view class="flex-between">
+									<view class="flex-center flex-column">
+										<view class="price">
+											{{item.discount}}
+										</view>
+										<view class="price_text">
+											{{item.full*1>0?`满${item.full}可用`:`立减`}}
+										</view>
+									</view>
+									<view class="title flex-y-center">
+										<view class="ellipsis-3">
+											{{item.title}}
+										</view>
+									</view>
+								</view>
+							</view>
+						</scroll-view>
+					</view>
+				</view>
+				<view class="btns flex-center" @tap.stop="userGetCoupon">
+					<view class="flex-center">
+						领取到卡包
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+		<view :style="{height: `${configInfo.tabbarHeight}px`}"></view>
+		<tabbar :cur="1"></tabbar>
+
+		<!-- #ifdef APP-PLUS -->
+		<login-info></login-info>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	import siteInfo from '@/siteinfo.js';
+	import serviceListItem from "@/components/service-list-item.vue"
+	import tabbar from "@/components/tabbar.vue"
+	export default {
+		components: {
+			serviceListItem,
+			tabbar
+		},
+		data() {
+			return {
+				couponList: [], //优惠券 
+				isLoad: false,
+				options: {},
+				loading: true,
+				lockTap: false,
+				servefc: [{
+					icon: 'icon-kzj',
+					text: '实名认证'
+				}, {
+					icon: 'icon-kpk',
+					text: '爽约包赔'
+				}, {
+					icon: 'icon-sybp',
+					text: '超时秒退'
+				}, {
+					icon: 'icon-kzz',
+					text: '资质证书'
+				}],				
+			}
+		},
+		computed: mapState({
+			pageActive: state => state.service.pageActive,
+			activeIndex: state => state.service.activeIndex,
+			tabList: state => state.service.tabList,
+			param: state => state.service.param,
+			list: state => state.service.list,
+			banner: state => state.service.banner,
+			service_cate: state => state.service.service_cate,
+			recommend_list: state => state.service.recommend_list,
+			recommend_style: state => state.service.recommend_style,
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			autograph: state => state.user.autograph,
+			userInfo: state => state.user.userInfo,
+			location: state => state.user.location,
+			isGzhLogin: state => state.user.isGzhLogin,
+			haveShieldOper: state => state.user.haveShieldOper,
+		}),
+		async onLoad(options) {
+			//this.$util.showLoading()
+			options = await this.updateCommonOptions(options)
+			this.options = options
+			uni.onNetworkStatusChange((res) => {
+				let {
+					isConnected
+				} = res
+				if (isConnected && !this.pageActive) {
+					this.initIndex()
+					return
+				}
+			})
+			await this.initIndex()
+		},
+		async onShow() {
+			// #ifdef H5
+			if (this.$jweixin.isWechat()) {
+				await this.$jweixin.initJssdk();
+				this.toAppShare()
+			}
+			// #endif
+			if (this.haveShieldOper == 2) {
+				this.initIndex()
+				this.updateUserItem({
+					key: 'haveShieldOper',
+					val: 0
+				})
+			}
+			if (this.pageActive && this.userInfo.id) {
+				this.getCouponList()
+			}
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.loading = true;
+			this.getList(this.param.page + 1);
+		},
+		onShareAppMessage(e) {
+			let {
+				id: pid = 0
+			} = this.userInfo
+			let path = `/pages/service?pid=${pid}`
+			this.$util.log(path)
+			return {
+				title: '',
+				imageUrl: '',
+				path,
+			}
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getUserInfo', 'updateCommonOptions', 'getServiceIndex', 'getServiceList']),
+			...mapMutations(['updateServiceItem', 'updateTechnicianItem', 'updateUserItem']),
+			async initIndex(refresh = false) {
+				let {
+					pid = 0
+				} = this.options
+				if (!refresh && this.pageActive && !pid) {
+					this.isLoad = true
+					this.loading = false
+					this.$util.hideAll()
+					return
+				}
+
+				let {
+					isGzhLogin
+				} = this
+				let {
+					id: uid = 0
+				} = this.userInfo
+				if (pid && !uid) {
+					// #ifdef H5
+					if (isGzhLogin) {
+						setTimeout(() => {
+							this.getUserInfo()
+						}, 1000)
+					} else {
+						this.getUserInfo()
+					}
+					// #endif
+					// #ifndef H5
+					await this.getUserInfo()
+					// #endif 
+				}
+
+				if (!this.configInfo.id || refresh) {
+					await this.getConfigInfo()
+				}
+
+				let {
+					location
+				} = this
+				let {
+					plugAuth = {}
+				} = this.configInfo
+				let {
+					recommend = false
+				} = plugAuth
+
+				if (recommend && !location.lat) {
+					// #ifdef H5
+					if (await this.$jweixin.isWechat()) {
+						this.$util.showLoading()
+						// await this.$jweixin.initJssdk();
+						await this.$jweixin.wxReady2();
+						let {
+							latitude: lat = 0,
+							longitude: lng = 0
+						} = await this.$jweixin.getWxLocation()
+						location = {
+							lng,
+							lat,
+							address: '定位失败',
+							province: '',
+							city: '',
+							district: ''
+						}
+					}
+					// #endif
+					// #ifndef H5
+					location = await this.$util.getBmapLocation()
+					// #endif
+					this.updateUserItem({
+						key: 'location',
+						val: location
+					})
+				}
+				let {
+					lng = 0,
+						lat = 0
+				} = location
+
+				await this.getServiceIndex({
+					lat,
+					lng
+				})
+				this.updateServiceItem({
+					key: 'pageActive',
+					val: true
+				})
+				this.isLoad = true
+				if (this.userInfo.id) {
+					await Promise.all([this.getList(1), this.getCouponList()])
+				} else {
+					await this.getList(1)
+				}
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			toAppShare() {
+				let {
+					id: pid = 0
+				} = this.userInfo
+				let title = '首页'
+				let {
+					siteroot
+				} = siteInfo
+				let url = siteroot.split('/index.php')[0]
+				let href = `${url}/h5/#/pages/service?pid=${pid}`
+				let imageUrl = ''
+				this.$jweixin.wxReady(() => {
+					this.$jweixin.showOptionMenu()
+					this.$jweixin.shareAppMessage(title, '', href, imageUrl)
+					this.$jweixin.shareTimelineMessage(title, href, imageUrl)
+				})
+			},
+			// 轮播图/广告图跳转
+			goBanner(e) {
+				// connect_type 1查看大图，2文章
+				let {
+					connect_type,
+					type_id: id = 0,
+					img: current
+				} = e
+				switch (connect_type) {
+					case 1:
+						this.$util.previewImage({
+							current,
+							urls: [current]
+						})
+						break;
+					case 2:
+						this.$util.goUrl({
+							url: `/user/pages/article?id=${id}`
+						})
+						break;
+				}
+			},
+			goCate(e) {
+				let {
+					id,
+					title,
+					url: link = ''
+				} = e
+				let url = link || `/user/pages/service/list?id=${id}&title=${title}`
+				this.$util.goUrl({
+					url
+				})
+			},
+			async userGetCoupon() {
+				let ids = []
+				this.couponList.forEach(v => {
+					ids.push(v.id)
+				})
+				let res = await this.$api.service.userGetCoupon({
+					coupon_id: ids
+				})
+				this.$util.showToast({
+					title: `领取成功`
+				})
+				setTimeout(() => {
+					this.$util.goUrl({
+						url: '/user/pages/coupon/list'
+					})
+				}, 1000)
+				this.$refs.coupon_item.close()
+				this.loading = false
+				this.$util.hideAll()
+			},
+			async getCouponList() {
+				let list = await this.$api.service.couponList()
+				this.couponList = list
+				if (list.length > 0 && this.isLoad) {
+					this.$refs.coupon_item.open()
+				}
+				this.loading = false
+				this.$util.hideAll()
+			},
+			async getList(page = 0) {
+				if (page) {
+					let param = this.$util.deepCopy(this.param)
+					param.page = page
+					this.updateServiceItem({
+						key: 'param',
+						val: param
+					})
+				}
+				let {
+					list: oldList,
+					param,
+					tabList,
+					activeIndex
+				} = this
+				let {
+					sort,
+					sign
+				} = tabList[activeIndex]
+				let desc = activeIndex == 0 || sign == 1 ? '' : 'desc'
+				param.sort = `${sort} ${desc}`
+				await this.getServiceList(param)
+				this.loading = false
+				this.$util.hideAll()
+			},
+			handerTabChange(index) {
+				this.updateServiceItem({
+					key: 'activeIndex',
+					val: index
+				})
+				let tabList = this.$util.deepCopy(this.tabList)
+				let {
+					is_sign,
+					sign,
+				} = tabList[index];
+				if (is_sign) {
+					tabList[index].sign = sign == 0 ? 1 : 0;
+				}
+				this.updateServiceItem({
+					key: 'tabList',
+					val: tabList
+				})
+				this.$util.showLoading()
+				uni.pageScrollTo({
+					scrollTop: 0
+				})
+				this.getList(1)
+			},
+			toTechnician(index) {
+				let {
+					id,
+					city_id,
+					coach_name
+				} = this.recommend_list[index]
+				this.updateTechnicianItem({
+					key: 'pageActive',
+					val: false
+				})
+				this.$util.goUrl({
+					url: `/pages/technician?coach_id=${id}&coach_name=${coach_name}&city_id=${city_id}`,
+					openType: `reLaunch`
+				})
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.pages-home {
+		.search-box {
+			width: 100%;
+			bottom: 0;
+			z-index: 9;
+			overflow: hidden;
+		}
+
+		.recommend-technician {
+			white-space: nowrap;
+			width: 690rpx;
+			.recommend-item {
+				display: inline-block;
+			}
+
+			.recommend-item.type-1 {
+				width: 180rpx;
+				margin-left: 26rpx;
+
+				.cover {
+					width: 180rpx;
+					height: 180rpx;
+				}
+
+				.ellipsis {
+					max-width: 180rpx;
+				}
+			}
+
+			.recommend-item.type-2 {
+				width: 203rpx;
+				height: 151rpx;
+				background: #F4F6F7;
+				border-radius: 12rpx;
+				margin-left: 20rpx;
+
+				.cover {
+					width: 70rpx;
+					height: 70rpx;
+				}
+
+				.ellipsis {
+					max-width: 82rpx;
+				}
+
+				.iconyduixingxingshixin {
+					font-size: 26rpx;
+					background-image: -webkit-linear-gradient(270deg, #FAD961 0%, #F76B1C 100%);
+				}
+
+				.star-text {
+					height: 26rpx;
+					color: #FF9519;
+					margin-left: 6rpx;
+				}
+
+				.new-technician {
+					width: 67rpx;
+					height: 30rpx;
+					border-radius: 8rpx;
+					transform: rotateZ(360deg);
+				}
+			}
+
+			.recommend-item:nth-child(1) {
+				margin-left: 0;
+			}
+		}
+
+		.list-item {
+			.cover {
+				width: 180rpx;
+				height: 180rpx;
+			}
+
+			.time-long {
+				min-width: 72rpx;
+				height: 30rpx;
+				padding: 0 5rpx;
+				background: linear-gradient(270deg, #4C545A 0%, #282B34 100%);
+				border-radius: 4rpx;
+				font-size: 20rpx;
+				color: #FFEEB9;
+				margin-right: 16rpx;
+			}
+
+			.f-icontext {
+				font-size: 18rpx;
+			}
+
+			.text-delete {
+				font-size: 24rpx;
+				color: #B9B9B9;
+			}
+
+			.item-btn {
+				width: 150rpx;
+				height: 52rpx;
+				border-radius: 100rpx;
+			}
+		}
+	}
+
+	.radius-top {
+		border-radius: 30rpx 30rpx 0 0;
+	}	
+	
+	.coupon-popup {
+		width: 658rpx;
+		height: 865rpx;
+		position: relative;
+
+		.bg-img {
+			width: 100%;
+			height: 100%;
+		}
+
+		.icon-close {
+			font-size: 60rpx;
+			position: absolute;
+			top: 50rpx;
+			right: 60rpx;
+			z-index: 999;
+		}
+
+		.coupon-info {
+			position: absolute;
+			width: 100%;
+			height: 100%;
+			bottom: 0;
+			left: 0;
+
+			.tops {
+				width: 480rpx;
+				color: #FB4523;
+				position: absolute;
+				top: 260rpx;
+
+				>view:nth-child(1) {
+					font-weight: bold;
+					font-size: 30rpx;
+				}
+			}
+
+			.lists {
+				width: 500rpx;
+				height: 300rpx;
+				padding: 10rpx;
+				overflow-x: hidden;
+				position: absolute;
+				bottom: 222rpx;
+
+				.list {
+					width: 420rpx;
+					height: 130rpx;
+					margin-bottom: 10rpx;
+					margin-top: 5rpx;
+					position: relative;
+
+					>image {
+						width: 100%;
+						height: 100%;
+					}
+
+					>view {
+						position: absolute;
+						width: 100%;
+						height: 100%;
+						top: 0;
+						left: 8rpx;
+
+						>view:nth-child(1) {
+							width: 38%;
+						}
+
+						>view:nth-child(2) {
+							display: flex;
+							justify-content: center;
+							flex: 1;
+							padding: 0 15rpx;
+							box-sizing: border-box;
+						}
+
+						.price {
+							font-size: 30rpx;
+							color: #FB4523;
+						}
+
+						.title {
+							font-size: 30rpx;
+							line-height: 36rpx;
+							font-weight: bold;
+						}
+
+						.price_text {
+							color: #ccc;
+						}
+					}
+				}
+			}
+
+		}
+
+		view.btns {
+			width: 100%;
+			position: absolute;
+			height: 82rpx;
+			bottom: 0rpx;
+			left: 0;
+
+			>view {
+				width: 422rpx;
+				height: 82rpx;
+
+				border-radius: 40rpx;
+				font-size: 34rpx;
+				color: #FFFFFF;
+			}
+		}
+	}
+	
+	.servetip {
+		font-size: 28rpx;
+		font-weight: 400;
+		display: flex;
+		justify-content: space-between;
+		align-items: center;
+		margin: 22rpx 0;
+	}
+
+	.servefc{
+		display: flex;
+		align-items: center;
+	}
+	
+	.van-image {
+		position: relative;
+		display: inline-block;
+	}
+
+	.van-img {
+		width: 100%;
+		height: 100%;
+	}
+	.margin-20 {
+		margin: 0.53333rem;
+	}	
+	
+</style>
diff --git a/pages/shopstore.vue b/pages/shopstore.vue
new file mode 100644
index 0000000..34921ea
--- /dev/null
+++ b/pages/shopstore.vue
@@ -0,0 +1,382 @@
+<template>
+	<view class="pages-shopstore" v-if="isLoad">
+		<block v-if="configInfo.plugAuth.store">
+			
+			<fixed>
+				<search @input="toSearch" type="input" :padding="30" :radius="0" backgroundColor="#fff"
+					placeholder="请输入门店名称">
+				</search>
+			</fixed>
+
+			<view @tap.stop="goDetail(index)" class="list-item flex-center pd-lg mt-md ml-md mr-md fill-base radius-16"
+				v-for="(item,index) in list.data" :key="index">
+				<!-- #ifdef H5 -->
+				<view class="item-img radius-16">
+					<view class="h5-image item-img radius-16" :style="{ backgroundImage : `url('${item.cover}')`}">
+					</view>
+				</view>
+				<!-- #endif -->
+				<!-- #ifndef H5 -->
+				<image mode="aspectFill" class="item-img radius-16" :src="item.cover">
+				</image>
+				<!-- #endif -->
+				<view class="flex-1 ml-md max-510">
+					<view class="flex-y-center f-title c-title">
+						<view class="text-bold max-380 ellipsis">{{item.title}}</view>
+						<view @tap.stop="toPreviewImage(index)" class="store-status-btn flex-center ml-sm f-icontext"
+							:style="{color:item.work_status==1?primaryColor:'#888',borderColor:item.work_status==1?primaryColor:'#888'}">
+							{{item.work_status==1?'营业中':'休息中'}}
+						</view>
+					</view>
+					<view class="flex-between f-icontext mt-sm">
+						<view class="icon-item flex-y-center c-caption">
+							<view class="flex-y-center mr-lg"><i class="iconfont iconpingfen1 icon-font-color"></i>
+								<view class="star-text">{{item.star}}</view>
+							</view>
+							<view class="flex-y-center"><i
+									class="iconfont iconyingyeshijian"></i>{{item.start_time && item.end_time?`${item.start_time} - ${item.end_time}`:'暂未设置'}}
+							</view>
+						</view>
+						<view style="color: #E67D4B;"> {{item.total_num}}+次服务</view>
+					</view>
+					<view class="flex-between f-icontext mt-md">
+						<view class="rate-info flex-center c-base rel" :style="{color:primaryColor}">
+							<view class="bg abs" :style="{background:primaryColor}"></view>
+							<view class="mr-sm">好评率</view>{{item.positive_rate}}% <view class="ml-md mr-sm">接单率</view>
+							{{item.order_rate}}%
+						</view>
+						<view style="color: #636363;">{{item.distance}}</view>
+					</view>
+				</view>
+			</view>
+
+
+
+			<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading"
+				v-if="loading">
+			</load-more>
+			<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+
+
+		</block>
+		<block v-else>
+			<abnor :tip="[{ text: '当前页面没有权限，请点击导航栏切换页面', color: 0 }]"
+				image="https://lbqny.migugu.com/admin/anmo/technician/no_data.png"></abnor>
+		</block>
+
+
+		<view class="space-footer"></view>
+		<view :style="{height: `${configInfo.tabbarHeight}px`}"></view>
+		<tabbar :cur="6"></tabbar>
+
+		<!-- #ifdef APP-PLUS -->
+		<login-info></login-info>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	import siteInfo from '@/siteinfo.js';
+	import tabbar from "@/components/tabbar.vue"
+	export default {
+		components: {
+			tabbar
+		},
+		data() {
+			return {
+				isLoad: false,
+				options: {},
+				loading: true,
+				lockTap: false
+			}
+		},
+		computed: mapState({
+			pageActive: state => state.shopstore.pageActive,
+			param: state => state.shopstore.param,
+			list: state => state.shopstore.list,
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			autograph: state => state.user.autograph,
+			userInfo: state => state.user.userInfo,
+			location: state => state.user.location,
+			isGzhLogin: state => state.user.isGzhLogin,
+		}),
+		async onLoad(options) {
+			this.$util.showLoading()
+			options = await this.updateCommonOptions(options)
+			this.options = options
+			// #ifndef H5
+			this.$util.showLoading()
+			// #endif
+			await this.initIndex()
+			this.updateShopstoreItem({
+				key: 'pageActive',
+				val: true
+			})
+		},
+		async onShow() {
+			// #ifdef H5
+			if (this.$jweixin.isWechat()) {
+				await this.$jweixin.initJssdk();
+				this.toAppShare()
+			}
+			// #endif
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		onShareAppMessage(e) {
+			let {
+				id: pid = 0
+			} = this.userInfo
+			let path = `/pages/shopstore?pid=${pid}`
+			this.$util.log(path)
+			return {
+				title: '',
+				imageUrl: '',
+				path,
+			}
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getUserInfo', 'updateCommonOptions',
+				'getShopstoreList'
+			]),
+			...mapMutations(['updateUserItem', 'updateShopstoreItem']),
+			async initIndex(refresh = false) {
+				let {
+					pid = 0
+				} = this.options
+
+				if (!refresh && this.pageActive && !pid) {
+					this.isLoad = true
+					this.loading = false
+					this.$util.hideAll()
+					return
+				}
+
+				let {
+					isGzhLogin
+				} = this
+				let {
+					id: uid = 0
+				} = this.userInfo
+				if (pid && !uid) {
+					// #ifdef H5
+					if (isGzhLogin) {
+						setTimeout(() => {
+							this.getUserInfo()
+						}, 1000)
+					} else {
+						this.getUserInfo()
+					}
+					// #endif
+					// #ifndef H5
+					await this.getUserInfo()
+					// #endif 
+				}
+
+				if (!this.configInfo.id || refresh || (this.configInfo.id && !this.configInfo.plugAuth.hasOwnProperty(
+						'store'))) {
+					await this.getConfigInfo()
+				}
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				
+				let {
+					store = false
+				} = this.configInfo.plugAuth
+				if (!store) {
+					this.isLoad = true
+					this.loading = false
+					this.$util.hideAll()
+					return
+				}
+				
+				await this.getList(1)
+			},
+			async initRefresh() {
+				await this.initIndex(true)
+			},
+			toAppShare() {
+				let {
+					id: pid = 0
+				} = this.userInfo
+				let title = '动态'
+				let {
+					siteroot
+				} = siteInfo
+				let url = siteroot.split('/index.php')[0]
+				let href = `${url}/h5/#/pages/shopstore?pid=${pid}`
+				let imageUrl = ''
+				this.$jweixin.wxReady(() => {
+					this.$jweixin.showOptionMenu()
+					this.$jweixin.shareAppMessage(title, '', href, imageUrl)
+					this.$jweixin.shareTimelineMessage(title, href, imageUrl)
+				})
+			},
+			toSearch(val) {
+				this.param.title = val
+				this.getList(1)
+			},
+			async getList(flag) {
+				if (flag) {
+					this.param.page = 1
+					this.list.data = []
+				}
+				let {
+					location
+				} = this
+				if (!location.lat) {
+					// #ifdef H5
+					if (this.$jweixin.isWechat()) {
+						this.$util.showLoading()
+						// await this.$jweixin.initJssdk();
+						await this.$jweixin.wxReady2();
+						let {
+							latitude: lat = 0,
+							longitude: lng = 0
+						} = await this.$jweixin.getWxLocation()
+						location = {
+							lng,
+							lat,
+							address: '定位失败',
+							province: '',
+							city: '',
+							district: ''
+						}
+						if (lat && lng) {
+							let key = `${lat},${lng}`
+							let data = await this.$api.base.getMapInfo({
+								location: key
+							})
+							let {
+								status,
+								result
+							} = JSON.parse(data)
+							if (status == 0) {
+								let {
+									address,
+									address_component
+								} = result
+								let {
+									province,
+									city,
+									district
+								} = address_component
+								location = {
+									lng,
+									lat,
+									address,
+									province,
+									city,
+									district
+								}
+							}
+						}
+					}
+					// #endif
+					// #ifndef H5
+					location = await this.$util.getBmapLocation()
+					// #endif
+					this.updateUserItem({
+						key: 'location',
+						val: location
+					})
+				}
+				let {
+					lat = 0, lng = 0
+				} = location
+
+				let {
+					list: oldList,
+				} = this
+				let param = Object.assign({}, this.param, {
+					lat,
+					lng
+				});
+				await this.getShopstoreList(param)
+				this.isLoad = true
+				this.loading = false
+				this.$util.hideAll()
+			},
+			goDetail(index) {
+				let {
+					id
+				} = this.list.data[index]
+				this.$util.goUrl({
+					url: `/shopstore/pages/detail?id=${id}`
+				})
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.pages-shopstore {
+		.list-item {
+			.item-img {
+				width: 160rpx;
+				height: 143rpx;
+			}
+
+			.store-status-btn {
+				width: 76rpx;
+				height: 28rpx;
+				border-radius: 2rpx;
+				border: 1rpx solid #888;
+				transform: rotateZ(360deg);
+			}
+
+			.iconpingfen1 {
+				background-image: -webkit-linear-gradient(270deg, #FAD961 0%, #F76B1C 100%);
+			}
+
+			.icon-item {
+				color: #4D4D4D;
+
+				.iconfont {
+					font-size: 24rpx;
+					margin-right: 6rpx;
+				}
+			}
+
+			.star-text {
+				color: #FF9519;
+			}
+
+			.rate-info {
+				height: 30rpx;
+				border-radius: 4rpx;
+				padding: 1rpx 12rpx 0 12rpx;
+
+				.bg {
+					opacity: 0.1;
+					border-radius: 4rpx;
+					top: 0;
+					left: 0;
+					right: 0;
+					bottom: 0;
+					z-index: 1;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/technician.vue b/pages/technician.vue
new file mode 100644
index 0000000..12ea15f
--- /dev/null
+++ b/pages/technician.vue
@@ -0,0 +1,587 @@
+<template>
+	<view class="pages-technician">
+		<fixed :initHeight="configInfo.coach_format">
+			<uni-nav-bar :fixed="false" :shadow="false" :statusBar="true" :onlyLeft="true" :color="`#fff`"
+				:backgroundColor="primaryColor">
+				<view @tap.stop="toChooseLocation" class="map-info flex-y-center" slot="left">
+					<view class="flex-y-center c-base">
+						<i class="iconfont iconjuli mr-sm"></i>
+						<view class="map-text max-400 ellipsis">
+							{{location&&location.address ?location.address : isLoad ? '定位失败' : '定位中...'}}
+						</view>
+						<i class="iconfont icon-down"></i>
+					</view>
+				</view>
+			</uni-nav-bar>
+			<view class="fix-info fill-body rel" :style="{height:configInfo.coach_format == 2?'124rpx':''}">
+				<view class="space-top abs" :style="{background:primaryColor}"></view>
+				<view class="search-info fill-base pt-lg pl-lg pr-lg abs"
+					:class="[{'pb-md':configInfo.coach_format!=2}]">
+					<view class="flex-center"
+						:class="[{'pb-md':configInfo.coach_format!=2},{'pb-lg':configInfo.coach_format==2}]">
+						<view class="city-info">
+							<picker @change="pickerChange($event)" :value="cityIndex" :range="cityList"
+								range-key="title">
+								<view class="city-info flex-y-center">
+									<view>
+										<block v-if="cityList&&cityList.length > 0">
+											{{cityIndex === -1 ? '未知' : cityList[cityIndex].title.length > 3 ? cityList[cityIndex].title.substring(0,3) + '...':cityList[cityIndex].title}}
+										</block>
+										<block v-else>请选择</block>
+									</view>
+									<i class="iconfont iconshaixuanxia-1 ml-sm"></i>
+								</view>
+							</picker>
+						</view>
+						<view class="flex-1">
+							<search @input="toSearch" type="input" :keyword="param.coach_name" :padding="0" :radius="30"
+								backgroundColor="#F0F0F0" :placeholder="'请输入'+$t('action.attendantName')+'姓名'">
+							</search>
+						</view>
+					</view>
+					<block v-if="configInfo.coach_format != 2">
+						<tab @change="handerTabChange" :list="tabList" :activeIndex="activeIndex*1"
+							:activeColor="primaryColor" width="25%" height="90rpx" fontSize="28rpx"></tab>
+					</block>
+				</view>
+			</view>
+		</fixed>
+
+		<block v-if="pageActive && list.data && list.data.length>0">
+			<view class="mt-md ml-md mr-md" v-for="(item,index) in list.data" :key="index">
+				<technician-list-item @comment="toShowPopup(index,'message')" @collect="toCollect(index)"
+					@order="toShowPopup(index,'technician')" :info="item">
+				</technician-list-item>
+			</view>
+		</block>
+
+		<!-- #ifdef H5 -->
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+		<!-- #endif -->
+		<!-- #ifndef H5 -->
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0&&location.lng" :loading="loading"
+			v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1&&location.lng"></abnor>
+		<abnor @confirm="toOpenLocation" :tip="[{ text: '定位失败，请开启地理位置授权后刷新页面重试~', color: 0 }]"
+			:button="[{ text: '开启定位' , type: 'confirm' }]" btnSize="" v-if="!loading && !location.lng"> </abnor>
+		<!-- #endif -->
+
+		<view class="space-footer"></view>
+
+		<technician-list-popup ref="technician_list_popup"></technician-list-popup>
+
+		<uni-popup ref="choose_city_item" type="top" :custom="true" :zIndex="999">
+			<view :style="{height:configInfo.navBarHeight + 8 + 'px'}"></view>
+			<view class="choose-city-popup rel">
+				<image class="city-img" src="https://lbqny.migugu.com/admin/anmo/technician/no_city.png"></image>
+				<view class="text f-paragraph c-base abs">
+					很抱歉,该城市未开通, 点击左上角切换其他城市下单服务
+				</view>
+				<view class="flex-between">
+					<view></view>
+					<view @tap.stop="$refs.choose_city_item.close()"
+						class="item-btn flex-center f-paragraph c-title text-bold radius">知道了</view>
+				</view>
+			</view>
+		</uni-popup>
+
+
+		<view :style="{height: `${configInfo.tabbarHeight}px`}"></view>
+		<tabbar :cur="2"></tabbar>
+
+		<!-- #ifdef APP-PLUS -->
+		<login-info></login-info>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	import siteInfo from '@/siteinfo.js';
+	import tabbar from "@/components/tabbar.vue"
+	import technicianListItem from "@/components/technician-list-item.vue"
+	import technicianListPopup from "@/components/technician-list-popup.vue"
+	export default {
+		components: {
+			tabbar,
+			technicianListItem,
+			technicianListPopup
+		},
+		data() {
+			return {
+				isLoad: false,
+				options: {},
+				loading: true,
+				lockTap: false,
+			}
+		},
+		computed: mapState({
+			pageActive: state => state.technician.pageActive,
+			haveOperItem: state => state.technician.haveOperItem,
+			cityId: state => state.technician.cityId,
+			cityIndex: state => state.technician.cityIndex,
+			cityList: state => state.technician.cityList,
+			activeIndex: state => state.technician.activeIndex,
+			tabList: state => state.technician.tabList,
+			param: state => state.technician.param,
+			list: state => state.technician.list,
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			loginType: state => state.user.loginType,
+			userInfo: state => state.user.userInfo,
+			location: state => state.user.location,
+			isGzhLogin: state => state.user.isGzhLogin,
+			haveShieldOper: state => state.user.haveShieldOper,
+		}),
+		async onLoad(options) {
+			this.options = options
+			let {
+				pid = 0,
+					city_id = 0,
+					coach_id = 0,
+					coach_name = ''
+			} = options
+
+			let param = this.$util.deepCopy(this.param)
+			param.coach_id = coach_id
+			param.coach_name = coach_name
+			this.updateTechnicianItem({
+				key: 'param',
+				val: param
+			})
+
+			if (coach_id) {
+				this.updateTechnicianItem({
+					key: 'cityId',
+					val: city_id
+				})
+			}
+			// #ifdef H5
+			uni.setNavigationBarTitle({
+				title: this.$t('action.attendantName')
+			})
+			// #endif
+			// #ifndef H5
+			this.$util.showLoading()
+			// #endif
+
+			let {
+				data = []
+			} = this.list
+			let city_refresh = data.length == 0 || data[0].city_id != this.cityId
+			if (this.pageActive && (!coach_id || !pid) && !city_refresh) {
+				this.isLoad = true
+				this.loading = false
+				this.$util.hideAll()
+				return
+			}
+			await this.initIndex()
+		},
+		async onShow() {
+			// #ifdef H5
+			if (this.$jweixin.isWechat()) {
+				await this.$jweixin.initJssdk();
+				this.toAppShare()
+			}
+			// #endif
+			if (this.haveShieldOper == 2 || this.haveOperItem) {
+				this.initIndex()
+				this.updateUserItem({
+					key: 'haveShieldOper',
+					val: 0
+				})
+				this.updateTechnicianItem({
+					key: 'haveOperItem',
+					val: false
+				})
+			}
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.loading = true;
+			this.getList(this.param.page + 1);
+		},
+		onShareAppMessage(e) {
+			let {
+				id: pid = 0
+			} = this.userInfo
+			let path = `/pages/technician?pid=${pid}`
+			this.$util.log(path)
+			return {
+				title: '',
+				imageUrl: '',
+				path,
+			}
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getUserInfo', 'getCityList', 'getServiceCoachList']),
+			...mapMutations(['updateUserItem', 'updateTechnicianItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.toAppShare()
+				}
+				// #endif
+				let {
+					pid = 0
+				} = this.options
+				let {
+					isGzhLogin
+				} = this
+				let {
+					id: uid = 0
+				} = this.userInfo
+				if (pid && !uid) {
+					// #ifdef H5
+					if (isGzhLogin) {
+						setTimeout(() => {
+							this.getUserInfo()
+						}, 1000)
+					} else {
+						this.getUserInfo()
+					}
+					// #endif
+					// #ifndef H5
+					await this.getUserInfo()
+					// #endif 
+				}
+
+				if (!this.configInfo.id || refresh) {
+					await this.getConfigInfo()
+				}
+				await this.getList(1, true)
+				this.updateTechnicianItem({
+					key: 'pageActive',
+					val: true
+				})
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			toAppShare() {
+				let {
+					id: pid = 0
+				} = this.userInfo
+				let title = this.$t('action.attendantName')
+				let {
+					siteroot
+				} = siteInfo
+				let url = siteroot.split('/index.php')[0]
+				let href = `${url}/h5/#/pages/technician?pid=${pid}`
+				let imageUrl = ''
+				this.$jweixin.wxReady(() => {
+					this.$jweixin.showOptionMenu()
+					this.$jweixin.shareAppMessage(title, '', href, imageUrl)
+					this.$jweixin.shareTimelineMessage(title, href, imageUrl)
+				})
+			},
+			pickerChange(e, val) {
+				let ind = e.target.value
+				this.updateTechnicianItem({
+					key: 'cityIndex',
+					val: ind
+				})
+				this.updateTechnicianItem({
+					key: 'cityId',
+					val: this.cityList[ind].id
+				})
+				this.getList(1)
+			},
+			toOpenLocation() {
+				this.$util.checkAuth({
+					type: 'userLocation'
+				})
+				// #ifdef APP-PLUS
+				uni.getSystemInfo({
+					success: (sys) => {
+						if (sys.platform == 'ios') {
+							plus.runtime.openURL("app-settings://");
+						} else {
+							var main = plus.android.runtimeMainActivity();
+							var Intent = plus.android.importClass(
+								"android.content.Intent");
+							//可能应该直接进入应用列表的权限设置？=> android.settings.APPLICATION_SETTINGS  
+							var mIntent = new Intent(
+								'android.settings.LOCATION_SOURCE_SETTINGS'
+							);
+							main.startActivity(mIntent);
+						}
+					}
+				})
+				// #endif
+			},
+			toSearch(val) {
+				let param = this.$util.deepCopy(this.param)
+				param.coach_id = ''
+				param.coach_name = val
+				this.updateTechnicianItem({
+					key: 'param',
+					val: param
+				})
+				this.getList(1)
+			},
+			// 选择地区
+			async toChooseLocation(e) {
+				await this.$util.checkAuth({
+					type: 'userLocation'
+				})
+				let {
+					lat: locaLat = '',
+					lng: locaLng = ''
+				} = this.location
+				let param = {}
+				if (!locaLat && !locaLng) {
+					// #ifdef H5
+					if (this.$jweixin.isWechat()) {
+						this.$util.showLoading()
+						await this.$jweixin.wxReady2();
+						let {
+							latitude,
+							longitude
+						} = await this.$jweixin.getWxLocation()
+						locaLat = latitude
+						locaLng = longitude
+					}
+					// #endif
+					// #ifdef APP-PLUS
+					let location = await this.$util.getBmapLocation()
+					locaLat = location.lat
+					locaLng = location.lng
+					// #endif
+				}
+
+				// #ifndef MP-WEIXIN
+				param = {
+					latitude: locaLat,
+					longitude: locaLng
+				}
+				// #endif
+				let [, {
+					address = '',
+					longitude: lng,
+					latitude: lat,
+					province = '',
+					city = '',
+					district = '',
+				}] = await uni.chooseLocation(param);
+				if (!lng) return
+				let location = {
+					lng,
+					lat,
+					address,
+					province,
+					city,
+					district
+				}
+				this.updateUserItem({
+					key: 'location',
+					val: location
+				})
+				await this.getList(1, true, 1)
+			},
+			async getList(page = 0, refresh = false, change = 0) {
+				if (page) {
+					let param = this.$util.deepCopy(this.param)
+					param.page = page
+					this.updateTechnicianItem({
+						key: 'param',
+						val: param
+					})
+				}
+				let {
+					location
+				} = this
+				if (!location.lat || (location.lat && location.address == '定位失败')) {
+					// #ifdef H5
+					if (this.$jweixin.isWechat()) {
+						this.$util.showLoading()
+						// await this.$jweixin.initJssdk();
+						await this.$jweixin.wxReady2();
+						let {
+							lat = '', lng = ''
+						} = location
+						if (!lat && !lng) {
+							let {
+								latitude,
+								longitude
+							} = await this.$jweixin.getWxLocation()
+							lat = latitude
+							lng = longitude
+							location = {
+								lng,
+								lat,
+								address: '定位失败',
+								province: '',
+								city: '',
+								district: ''
+							}
+						}
+						if (lat && lng) {
+							let key = `${lat},${lng}`
+							let data = await this.$api.base.getMapInfo({
+								location: key
+							})
+							let {
+								status,
+								result
+							} = JSON.parse(data)
+							if (status == 0) {
+								let {
+									address,
+									address_component
+								} = result
+								let {
+									province,
+									city,
+									district
+								} = address_component
+								location = {
+									lng,
+									lat,
+									address,
+									province,
+									city,
+									district
+								}
+							}
+						}
+					}
+					// #endif
+					// #ifndef H5
+					location = await this.$util.getBmapLocation()
+					// #endif
+					this.updateUserItem({
+						key: 'location',
+						val: location
+					})
+				}
+				let {
+					lng = 0,
+						lat = 0
+				} = location
+
+				if (refresh) {
+					await this.getCityList({
+						lng,
+						lat,
+						change
+					})
+				}
+
+				let {
+					list: oldList,
+					tabList,
+					activeIndex,
+					cityList,
+					cityIndex,
+					cityId: city_id
+				} = this
+
+				let param = this.$util.deepCopy(this.param)
+
+				let ind = cityList.findIndex(item => {
+					return item.id == city_id
+				})
+
+				if (ind == -1) {
+					this.$refs.choose_city_item.open()
+					this.loading = false
+					this.$util.hideAll()
+					this.updateTechnicianItem({
+						key: 'list',
+						val: {
+							data: [],
+							last_page: 1,
+							current_page: 1
+						}
+					})
+					return
+				}
+
+				city_id = ind == -1 ? 0 : city_id
+				cityIndex = ind == -1 ? 0 : ind
+
+
+				this.updateTechnicianItem({
+					key: 'cityIndex',
+					val: cityIndex
+				})
+
+				this.updateTechnicianItem({
+					key: 'cityId',
+					val: city_id
+				})
+
+				param = Object.assign({}, param, {
+					lng,
+					lat,
+					city_id
+				})
+
+				let {
+					coach_format = 1
+				} = this.configInfo
+
+				if (coach_format == 1) {
+					param.type = tabList[activeIndex].id
+				}
+
+				await this.getServiceCoachList(param)
+				this.loading = false
+				this.$util.hideAll()
+			},
+			handerTabChange(index) {
+				this.updateTechnicianItem({
+					key: 'activeIndex',
+					val: index
+				})
+				this.$util.showLoading()
+				uni.pageScrollTo({
+					scrollTop: 0
+				})
+				this.getList(1)
+			},
+			async toShowPopup(index, key) {
+				this.$refs.technician_list_popup.toShowPopup(this.list.data[index], key)
+			},
+			async toCollect(index) {
+				let {
+					id,
+					is_collect,
+					collect_num
+				} = this.list.data[index]
+				let methodModel = is_collect ? 'delCollect' : 'addCollect'
+				await this.$api.mine[methodModel]({
+					coach_id: id
+				})
+				this.$util.showToast({
+					title: is_collect ? '取消成功' : '收藏成功'
+				})
+				this.list.data[index].is_collect = is_collect == 1 ? 0 : 1
+				this.list.data[index].collect_num = is_collect == 1 ? collect_num - 1 :
+					collect_num + 1
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+</style>
\ No newline at end of file
diff --git a/pages/test.vue b/pages/test.vue
new file mode 100644
index 0000000..10caad8
--- /dev/null
+++ b/pages/test.vue
@@ -0,0 +1,82 @@
+<template>
+	<view>
+		<button @tap.stop="aaa" class="clear-btn order">点击我</button>
+	</view>
+</template>
+
+<script>
+	var jweixin = require('jweixin-module');
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		async onLoad(options) {
+			this.initIndex()
+		},
+		methods: {
+			async initIndex(){
+				await this.$jweixin.initJssdk();
+				this.$jweixin.wxReady(() => {
+					this.$jweixin.hideOptionMenu()
+				})
+			},
+			async aaa() {
+				let url = await this.$api.order.getVirtualPhone({
+					order_id:188
+				})
+				console.log(url)
+				// #ifdef H5
+				// if (this.$jweixin.isWechat()) {
+					
+				// 	this.$util.showLoading()
+				// 	await this.$jweixin.wxReady2();
+				// 	let {
+				// 		latitude: lat = 0,
+				// 		longitude: lng = 0
+				// 	} = await this.$jweixin.getWxLocation();
+					
+				// 	if (!lat) {
+				// 		this.$util.hideAll()
+				// 		this.$util.showToast({
+				// 			title: `请授权定位当前地址`
+				// 		})
+				// 		return
+				// 	}
+				// 	if (lat && lng) {
+				// 		let key = `${lat},${lng}`
+				// 		let data = await this.$api.base.getMapInfo({
+				// 			location: key
+				// 		})
+				// 		let {
+				// 			status,
+				// 			result
+				// 		} = JSON.parse(data)
+				// 		if (status == 0) {
+				// 			this.$util.hideAll()
+				// 			let {
+				// 				address
+				// 			} = result
+				// 			let location = {
+				// 				lat,
+				// 				lng,
+				// 				address
+				// 			}
+				// 			// alert(JSON.stringify(location))
+				// 		}
+				// 	}
+				// }
+				// #endif
+			}
+		},
+	}
+</script>
+
+<style>
+</style>
\ No newline at end of file
diff --git a/shopstore/pages/detail.vue b/shopstore/pages/detail.vue
new file mode 100644
index 0000000..82ebcab
--- /dev/null
+++ b/shopstore/pages/detail.vue
@@ -0,0 +1,409 @@
+<template>
+	<view class="shopstore-detail order-pages rel" v-if="detail.info && detail.info.id">
+		<image @tap.stop="$util.previewImage({current:detail.info.cover,urls:[detail.info.cover]})" mode="aspectFill"
+			class="cover-img" :src="detail.info.cover">
+		</image>
+		<view class="pd-lg fill-base">
+			<view class="f-md-title c-black text-bold">{{detail.info.title || '-'}}</view>
+			<view @tap.stop="$util.goUrl({url:`/shopstore/pages/store-info?id=${options.id}`})"
+				class="flex-between pt-lg pb-lg b-1px-b">
+				<view class="flex-y-center" style="color: #303030;">
+					<i class="iconfont iconyingyezhizhao mr-sm"></i>
+					营业执照：<view class="max-450 ellipsis">{{detail.info.attestation}}</view>
+				</view>
+				<i class="iconfont icon-right" style="font-size: 20rpx;"></i>
+			</view>
+			<view class="pt-lg pb-lg">
+				<view class="flex-y-center" style="color: #303030;">
+					<i class="iconfont iconyingyeshijian mr-sm"></i>
+					营业时间：<view class="max-450 ellipsis">
+						{{detail.info.start_time && detail.info.end_time ?`${detail.info.start_time} - ${detail.info.end_time}`:'暂未设置'}}
+					</view>
+				</view>
+			</view>
+			<view class="store-info flex-between pb-sm">
+				<view class="flex-y-center" style="color: #303030;">
+					<i class="iconfont icondizhi1 mr-sm"></i>
+					<view class="c-title flex-1 mr-md">
+						<span>{{detail.info.address || `暂未设置门店地址`}}</span>
+						<span @tap.stop="$util.goUrl({url:detail.info.address,openType:'copy'})"
+							class="copy-btn span radius-5 f-icontext ml-sm"
+							:style="{color:primaryColor,borderColor:primaryColor}" v-if="detail.info.address">复制</span>
+					</view>
+				</view>
+				<view class="flex-center">
+					<view @tap.stop="$util.goUrl({url:detail.info.phone,openType:'call'})"
+						class="item-icon rel flex-center radius-16">
+						<view class="item-icon radius-16 abs" :style="{background:primaryColor}"></view>
+						<i class="iconfont icondadianhua_1" :style="{color:primaryColor}"></i>
+					</view>
+					<view @tap.stop="toMap" class="item-icon rel flex-center radius-16 ml-md"
+						v-if="detail.info.address">
+						<view class="item-icon radius-16 abs" :style="{background:primaryColor}"></view>
+						<i class="iconfont icondizhi_1" :style="{color:primaryColor}"></i>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="fill-base mt-md pt-lg pb-lg">
+			<view @tap.stop="$util.goUrl({url: `/shopstore/pages/service?id=${options.id}`})"
+				class="flex-between pl-lg pr-md " :class="[{'pb-lg': detail.service_list.length>0}]">
+				<view class="f-paragraph c-black text-bold">推荐项目</view>
+				<view class="flex-y-center f-caption c-caption">查看更多<i class="iconfont icongengduo"
+						style="font-size: 24rpx;"></i></view>
+			</view>
+
+
+			<view class="pl-lg pr-lg b-1px-b" :class="[{'mt-md':index!=0},{'pb-md':index!=detail.service_list.length-1}]"
+				v-for="(item,index) in detail.service_list" :key="index">
+				<service-list-item :info="item" :sid="options.id" maxWidth="490rpx"></service-list-item>
+			</view>
+
+		</view>
+
+		<view class="fill-base mt-md pt-lg pl-lg pr-md pb-lg">
+			<view @tap.stop="$util.goUrl({url: `/shopstore/pages/technician?id=${options.id}`})" class="flex-between"
+				:class="[{'pb-lg':detail.coach_list.length > 0}]">
+				<view class="f-paragraph c-black text-bold">{{$t('action.attendantName')}}展示</view>
+				<view class="flex-y-center f-caption c-caption">查看更多<i class="iconfont icongengduo"
+						style="font-size: 24rpx;"></i></view>
+			</view>
+			<scroll-view scroll-x class="recommend-technician">
+				<view @tap.stop="toTechnician(index)" class="recommend-item" v-for="(item,index) in detail.coach_list"
+					:key="index">
+					<!-- #ifdef H5 -->
+					<view class="cover radius">
+						<view class="h5-image cover radius" :style="{ backgroundImage : `url('${item.work_img}')`}">
+						</view>
+					</view>
+					<!-- #endif -->
+					<!-- #ifndef H5 -->
+					<image mode="aspectFill" lazy-load class="cover radius" :src="item.work_img"></image>
+					<!-- #endif -->
+					<view class="flex-center f-desc c-title mt-md">
+						<view class="ellipsis">{{item.coach_name}}</view>
+					</view>
+				</view>
+			</scroll-view>
+		</view>
+
+		<view class="fill-base pl-lg pr-lg">
+			<view class="comment-item flex-warp pt-lg" :class="[{'mt-md':index==0},{'b-1px-t':index!=0}]"
+				v-for="(item,index) in list.data" :key="index">
+				<image mode="aspectFill" class="avatar radius" :src="item.avatarUrl"></image>
+				<view class="flex-1 mt-sm ml-md pb-lg">
+					<view class="flex-between">
+						<view class="flex-y-center">
+							<view class="f-paragraph c-title mr-md max-200 ellipsis">{{item.nickName}}</view>
+							<view class="flex-warp">
+								<i class="iconfont iconpingfen1 icon-font-color"
+									:style="{backgroundImage: aindex< item.star?`-webkit-linear-gradient(270deg, #FAD961 0%, #F76B1C 100%)`:`-webkit-linear-gradient(270deg, #f4f6f8 0%, #ccc 100%)`}"
+									v-for="(aitem,aindex) in 5" :key="aindex"></i>
+							</view>
+						</view>
+						<view class="f-icontext c-caption">{{item.create_time}}</view>
+					</view>
+					<view class="flex-warp mt-sm">
+						<view class="pt-sm pb-sm pl-md pr-md mt-sm mr-sm radius fill-body f-caption c-desc"
+							v-for="(item,index) in item.lable_text" :key="index">{{item}}</view>
+					</view>
+					<view class="f-caption c-caption mt-md">
+						<text decode="emsp" style="word-break:break-all;">{{item.text}}</text>
+					</view>
+				</view>
+			</view>
+			<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading"
+				v-if="loading">
+			</load-more>
+		</view>
+
+		<view class="space-footer"></view>
+
+		<!-- #ifdef APP-PLUS -->
+		<view @tap.stop="toAppShare"
+			class="common-share-btn detail fix flex-center flex-column c-base box-shadow radius"
+			:style="{background:primaryColor}" v-if="userInfo.id">
+			<i class="iconfont iconweixin"></i>
+			<view class="f-icontext">分享</view>
+		</view>
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	import serviceListItem from "@/components/service-list-item.vue"
+	export default {
+		components: {
+			serviceListItem
+		},
+		data() {
+			return {
+				options: {},
+				detail: {},
+				param: {
+					page: 1,
+				},
+				list: {
+					data: []
+				},
+				loading: true,
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad(options) {
+			this.options = options
+			this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		onShareAppMessage(e) {
+			let {
+				id: pid = 0
+			} = this.userInfo
+			let {
+				id,
+				title,
+				cover: imageUrl
+			} = this.detail.info
+			let path = `/shopstore/pages/detail?pid=${pid}&id=${id}`
+			this.$util.log(path)
+			return {
+				title,
+				imageUrl,
+				path,
+			}
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getUserInfo']),
+			...mapMutations(['updateTechnicianItem']),
+			async initIndex(refresh = false) {
+				let {
+					pid = 0
+				} = this.options
+				let {
+					isGzhLogin
+				} = this
+				let {
+					id: uid = 0
+				} = this.userInfo
+				if (pid && !uid) {
+					// #ifdef H5
+					if (isGzhLogin) {
+						setTimeout(() => {
+							this.getUserInfo()
+						}, 1000)
+					} else {
+						this.getUserInfo()
+					}
+					// #endif
+					// #ifndef H5
+					await this.getUserInfo()
+					// #endif 
+				}
+				if (!this.configInfo.id || refresh) {
+					await this.getConfigInfo()
+				}
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				await Promise.all(this.getDetail(), this.getList())
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					setTimeout(() => {
+						this.toAppShare()
+					}, 1200)
+				}
+				// #endif
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			toAppShare() {
+				let {
+					id: pid = 0
+				} = this.userInfo
+				let {
+					id,
+					title,
+					cover: imageUrl
+				} = this.detail.info
+				let summary = ''
+
+				let {
+					siteroot
+				} = siteInfo
+				let url = siteroot.split('/index.php')[0]
+				let href = `${url}/h5/#/shopstore/pages/detail?id=${id}&pid=${pid}`
+
+				// #ifdef H5
+				this.$jweixin.wxReady(() => {
+					this.$jweixin.showOptionMenu()
+					this.$jweixin.shareAppMessage(title, summary, href, imageUrl)
+					this.$jweixin.shareTimelineMessage(title, href, imageUrl)
+				})
+				// #endif
+				// #ifdef APP-PLUS
+				uni.share({
+					provider: "weixin",
+					scene: 'WXSceneSession',
+					type: 0,
+					href,
+					title,
+					summary,
+					imageUrl,
+					success: function(res) {
+						console.log("success:" + JSON.stringify(res));
+					},
+					fail: function(err) {
+						console.log("fail:" + JSON.stringify(err));
+					}
+				});
+				// #endif
+			},
+			async getDetail() {
+				let {
+					id
+				} = this.options
+				let data = await this.$api.shopstore.storeInfo({
+					id
+				})
+				this.detail = data
+				this.$util.hideAll()
+			},
+			async getList() {
+				let {
+					list: oldList,
+					param,
+				} = this
+				let {
+					id
+				} = this.options
+				param.id = id
+				let newList = await this.$api.shopstore.commentList(param);
+
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+			},
+			// 查看定位
+			async toMap() {
+				let {
+					address,
+					lat,
+					lng
+				} = this.detail.info
+				await this.$util.checkAuth({
+					type: 'userLocation'
+				})
+				await uni.getLocation({
+					type: 'gcj02',
+				})
+				await uni.openLocation({
+					latitude: lat * 1,
+					longitude: lng * 1,
+					name: address,
+					scale: 28
+				})
+			},
+			toTechnician(index) {
+				let {
+					id,
+					city_id,
+					coach_name
+				} = this.detail.coach_list[index]
+				this.updateTechnicianItem({
+					key: 'pageActive',
+					val: false
+				})
+				this.$util.goUrl({
+					url: `/pages/technician?coach_id=${id}&coach_name=${coach_name}&city_id=${city_id}`,
+					openType: `reLaunch`
+				})
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.shopstore-detail {
+		.cover-img {
+			width: 750rpx;
+			height: 417rpx;
+		}
+
+		.iconyingyezhizhao,
+		.iconyingyeshijian,
+		.icondizhi1 {
+			color: #A2A2A2;
+		}
+
+		.recommend-technician {
+			white-space: nowrap;
+			width: 690rpx;
+
+			.recommend-item {
+				width: 133rpx;
+				margin-left: 30rpx;
+				display: inline-block;
+
+				.cover {
+					width: 133rpx;
+					height: 133rpx;
+				}
+
+				.ellipsis {
+					max-width: 133rpx;
+				}
+			}
+
+			.recommend-item:nth-child(1) {
+				margin-left: 0;
+			}
+		}
+
+		.comment-item {
+			.avatar {
+				width: 52rpx;
+				height: 52rpx;
+				background: #f4f6f8;
+			}
+
+			.iconpingfen1 {
+				font-size: 28rpx;
+				margin-right: 5rpx;
+				font-size: 28rpx;
+			}
+		}
+
+	}
+</style>
\ No newline at end of file
diff --git a/shopstore/pages/service.vue b/shopstore/pages/service.vue
new file mode 100644
index 0000000..f188dd7
--- /dev/null
+++ b/shopstore/pages/service.vue
@@ -0,0 +1,107 @@
+<template>
+	<view class="shopstore-service">
+		<view class="fill-base pd-lg b-1px-b" v-for="(item,index) in list.data" :key="index">
+			<service-list-item :info="item" :sid="options.id"></service-list-item>
+		</view>
+		<load-more :noMore="list.current_page >= list.last_page && list.data.length > 0" :loading="loading"
+			v-if="loading">
+		</load-more>
+		<abnor v-if="!loading && list.data.length <= 0 && list.current_page == 1"></abnor>
+		<view class="space-footer"></view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	import serviceListItem from "@/components/service-list-item.vue"
+	export default {
+		components: {
+			serviceListItem
+		},
+		data() {
+			return {
+				options: {},
+				loading: true,
+				param: {
+					page: 1,
+				},
+				list: {
+					data: []
+				},
+				count: {}
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+			location: state => state.user.location,
+		}),
+		onLoad(options) {
+			this.options = options
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+			this.$util.showLoading()
+			this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			...mapMutations([]),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				this.getList()
+			},
+			async initRefresh() {
+				this.param.page = 1
+				await this.initIndex(true)
+			},
+			async getList() {
+				let {
+					list: oldList,
+					param,
+				} = this
+				let {
+					id
+				} = this.options
+				param.id = id
+				let newList = await this.$api.shopstore.storeServiceList(param)
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+</style>
\ No newline at end of file
diff --git a/shopstore/pages/store-info.vue b/shopstore/pages/store-info.vue
new file mode 100644
index 0000000..3587e43
--- /dev/null
+++ b/shopstore/pages/store-info.vue
@@ -0,0 +1,130 @@
+<template>
+	<view class="shopstore-store-info rel" v-if="detail.id">
+		<view class="bg abs" :style="{background: `linear-gradient(180deg, ${primaryColor} 0%, ${subColor} 100%)`}"></view>
+		<view class="ml-md mr-md">
+			<view class="space-lg"></view>
+			<view class="fill-base pd-lg f-paragraph c-paragraph radius-18">
+				<view class="flex-y-center pb-lg c-title b-1px-b">
+					<i class="iconfont icongongsi"></i>
+					<view class="flex-1 ml-md f-mini-title text-bold ellipsis">{{detail.attestation}}</view>
+				</view>
+				<view class="count-item flex-x-center pt-lg">
+					<view class="flex-center flex-column">
+						<view class="f-title c-title">{{detail.total_num}}+</view>
+						<view class="f-icontext c-caption">服务次数</view>
+					</view>
+					<view class="flex-center flex-column">
+						<view class="f-title c-title">{{detail.order_rate}}%</view>
+						<view class="f-icontext c-caption">接单率</view>
+					</view>
+					<view class="flex-center flex-column">
+						<view class="f-title c-title">{{detail.positive_rate}}%</view>
+						<view class="f-icontext c-caption">好评率</view>
+					</view>
+				</view>
+			</view>
+			<view class="fill-base mt-md pd-lg f-paragraph c-paragraph radius-18">
+				<view class="f-mini-title c-title text-bold mb-lg">营业执照</view>
+				<view class="flex-center img-list radius-16">
+					<image
+						@tap.stop="$util.previewImage({current:detail.business_license,urls:[detail.business_license]})"
+						mode="aspectFill" class="img-item radius-16" :src="detail.business_license">
+					</image>
+				</view>
+			</view>
+			<view class="fill-base mt-md pd-lg f-paragraph c-paragraph radius-18">
+				<view class="f-mini-title c-title text-bold mb-md">商家简介</view>
+				<text class="f-paragraph c-paragraph" decode="emsp" style="word-break:break-all;">{{detail.text}}</text>
+			</view>
+		</view>
+		<view class="space-footer"></view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		data() {
+			return {
+				options: {},
+				detail: {},
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad(options) {
+			this.options = options
+			this.initIndex()
+		},
+		methods: {
+			...mapMutations(['updateUserItem']),
+			async initIndex() {
+				// #ifdef H5
+				if (this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				await this.getDetail()
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+			},
+			async getDetail() {
+				let {
+					id
+				} = this.options
+				let {
+					info
+				} = await this.$api.shopstore.storeInfo({
+					id
+				})
+				let {
+					title
+				} = info
+				uni.setNavigationBarTitle({
+					title
+				})
+				this.detail = info
+				this.$util.hideAll()
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.shopstore-store-info {
+		.bg {
+			width: 100%;
+			height: 172rpx;
+			z-index: -1;
+		}
+
+		.count-item {
+			.flex-column {
+				width: 33.33%;
+			}
+		}
+
+		.img-list {
+			height: 282rpx;
+			background: #F5F5F5;
+
+			.img-item {
+				width: 339rpx;
+				height: 242rpx;
+			}
+		}
+
+	}
+</style>
diff --git a/shopstore/pages/technician.vue b/shopstore/pages/technician.vue
new file mode 100644
index 0000000..7ef0137
--- /dev/null
+++ b/shopstore/pages/technician.vue
@@ -0,0 +1,303 @@
+<template>
+	<view class="pages-technician">
+		<fixed :initHeight="configInfo.coach_format">
+			<view class="fix-info fill-body rel" :style="{height:'124rpx'}">
+				<view class="search-info fill-base pd-lg abs" style="border-radius:0 0 40rpx 40rpx">
+					<search @input="toSearch" type="input" :keyword="param.coach_name" :padding="0" :radius="30"
+						backgroundColor="#F0F0F0" :placeholder="'请输入'+$t('action.attendantName')+'姓名'">
+					</search>
+				</view>
+			</view>
+		</fixed>
+
+		<block v-if="list.data && list.data.length>0">
+			<view class="mt-md ml-md mr-md" v-for="(item,index) in list.data" :key="index">
+				<technician-list-item @comment="toShowPopup(index,'message')" @collect="toCollect(index)"
+					@order="toShowPopup(index,'technician')" :info="item">
+				</technician-list-item>
+			</view>
+		</block>
+
+		<!-- #ifdef H5 -->
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+		<!-- #endif -->
+		<!-- #ifndef H5 -->
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0&&location.lng" :loading="loading"
+			v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1&&location.lng"></abnor>
+		<abnor @confirm="toOpenLocation" :tip="[{ text: '定位失败，请开启地理位置授权后刷新页面重试~', color: 0 }]"
+			:button="[{ text: '开启定位' , type: 'confirm' }]" btnSize="" v-if="!loading && !location.lng"> </abnor>
+		<!-- #endif -->
+
+		<view class="space-footer"></view>
+
+		<technician-list-popup ref="technician_list_popup" :sid="options.id"></technician-list-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	import technicianListItem from "@/components/technician-list-item.vue"
+	import technicianListPopup from "@/components/technician-list-popup.vue"
+	export default {
+		components: {
+			technicianListItem,
+			technicianListPopup
+		},
+		data() {
+			return {
+				isLoad: false,
+				options: {},
+				activeIndex: 0,
+				param: {
+					page: 1,
+					coach_name: ''
+				},
+				list: {
+					data: []
+				},
+				loading: true,
+				lockTap: false,
+			}
+		},
+		computed: mapState({
+			pageActive: state => state.technician.pageActive,
+			tabList: state => state.technician.tabList,
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			loginType: state => state.user.loginType,
+			userInfo: state => state.user.userInfo,
+			location: state => state.user.location,
+			isGzhLogin: state => state.user.isGzhLogin,
+			haveShieldOper: state => state.user.haveShieldOper,
+		}),
+		async onLoad(options) {
+			this.options = options
+			// #ifndef H5
+			this.$util.showLoading()
+			// #endif
+			await this.initIndex()
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+			uni.setNavigationBarTitle({
+				title: this.$t('action.attendantName') + '列表'
+			})
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getUserInfo']),
+			...mapMutations(['updateUserItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif 
+				if (!this.configInfo.id || refresh) {
+					await this.getConfigInfo()
+				}
+				await this.getList()
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			toOpenLocation() {
+				this.$util.checkAuth({
+					type: 'userLocation'
+				})
+				// #ifdef APP-PLUS
+				uni.getSystemInfo({
+					success: (sys) => {
+						if (sys.platform == 'ios') {
+							plus.runtime.openURL("app-settings://");
+						} else {
+							var main = plus.android.runtimeMainActivity();
+							var Intent = plus.android.importClass(
+								"android.content.Intent");
+							//可能应该直接进入应用列表的权限设置？=> android.settings.APPLICATION_SETTINGS  
+							var mIntent = new Intent(
+								'android.settings.LOCATION_SOURCE_SETTINGS'
+							);
+							main.startActivity(mIntent);
+						}
+					}
+				})
+				// #endif
+			},
+			toSearch(val) {
+				this.param.coach_name = val
+				this.getList(1)
+			},
+			async getList(flag = 0, refresh = false, change = 0) {
+				if (flag) {
+					this.param.page = 1
+				}
+				let {
+					location
+				} = this
+				if (!location.lat || (location.lat && location.address == '定位失败')) {
+					// #ifdef H5
+					if (this.$jweixin.isWechat()) {
+						this.$util.showLoading()
+						// await this.$jweixin.initJssdk();
+						await this.$jweixin.wxReady2();
+						let {
+							lat = '', lng = ''
+						} = location
+						if (!lat && !lng) {
+							let {
+								latitude,
+								longitude
+							} = await this.$jweixin.getWxLocation()
+							lat = latitude
+							lng = longitude
+							location = {
+								lng,
+								lat,
+								address: '定位失败',
+								province: '',
+								city: '',
+								district: ''
+							}
+						}
+						if (lat && lng) {
+							let key = `${lat},${lng}`
+							let data = await this.$api.base.getMapInfo({
+								location: key
+							})
+							let {
+								status,
+								result
+							} = JSON.parse(data)
+							if (status == 0) {
+								let {
+									address,
+									address_component
+								} = result
+								let {
+									province,
+									city,
+									district
+								} = address_component
+								location = {
+									lng,
+									lat,
+									address,
+									province,
+									city,
+									district
+								}
+							}
+						}
+					}
+					// #endif
+					// #ifndef H5
+					location = await this.$util.getBmapLocation()
+					// #endif
+					this.updateUserItem({
+						key: 'location',
+						val: location
+					})
+				}
+				let {
+					lng = 0,
+						lat = 0
+				} = location
+
+				let {
+					list: oldList,
+					tabList,
+					activeIndex,
+				} = this
+				let {
+					id: store_id
+				} = this.options
+				let param = this.$util.deepCopy(this.param)
+				param = Object.assign({}, param, {
+					lng,
+					lat,
+					store_id
+				})
+
+				let {
+					coach_format = 1
+				} = this.configInfo
+
+				if (coach_format == 1) {
+					param.type = tabList[activeIndex].id
+				}
+
+
+				let methodModel = coach_format == 1 ? 'serviceCoachList' : 'typeServiceCoachList'
+
+				let newList = await this.$api.service[methodModel](param);
+
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+			},
+			handerTabChange(index) {
+				this.activeIndex = index
+				this.$util.showLoading()
+				uni.pageScrollTo({
+					scrollTop: 0
+				})
+				this.getList(1)
+			},
+			async toShowPopup(index, key) {
+				this.$refs.technician_list_popup.toShowPopup(this.list.data[index], key)
+			},
+			async toCollect(index) {
+				let {
+					id,
+					is_collect,
+					collect_num
+				} = this.list.data[index]
+				let methodModel = is_collect ? 'delCollect' : 'addCollect'
+				await this.$api.mine[methodModel]({
+					coach_id: id
+				})
+				this.$util.showToast({
+					title: is_collect ? '取消成功' : '收藏成功'
+				})
+				this.list.data[index].is_collect = is_collect == 1 ? 0 : 1
+				this.list.data[index].collect_num = is_collect == 1 ? collect_num - 1 :
+					collect_num + 1
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+</style>
\ No newline at end of file
diff --git a/siteinfo.js b/siteinfo.js
new file mode 100644
index 0000000..fbeb92b
--- /dev/null
+++ b/siteinfo.js
@@ -0,0 +1,8 @@
+module.exports = {
+	// 预约按摩 多城市
+	"uniacid": "666",
+	"multiid": "0",
+	"version": "3.0",
+	"gzh_appid": "wx88bf27358c22f867",
+	"siteroot": "https://tianjin.tianjinhualong.cn/index.php"
+}
diff --git a/static/coupon/btn.png b/static/coupon/btn.png
new file mode 100644
index 0000000..0ee1366
Binary files /dev/null and b/static/coupon/btn.png differ
diff --git a/static/coupon/coupon.png b/static/coupon/coupon.png
new file mode 100644
index 0000000..7f2f454
Binary files /dev/null and b/static/coupon/coupon.png differ
diff --git a/static/coupon/line.png b/static/coupon/line.png
new file mode 100644
index 0000000..db7cb69
Binary files /dev/null and b/static/coupon/line.png differ
diff --git a/static/coupon/menu.png b/static/coupon/menu.png
new file mode 100644
index 0000000..7524602
Binary files /dev/null and b/static/coupon/menu.png differ
diff --git a/static/coupon/picture.png b/static/coupon/picture.png
new file mode 100644
index 0000000..9ffeda8
Binary files /dev/null and b/static/coupon/picture.png differ
diff --git a/static/coupon/wechat-moments.png b/static/coupon/wechat-moments.png
new file mode 100644
index 0000000..095e2d8
Binary files /dev/null and b/static/coupon/wechat-moments.png differ
diff --git a/static/coupon/wechat.png b/static/coupon/wechat.png
new file mode 100644
index 0000000..71c2cca
Binary files /dev/null and b/static/coupon/wechat.png differ
diff --git a/static/img/axg.png b/static/img/axg.png
new file mode 100644
index 0000000..5bcfeb1
Binary files /dev/null and b/static/img/axg.png differ
diff --git a/static/img/icon_project.png b/static/img/icon_project.png
new file mode 100644
index 0000000..73fa2e6
Binary files /dev/null and b/static/img/icon_project.png differ
diff --git a/static/img/icon_technician.png b/static/img/icon_technician.png
new file mode 100644
index 0000000..501cfef
Binary files /dev/null and b/static/img/icon_technician.png differ
diff --git a/static/img/qs_dingdan.png b/static/img/qs_dingdan.png
new file mode 100644
index 0000000..60b54f0
Binary files /dev/null and b/static/img/qs_dingdan.png differ
diff --git a/static/logo-120.png b/static/logo-120.png
new file mode 100644
index 0000000..d7a6f5c
Binary files /dev/null and b/static/logo-120.png differ
diff --git a/static/logo-180.png b/static/logo-180.png
new file mode 100644
index 0000000..3a36a87
Binary files /dev/null and b/static/logo-180.png differ
diff --git a/static/logo-40.png b/static/logo-40.png
new file mode 100644
index 0000000..d6b66c4
Binary files /dev/null and b/static/logo-40.png differ
diff --git a/static/logo-58.png b/static/logo-58.png
new file mode 100644
index 0000000..af0a7ba
Binary files /dev/null and b/static/logo-58.png differ
diff --git a/static/logo-60.png b/static/logo-60.png
new file mode 100644
index 0000000..47882fb
Binary files /dev/null and b/static/logo-60.png differ
diff --git a/static/logo-80.png b/static/logo-80.png
new file mode 100644
index 0000000..314a0d8
Binary files /dev/null and b/static/logo-80.png differ
diff --git a/static/logo-87.png b/static/logo-87.png
new file mode 100644
index 0000000..2a073a1
Binary files /dev/null and b/static/logo-87.png differ
diff --git a/static/logo.png b/static/logo.png
new file mode 100644
index 0000000..c4d3557
Binary files /dev/null and b/static/logo.png differ
diff --git a/static/mine/Add.png b/static/mine/Add.png
new file mode 100644
index 0000000..da6f25e
Binary files /dev/null and b/static/mine/Add.png differ
diff --git a/static/mine/Wallet.png b/static/mine/Wallet.png
new file mode 100644
index 0000000..b4a6c2f
Binary files /dev/null and b/static/mine/Wallet.png differ
diff --git a/static/mine/auth.png b/static/mine/auth.png
new file mode 100644
index 0000000..4194edf
Binary files /dev/null and b/static/mine/auth.png differ
diff --git a/static/mine/balance.png b/static/mine/balance.png
new file mode 100644
index 0000000..6c060cc
Binary files /dev/null and b/static/mine/balance.png differ
diff --git a/static/mine/bg.jpg b/static/mine/bg.jpg
new file mode 100644
index 0000000..d6381a2
Binary files /dev/null and b/static/mine/bg.jpg differ
diff --git a/static/mine/cfmx.png b/static/mine/cfmx.png
new file mode 100644
index 0000000..c9fef6e
Binary files /dev/null and b/static/mine/cfmx.png differ
diff --git a/static/mine/cftx.png b/static/mine/cftx.png
new file mode 100644
index 0000000..2f07744
Binary files /dev/null and b/static/mine/cftx.png differ
diff --git a/static/mine/coupon.png b/static/mine/coupon.png
new file mode 100644
index 0000000..1cb8b0e
Binary files /dev/null and b/static/mine/coupon.png differ
diff --git a/static/mine/default_user.png b/static/mine/default_user.png
new file mode 100644
index 0000000..0d54c70
Binary files /dev/null and b/static/mine/default_user.png differ
diff --git a/static/mine/dengji.png b/static/mine/dengji.png
new file mode 100644
index 0000000..c019fb6
Binary files /dev/null and b/static/mine/dengji.png differ
diff --git a/static/mine/dizhiguanli.png b/static/mine/dizhiguanli.png
new file mode 100644
index 0000000..9a76468
Binary files /dev/null and b/static/mine/dizhiguanli.png differ
diff --git a/static/mine/dongtai.png b/static/mine/dongtai.png
new file mode 100644
index 0000000..052e99e
Binary files /dev/null and b/static/mine/dongtai.png differ
diff --git a/static/mine/fencheng.png b/static/mine/fencheng.png
new file mode 100644
index 0000000..3167c51
Binary files /dev/null and b/static/mine/fencheng.png differ
diff --git a/static/mine/fenxiao.png b/static/mine/fenxiao.png
new file mode 100644
index 0000000..ca00da1
Binary files /dev/null and b/static/mine/fenxiao.png differ
diff --git a/static/mine/fx.png b/static/mine/fx.png
new file mode 100644
index 0000000..dc0c0ac
Binary files /dev/null and b/static/mine/fx.png differ
diff --git a/static/mine/guanli.png b/static/mine/guanli.png
new file mode 100644
index 0000000..49f77e4
Binary files /dev/null and b/static/mine/guanli.png differ
diff --git a/static/mine/guanzhu.png b/static/mine/guanzhu.png
new file mode 100644
index 0000000..ec48d31
Binary files /dev/null and b/static/mine/guanzhu.png differ
diff --git a/static/mine/hetong.png b/static/mine/hetong.png
new file mode 100644
index 0000000..28d4f34
Binary files /dev/null and b/static/mine/hetong.png differ
diff --git a/static/mine/jishizhaopin.png b/static/mine/jishizhaopin.png
new file mode 100644
index 0000000..098cf4c
Binary files /dev/null and b/static/mine/jishizhaopin.png differ
diff --git a/static/mine/lianxikefu.png b/static/mine/lianxikefu.png
new file mode 100644
index 0000000..b5cefaf
Binary files /dev/null and b/static/mine/lianxikefu.png differ
diff --git a/static/mine/pingbi.png b/static/mine/pingbi.png
new file mode 100644
index 0000000..bbd93d1
Binary files /dev/null and b/static/mine/pingbi.png differ
diff --git a/static/mine/pingjia.png b/static/mine/pingjia.png
new file mode 100644
index 0000000..3fb30c9
Binary files /dev/null and b/static/mine/pingjia.png differ
diff --git a/static/mine/qiehuan.png b/static/mine/qiehuan.png
new file mode 100644
index 0000000..3b7f02c
Binary files /dev/null and b/static/mine/qiehuan.png differ
diff --git a/static/mine/qudao.png b/static/mine/qudao.png
new file mode 100644
index 0000000..13fc599
Binary files /dev/null and b/static/mine/qudao.png differ
diff --git a/static/mine/setTime2.png b/static/mine/setTime2.png
new file mode 100644
index 0000000..ce48bd5
Binary files /dev/null and b/static/mine/setTime2.png differ
diff --git a/static/mine/shens.png b/static/mine/shens.png
new file mode 100644
index 0000000..1268d83
Binary files /dev/null and b/static/mine/shens.png differ
diff --git a/static/mine/shop.png b/static/mine/shop.png
new file mode 100644
index 0000000..8ebf915
Binary files /dev/null and b/static/mine/shop.png differ
diff --git a/static/mine/tel.png b/static/mine/tel.png
new file mode 100644
index 0000000..3822fef
Binary files /dev/null and b/static/mine/tel.png differ
diff --git a/static/mine/tuikuan.png b/static/mine/tuikuan.png
new file mode 100644
index 0000000..2c9c5e4
Binary files /dev/null and b/static/mine/tuikuan.png differ
diff --git a/static/mine/vip.png b/static/mine/vip.png
new file mode 100644
index 0000000..b584d36
Binary files /dev/null and b/static/mine/vip.png differ
diff --git a/static/mine/yewu.png b/static/mine/yewu.png
new file mode 100644
index 0000000..8f38dc6
Binary files /dev/null and b/static/mine/yewu.png differ
diff --git a/static/mine/yijianfank.png b/static/mine/yijianfank.png
new file mode 100644
index 0000000..d51c048
Binary files /dev/null and b/static/mine/yijianfank.png differ
diff --git a/static/mine/youhui.png b/static/mine/youhui.png
new file mode 100644
index 0000000..9658f12
Binary files /dev/null and b/static/mine/youhui.png differ
diff --git a/static/tab/dingdan_nor.png b/static/tab/dingdan_nor.png
new file mode 100644
index 0000000..6c8bd35
Binary files /dev/null and b/static/tab/dingdan_nor.png differ
diff --git a/static/tab/dingdan_sel.png b/static/tab/dingdan_sel.png
new file mode 100644
index 0000000..9795c5b
Binary files /dev/null and b/static/tab/dingdan_sel.png differ
diff --git a/static/tab/find_nor.png b/static/tab/find_nor.png
new file mode 100644
index 0000000..238f346
Binary files /dev/null and b/static/tab/find_nor.png differ
diff --git a/static/tab/find_sel.png b/static/tab/find_sel.png
new file mode 100644
index 0000000..22ef546
Binary files /dev/null and b/static/tab/find_sel.png differ
diff --git a/static/tab/jishi_nor.png b/static/tab/jishi_nor.png
new file mode 100644
index 0000000..6722394
Binary files /dev/null and b/static/tab/jishi_nor.png differ
diff --git a/static/tab/jishi_sel.png b/static/tab/jishi_sel.png
new file mode 100644
index 0000000..ca9c592
Binary files /dev/null and b/static/tab/jishi_sel.png differ
diff --git a/static/tab/shouye_nor.png b/static/tab/shouye_nor.png
new file mode 100644
index 0000000..6726e9b
Binary files /dev/null and b/static/tab/shouye_nor.png differ
diff --git a/static/tab/shouye_sel.png b/static/tab/shouye_sel.png
new file mode 100644
index 0000000..4483309
Binary files /dev/null and b/static/tab/shouye_sel.png differ
diff --git a/static/tab/store_nor.png b/static/tab/store_nor.png
new file mode 100644
index 0000000..0ed1e3b
Binary files /dev/null and b/static/tab/store_nor.png differ
diff --git a/static/tab/store_sel.png b/static/tab/store_sel.png
new file mode 100644
index 0000000..86b8e83
Binary files /dev/null and b/static/tab/store_sel.png differ
diff --git a/static/tab/wode_nor.png b/static/tab/wode_nor.png
new file mode 100644
index 0000000..ea30390
Binary files /dev/null and b/static/tab/wode_nor.png differ
diff --git a/static/tab/wode_sel.png b/static/tab/wode_sel.png
new file mode 100644
index 0000000..767f860
Binary files /dev/null and b/static/tab/wode_sel.png differ
diff --git a/store/index.js b/store/index.js
new file mode 100644
index 0000000..c5590ad
--- /dev/null
+++ b/store/index.js
@@ -0,0 +1,10 @@
+import Vue from "vue"
+import Vuex from "vuex"
+Vue.use(Vuex)
+const files = require.context('./modules', false, /\.js$/)
+const modules = {}
+files.keys().forEach(key => {
+  modules[key.replace(/(\.\/|\.js)/g, '')] = files(key).default
+})
+
+export default new Vuex.Store({modules})
\ No newline at end of file
diff --git a/store/modules/config.js b/store/modules/config.js
new file mode 100644
index 0000000..e633b9a
--- /dev/null
+++ b/store/modules/config.js
@@ -0,0 +1,235 @@
+import $util from "@/utils/index.js"
+import $api from "@/api/index.js"
+export default {
+	state: {
+		merchantAuth: 0, // 技-师列表是否显示商家
+		old_attendant_name: '技师',
+		configInfo: {
+			id: 0,
+			isIos: uni.getSystemInfoSync().system.includes('iOS'),
+			navBarHeight: uni.getSystemInfoSync().statusBarHeight * 1 + 44,
+			curSysHeight: '',
+			tabbarHeight: '',
+			methodObj: {
+				1: 'call',
+				2: 'miniProgram',
+				3: 'web',
+				4: 'navigateTo'
+			},
+			tabBar: [],
+		},
+		play_method: [{
+			method: 'onPlay',
+			msg: '开始播放',
+			status: true,
+		}, {
+			method: 'onStop',
+			msg: '结束播放',
+			status: false,
+		}, {
+			method: 'onError',
+			msg: '报错Error',
+			status: false,
+		}, {
+			method: 'onEnded',
+			msg: '自然结束播放',
+			status: false,
+		}],
+		audioBg: {},
+		audioType: 'countdown_voice',
+		playBg: false,
+		isHaveAudio: false
+	},
+	mutations: {
+		//修改信息
+		updateConfigItem(state, item) {
+			let {
+				key,
+				val
+			} = item
+			state[key] = val
+			if (key !== 'configInfo') return
+			uni.setStorageSync('configInfo', val)
+			let src = val[state.audioType]
+			if (state.isHaveAudio) {
+				state.audioBg.src = src || ''
+				return
+			}
+			if (!val.countdown_voice && !val.service_start_recording && !val.service_end_recording) return
+			state.audioBg = uni.createInnerAudioContext();
+			state.isHaveAudio = true
+			state.audioBg.src = src
+			// #ifndef APP-PLUS
+			state.audioBg.obeyMuteSwitch = false
+			// #endif
+			state.play_method.map(item => {
+				state.audioBg[item.method](() => {
+					console.log('bg=>', item.msg)
+					state.playBg = item.status;
+				})
+			})
+		}
+	},
+	actions: {
+		// 获取基本配置
+		async getConfigInfo({
+			commit,
+			state
+		}, param) {
+			let config = await $api.base.configInfo()
+			if (!config.primaryColor) {
+				config.primaryColor = '#A40035'
+			}
+			if (!config.subColor) {
+				config.subColor = '#F1C06B'
+			}
+			if (!config.user_image) {
+				config.user_image = 'https://lbqny.migugu.com/admin/anmo/mine/bg.png'
+			}
+			if (!config.coach_image) {
+				config.coach_image = 'https://lbqny.migugu.com/admin/anmo/mine/bg.png'
+			}
+			if (!config.service_btn_color) {
+				config.service_btn_color = '#282B34'
+			}
+			if (!config.service_font_color) {
+				config.service_font_color = '#EBDDB1'
+			}
+			if (!config.user_font_color) {
+				config.user_font_color = '#ffffff'
+			}
+			if (!config.coach_font_color) {
+				config.coach_font_color = '#ffffff'
+			}
+
+			let base_config = $util.pick(state.configInfo, ['isIos', 'navBarHeight', 'curSysHeight',
+				'tabbarHeight', 'methodObj', 'tabBar'
+			])
+
+			let tabBar = [{
+				id: 1,
+				name: '首页',
+				default_img: '../static/tab/shouye_nor.png',
+				selected_img: '../static/tab/shouye_sel.png'
+			}, {
+				id: 2,
+				name: '技师',
+				default_img: '../static/tab/jishi_nor.png',
+				selected_img: '../static/tab/jishi_sel.png'
+			}, {
+				id: 4,
+				name: '订单',
+				default_img: '../static/tab/dingdan_nor.png',
+				selected_img: '../static/tab/dingdan_sel.png'
+			}, {
+				id: 5,
+				name: '我的',
+				default_img: '../static/tab/wode_nor.png',
+				selected_img: '../static/tab/wode_sel.png'
+			}]
+
+
+			let tInd = tabBar.findIndex(item => {
+				return item.id == 2
+			})
+			tabBar[tInd].name = config.attendant_name
+			
+			// let authArr = ['map', 'dynamic', 'store'] 
+			// let authArr = ['dynamic', 'store']
+			let authArr = []  // tabbar 权限
+			let authObj = {
+				dynamic: {
+					id: 3,
+					name: '动态',
+					default_img: '../static/tab/find_nor.png',
+					selected_img: '../static/tab/find_sel.png',
+					ind: config.attendant_name
+				},
+				store: {
+					id: 6,
+					name: '门店',
+					default_img: '../static/tab/store_nor.png',
+					selected_img: '../static/tab/store_sel.png',
+					ind: '首页'
+				},
+				map: {
+					id: 7,
+					name: '地图找人',
+					default_img: '../static/tab/jishi_nor.png',
+					selected_img: '../static/tab/jishi_sel.png',
+					ind: config.attendant_name
+				}
+			}
+
+			let plugNum = 0
+			let {
+				plugAuth
+			} = config
+			for (let i in plugAuth) {
+				plugAuth[i] = plugAuth[i] == 1 || plugAuth[i] ? false : true
+				if (authArr.includes(i)) {
+					if (plugAuth[i]) {
+						plugNum++
+					}
+					let addInd = tabBar.findIndex(item => {
+						return item.name == authObj[i].name
+					})
+					let spliceInd = tabBar.findIndex(item => {
+						return item.name == authObj[i].ind
+					})
+					if (plugAuth[i] && addInd == -1) {
+						tabBar.splice(spliceInd + 1, 0, authObj[i])
+					}
+					if (!plugAuth[i] && addInd !== -1) {
+						tabBar.splice(addInd, 1)
+					}
+				}
+			}
+			config.plugAuth = plugAuth
+			
+
+			//if (plugNum > 1) {
+			//tabBar.splice(tabBar.findIndex(item => {
+			//return item.name == '订单'
+			//}), 1)
+			//}
+
+			base_config.tabBar = tabBar
+			let data = Object.assign({}, config, base_config)
+			commit('updateConfigItem', {
+				key: 'configInfo',
+				val: data
+			})
+
+		},
+		toPlayAudio({
+			commit,
+			state
+		}, param) {
+			state.audioType = param.key
+			let src = state.configInfo[param.key]
+			if (!src) return
+			if (state.isHaveAudio) {
+				state.audioBg.src = src
+			} else {
+				state.audioBg = uni.createInnerAudioContext();
+				state.isHaveAudio = true
+				state.audioBg.src = src
+				// #ifndef APP-PLUS
+				state.audioBg.obeyMuteSwitch = false
+				// #endif
+				state.play_method.map(item => {
+					state.audioBg[item.method](() => {
+						console.log('bg=>', item.msg)
+						state.playBg = item.status;
+					})
+				})
+			}
+
+			if (state.playBg) {
+				state.audioBg.stop()
+			}
+			state.audioBg.play()
+		}
+	}
+}
\ No newline at end of file
diff --git a/store/modules/dynamic.js b/store/modules/dynamic.js
new file mode 100644
index 0000000..9bda587
--- /dev/null
+++ b/store/modules/dynamic.js
@@ -0,0 +1,83 @@
+import $util from "@/utils/index.js"
+import $api from "@/api/index.js"
+export default {
+	state: {
+		pageActive: false,
+		activeIndex: 0,
+		haveOperItem: false,
+		tabList: [{
+			title: '推荐',
+			id: 0,
+		}, {
+			title: '关注',
+			id: 1,
+			number: 0
+		}],
+		param: {
+			page: 1,
+			coach_name: ''
+		},
+		list: {
+			data: [],
+			last_page: 1,
+			current_page: 1
+		},
+		follow_dynamic_num: 0,
+		coach_status: -1
+	},
+	mutations: {
+		async updateDynamicItem(state, item) {
+			let {
+				key,
+				val
+			} = item
+			state[key] = val
+		}
+	},
+	actions: {
+		async getDynamicIndex({
+			commit,
+			state
+		}, param) {
+			let d = await $api.dynamic.getFollowData(param)
+			commit('updateDynamicItem', {
+				key: 'follow_dynamic_num',
+				val: d.num
+			})
+			commit('updateDynamicItem', {
+				key: 'coach_status',
+				val: d.coach_status
+			})
+			let tabList = $util.deepCopy(state.tabList)
+			tabList[1].number = d.num
+			commit('updateDynamicItem', {
+				key: 'tabList',
+				val: tabList
+			})
+		},
+		async getDynamicList({
+			commit,
+			state
+		}, param) {
+			let methodModel = state.activeIndex == 0 ? 'dynamicList' : 'followDynamicList'
+			let d = await $api.dynamic[methodModel](param)
+			let oldList = state.list;
+			let newList = d;
+			let list = {}
+			if (param.page == 1) {
+				list = newList;
+			} else {
+				newList.data = oldList.data.concat(newList.data)
+				list = newList;
+			}
+			commit('updateDynamicItem', {
+				key: 'param',
+				val: param
+			})
+			commit('updateDynamicItem', {
+				key: 'list',
+				val: list
+			})
+		}
+	},
+}
diff --git a/store/modules/map.js b/store/modules/map.js
new file mode 100644
index 0000000..cf2708a
--- /dev/null
+++ b/store/modules/map.js
@@ -0,0 +1,153 @@
+import $api from "@/api/index.js"
+import $store from "@/store/index.js"
+export default {
+	state: {
+		pageActive: false,
+		sexList: [{
+			id: -1,
+			title: '全部'
+		}, {
+			id: 0,
+			title: '男'
+		}, {
+			id: 1,
+			title: '女'
+		}],
+		yearList: [{
+			id: 1,
+			title: '1-3年',
+			year: [1, 3]
+		}, {
+			id: 2,
+			title: '3-5年',
+			year: [3, 5]
+		}, {
+			id: 3,
+			title: '5-10年',
+			year: [5, 10]
+		}, {
+			id: 4,
+			title: '10年以上',
+			year: [10, 200]
+		}],
+		map: {
+			latitude: 0,
+			longitude: 0,
+			scale: 16,
+			controls: []
+		},
+		covers: [],
+		service_cate: [],
+		param: {
+			page: 1,
+			sex: -1,
+			year: 1,
+			cate_id: 0,
+			activeIndex: 0,
+			coach_name: '',
+			service_time: ''
+		},
+		check: {
+			sex: -1,
+			year: 1,
+			coach_name: '',
+			service_time: ''
+		},
+		mapList: [],
+		list: {
+			data: [],
+			last_page: 1,
+			current_page: 1
+		},
+		mapType: 'map'
+	},
+	mutations: {
+		async updateMapItem(state, item) {
+			let {
+				key,
+				val
+			} = item
+			state[key] = val
+		}
+	},
+	actions: {
+		async getMapIndex({
+			commit,
+			state
+		}, param) {
+			let d = await $api.service.serviceCateList(param)
+			d.unshift({
+				id: 0,
+				title: '全部'
+			})
+			commit('updateMapItem', {
+				key: 'service_cate',
+				val: d
+			})
+		},
+		async getMapList({
+			commit,
+			state
+		}, param) {
+			let d = await $api.service.mapCoachList(param)
+			let map = Object.assign({}, state.map, {
+				latitude: param.lat,
+				longitude: param.lng,
+			})
+			let arr = []
+			d.map((item, index) => {
+				arr.push({
+					id: index,
+					latitude: item.lat,
+					longitude: item.lng,
+					iconPath: item.work_img,
+					width: 30,
+					height: 30
+				})
+			})
+			arr.unshift({
+				id: '-1',
+				latitude: param.lat,
+				longitude: param.lng,
+				iconPath: 'https://mapapi.qq.com/web/lbs/visualizationApi/demo/img/big.png',
+				width: 20,
+				height: 25,
+			})
+			commit('updateMapItem', {
+				key: 'map',
+				val: map
+			})
+			commit('updateMapItem', {
+				key: 'covers',
+				val: arr
+			})
+			commit('updateMapItem', {
+				key: 'mapList',
+				val: d
+			})
+		},
+		async getMapCoachList({
+			commit,
+			state
+		}, param) {
+			let {
+				coach_format = 1
+			} = $store.state.config.configInfo
+			let methodModel = coach_format == 1 ? 'serviceCoachList' : 'typeServiceCoachList'
+			let d = await $api.service[methodModel](param)
+			let oldList = state.list;
+			let newList = d;
+			let list = {}
+			if (param.page == 1) {
+				list = newList;
+			} else {
+				newList.data = oldList.data.concat(newList.data)
+				list = newList;
+			}
+			commit('updateMapItem', {
+				key: 'list',
+				val: list
+			})
+		}
+	},
+}
\ No newline at end of file
diff --git a/store/modules/order.js b/store/modules/order.js
new file mode 100644
index 0000000..27b52b5
--- /dev/null
+++ b/store/modules/order.js
@@ -0,0 +1,99 @@
+import $util from "@/utils/index.js"
+import $api from "@/api/index.js"
+import {
+	req
+} from '@/utils/req.js';
+export default {
+	state: {
+		pageActive: false,
+		// pay_type 1待支付，2待服务，3技-师接单，4技-师出发，5技-师到达，6服务中，7服务完成
+		activeIndex: 0,
+		tabList: [{
+			title: '全部',
+			id: 0
+		}, {
+			title: '待支付',
+			id: 1,
+			// number: 10
+		}, {
+			title: '待服务',
+			id: 5
+		}, {
+			title: '服务中',
+			id: 6
+		}, {
+			title: '已完成',
+			id: 7
+		}],
+		param: {
+			page: 1,
+			pay_type: 0,
+		},
+		list: {
+			data: [],
+			last_page: 1,
+			current_page: 1
+		},
+		carList: {},
+		haveOperItem: false,
+		bellOrderParams: {},
+		alipayOrderParams: {},
+		recorder: null,
+		recorder_status: false,
+		recorder_order_id: 0
+	},
+	mutations: {
+		updateOrderItem(state, item) {
+			let {
+				key,
+				val
+			} = item
+			state[key] = val
+		}
+	},
+	actions: {
+		async getOrderList({
+			commit,
+			state
+		}, param) {
+			let d = await $api.order.orderList(param)
+			let oldList = state.list;
+			let newList = d;
+			let list = {}
+			if (param.page == 1) {
+				let {
+					current_page = 0
+				} = newList
+				if (!current_page) {
+					newList = {
+						data: [],
+						last_page: 1,
+						current_page: 1
+					}
+				}
+				list = newList;
+			} else {
+				newList.data = oldList.data.concat(newList.data)
+				list = newList;
+			}
+			commit('updateOrderItem', {
+				key: 'list',
+				val: list
+			})
+		},
+		// 获取购物车数据
+		async getCarList({
+			commit,
+			state
+		}, param) {
+			let carList = await $api.order.carInfo(param)
+			carList.list.map(item => {
+				item.checked = false
+			})
+			commit('updateOrderItem', {
+				key: 'carList',
+				val: carList
+			})
+		},
+	}
+}
\ No newline at end of file
diff --git a/store/modules/service.js b/store/modules/service.js
new file mode 100644
index 0000000..692e641
--- /dev/null
+++ b/store/modules/service.js
@@ -0,0 +1,128 @@
+import $api from "@/api/index.js"
+import $util from "@/utils/index.js"
+import $store from "@/store/index.js"
+export default {
+	state: {
+		pageActive: false,
+		activeIndex: 0,
+		tabList: [{
+			title: '全部',
+			sort: 'top desc',
+		}, {
+			title: '价格',
+			sort: 'price',
+			sign: 0,
+			is_sign: 1,
+		}, {
+			title: '销量',
+			sort: 'total_sale',
+			sign: 0,
+			is_sign: 1,
+		}, {
+			title: '好评度',
+			sort: 'star',
+			sign: 0,
+			is_sign: 1,
+		}],
+		param: {
+			page: 1,
+			sort: ''
+		},
+		list: {
+			data: [],
+			last_page: 1,
+			current_page: 1
+		},
+		banner: [],
+		service_cate: [],
+		service_all_cate: [],
+		recommend_list: [],
+		recommend_style: 1
+	},
+	mutations: {
+		async updateServiceItem(state, item) {
+			let {
+				key,
+				val
+			} = item
+			state[key] = val
+		}
+	},
+	actions: {
+		async getServiceIndex({
+			commit,
+			state
+		}, param) {
+			let d = await $api.service.index(param);
+			let {
+				banner = [],
+					service_cate = [],
+					recommend_list = [],
+					recommend_style = 1,
+					coach_apply_show = 0
+			} = d
+			let all_cate = $util.deepCopy(service_cate)
+			commit('updateServiceItem', {
+				key: 'service_all_cate',
+				val: all_cate
+			})
+			let cateLen = all_cate.length
+			if (coach_apply_show) {
+				service_cate.splice(cateLen > 4 ? 4 : cateLen - 1, 0, {
+					id: 0,
+					title: $store.state.config.configInfo.attendant_name + '入驻',
+					cover: 'https://lbqny.migugu.com/admin/anmo/technician/default_technician.png',
+					url: '/technician/pages/apply'
+				})
+			}
+			let num = ((coach_apply_show && cateLen > 28) || (!coach_apply_show && cateLen > 29)) ? 29 :
+				coach_apply_show ? cateLen + 1 : cateLen
+			console.log(coach_apply_show, num, "======num")
+			service_cate = service_cate.slice(0, num)
+			if ((cateLen > (coach_apply_show ? 28 : 29))) {
+				service_cate.push({
+					id: 0,
+					title: '全部分类',
+					cover: '',
+					icon: 'iconfenleiyingyongtongzhi2',
+					url: '/user/pages/service/cate'
+				})
+			}
+			commit('updateServiceItem', {
+				key: 'banner',
+				val: banner
+			})
+			commit('updateServiceItem', {
+				key: 'service_cate',
+				val: service_cate
+			})
+			commit('updateServiceItem', {
+				key: 'recommend_list',
+				val: recommend_list
+			})
+			commit('updateServiceItem', {
+				key: 'recommend_style',
+				val: recommend_style
+			})
+		},
+		async getServiceList({
+			commit,
+			state
+		}, param) {
+			let d = await $api.service.serviceList(param)
+			let oldList = state.list;
+			let newList = d;
+			let list = {}
+			if (param.page == 1) {
+				list = newList;
+			} else {
+				newList.data = oldList.data.concat(newList.data)
+				list = newList;
+			}
+			commit('updateServiceItem', {
+				key: 'list',
+				val: list
+			})
+		}
+	},
+}
\ No newline at end of file
diff --git a/store/modules/shopstore.js b/store/modules/shopstore.js
new file mode 100644
index 0000000..2f2c6e7
--- /dev/null
+++ b/store/modules/shopstore.js
@@ -0,0 +1,51 @@
+import $util from "@/utils/index.js"
+import $api from "@/api/index.js"
+export default {
+	state: {
+		pageActive: false,
+		haveOperItem: false,
+		param: {
+			page: 1,
+			coach_name: ''
+		},
+		list: {
+			data: [],
+			last_page: 1,
+			current_page: 1
+		}
+	},
+	mutations: {
+		async updateShopstoreItem(state, item) {
+			let {
+				key,
+				val
+			} = item
+			state[key] = val
+		}
+	},
+	actions: {
+		async getShopstoreList({
+			commit,
+			state
+		}, param) {
+			let d = await $api.shopstore.storeList(param)
+			let oldList = state.list;
+			let newList = d;
+			let list = {}
+			if (param.page == 1) {
+				list = newList;
+			} else {
+				newList.data = oldList.data.concat(newList.data)
+				list = newList;
+			}
+			commit('updateShopstoreItem', {
+				key: 'param',
+				val: param
+			})
+			commit('updateShopstoreItem', {
+				key: 'list',
+				val: list
+			})
+		}
+	},
+}
diff --git a/store/modules/technician.js b/store/modules/technician.js
new file mode 100644
index 0000000..9ce78f2
--- /dev/null
+++ b/store/modules/technician.js
@@ -0,0 +1,100 @@
+import $api from "@/api/index.js"
+import $store from "@/store/index.js"
+export default {
+	state: {
+		pageActive: false,
+		activeIndex: 0,
+		haveOperItem: false,
+		tabList: [{
+			title: '全部',
+			id: 0,
+		}, {
+			title: '可服务',
+			id: 1,
+		}, {
+			title: '服务中',
+			id: 2
+		}, {
+			title: '可预约',
+			id: 3
+		}],
+		cityId: 0,
+		cityIndex: -1,
+		cityList: [],
+		param: {
+			page: 1,
+			ser_id: 0,
+			coach_name: ''
+		},
+		list: {
+			data: [],
+			last_page: 1,
+			current_page: 1
+		}
+	},
+	mutations: {
+		async updateTechnicianItem(state, item) {
+			let {
+				key,
+				val
+			} = item
+			state[key] = val
+		}
+	},
+	actions: {
+		async getCityList({
+			commit,
+			state
+		}, param) {
+			let {
+				change = 0
+			} = param
+			let params = JSON.parse(JSON.stringify(param))
+			delete params.change
+			let d = await $api.base.getCity(params);
+			let {
+				cityId = 0
+			} = state
+			let ind = d.findIndex(v => {
+				return change || !cityId ? v.is_select : v.id == cityId
+			})
+			commit('updateTechnicianItem', {
+				key: 'cityList',
+				val: d
+			})
+			let cityIndex = ind
+			// let cityIndex = ind === -1 ? 0 : ind
+			commit('updateTechnicianItem', {
+				key: 'cityIndex',
+				val: cityIndex
+			})
+			commit('updateTechnicianItem', {
+				key: 'cityId',
+				val: d && d.length > 0 && cityIndex !== -1 ? d[cityIndex].id : 0
+			})
+		},
+		async getServiceCoachList({
+			commit,
+			state
+		}, param) {
+			let {
+				coach_format = 1
+			} = $store.state.config.configInfo
+			let methodModel = coach_format == 1 ? 'serviceCoachList' : 'typeServiceCoachList'
+			let d = await $api.service[methodModel](param)
+			let oldList = state.list;
+			let newList = d;
+			let list = {}
+			if (param.page == 1) {
+				list = newList;
+			} else {
+				newList.data = oldList.data.concat(newList.data)
+				list = newList;
+			}
+			commit('updateTechnicianItem', {
+				key: 'list',
+				val: list
+			})
+		}
+	},
+}
diff --git a/store/modules/user.js b/store/modules/user.js
new file mode 100644
index 0000000..5be052e
--- /dev/null
+++ b/store/modules/user.js
@@ -0,0 +1,208 @@
+import $util from "@/utils/index.js"
+import $api from "@/api/index.js"
+import $store from "@/store/index.js"
+import {
+	req
+} from '@/utils/req.js';
+export default {
+	state: {
+		autograph: '',
+		userInfo: {},
+		appLogin: '',
+		loginType: '',
+		loginPage: '',
+		isGzhLogin: false,
+		locationChange: false,
+		locationChangeUnix: 0,
+		commonOptions: {
+			id: 0,
+			pid: 0,
+			coupon_atv_id: 0,
+			admin_id: 0,
+			coach_id: 0,
+			channel_id: 0,
+		},
+		location: {},
+		isShowAuth: true,
+		mineInfo: {}, // 用户个人中心
+		userPageType: 1, // 1用户，2技-师
+		coachInfo: {},
+		haveShieldOper: 0,
+		personVerifyUrl: '',
+		fddExtsign: '',
+	},
+	mutations: {
+		//更新内容
+		async updateUserItem(state, item) {
+			let {
+				key,
+				val
+			} = item
+			if (key == 'userInfo' && val.id) {
+				let {
+					phone = '',
+						create_time,
+						alipay_number = ''
+				} = val
+				if (phone) {
+					val.split_phone = phone.substring(0, 3) + '****' + phone.substring(7, 11)
+				}
+				val.create_date = $util.formatTime(create_time * 1000, 'YY-M-D')
+				if (alipay_number) {
+					let len = alipay_number.length
+					val.split_alipay_number = alipay_number.substring(0, len > 3 ? 3 : 1) + '***'
+					if (len > 6) {
+						val.split_alipay_number += alipay_number.substring(len == 6 ? len - 2 :
+							len - 3, len)
+					}
+				}
+			}
+
+			if (key == 'mineInfo') {
+				let {
+					id: mine_id = -1
+				} = val
+
+				if (mine_id == -1) {
+					let stoerArr = ['userInfo', 'location', 'appLogin', 'loginType', 'isShowLogin',
+						'isGzhLogin'
+					]
+					stoerArr.map(key => {
+						state[key] = key == 'isShowLogin' ? true : ''
+						uni.setStorageSync(key, key == 'isShowLogin' ? true : '')
+					})
+				}
+			}
+
+			if (['autograph', 'userInfo', 'location', 'appLogin', 'loginType', 'isShowLogin', 'isGzhLogin']
+				.includes(key)) {
+				uni.setStorageSync(key, val)
+			}
+
+
+			if (key === 'locationChange' && val == true) {
+				let locationChangeUnix = $util.DateToUnix($util.formatTime(new Date(), 'YY-M-D h:m:s'))
+				state.locationChangeUnix = locationChangeUnix
+			}
+
+			state[key] = val
+		}
+	},
+	actions: {
+		//获取个人信息
+		async getUserInfo({
+			commit,
+			state
+		}, param) {
+			let data = await $api.user.userInfo()
+			commit('updateUserItem', {
+				key: 'userInfo',
+				val: data
+			})
+		},
+		//获取用户个人中心数据
+		async getMineInfo({
+			commit,
+			state
+		}, param) {
+			let data = await $api.mine.index()
+			let {
+				id = 0,
+					fx_status
+			} = data
+			if (!id) {
+				data = {
+					id: -1
+				}
+			}
+			let {
+				fx_check = 0
+			} = $store.state.config.configInfo
+			data.is_fx = !fx_check || (fx_check && fx_status == 2)
+			commit('updateUserItem', {
+				key: 'mineInfo',
+				val: data
+			})
+		},
+		//获取技-师信息
+		async getCoachInfo({
+			commit,
+			state
+		}, param) {
+			let data = await $api.technician.coachInfo()
+			commit('updateUserItem', {
+				key: 'coachInfo',
+				val: data
+			})
+		},
+		// 获取用户信息
+		async getAuthUserProfile({
+			commit,
+			state
+		}, param) {
+			let {
+				nickName,
+				avatarUrl
+			} = param
+			await $api.user.userUpdate(param)
+			let data = Object.assign({}, state.userInfo, {
+				nickName,
+				avatarUrl
+			})
+			commit('updateUserItem', {
+				key: 'userInfo',
+				val: data
+			})
+		},
+		// 获取手机号
+		async getAuthPhone({
+			commit,
+			state
+		}, {
+			e = {
+				detail: {}
+			},
+			must = false
+		} = {}) {
+			let {
+				encryptedData = '', iv = ''
+			} = e.detail;
+			let phone = ''
+			if (encryptedData && iv) {
+				let phone = await $api.user.reportPhone({
+					encryptedData,
+					iv
+				})
+				let data = Object.assign({}, state.userInfo, {
+					phone
+				})
+				commit('updateUserItem', {
+					key: 'userInfo',
+					val: data
+				})
+				return phone;
+			}
+		},
+		// 更新公共参数
+		async updateCommonOptions({
+			commit,
+			state
+		}, param) {
+			let target = {}
+			if (param.scene) {
+				let res = await $api.base.getWxCodeData({
+					code_id: param.scene
+				})
+				target = Object.assign({}, state.commonOptions, res.data)
+			} else {
+				target = Object.assign({}, state.commonOptions, param)
+			}
+			let data = $util.pick(target, ['id', 'pid', 'coupon_atv_id', 'admin_id', 'channel_id', 'coach_id'])
+			commit('updateUserItem', {
+				key: 'commonOptions',
+				val: data
+			})
+			return target
+		}
+	}
+}
\ No newline at end of file
diff --git a/styles/1px.wxss b/styles/1px.wxss
new file mode 100644
index 0000000..809cb42
--- /dev/null
+++ b/styles/1px.wxss
@@ -0,0 +1,102 @@
+/* 1px方案,改变border的颜色即可 */
+.b-1px, .b-1px-t, .b-1px-b, .b-1px-tb, .b-1px-l, .b-1px-r {
+  position: relative;
+}
+
+.b-1px:before {
+  content: " ";
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 200%;
+  border: 1px solid #eee;
+  color: #eee;
+  height: 200%;
+  transform-origin: left top;
+  transform: scale(0.5);
+  box-sizing: border-box;
+}
+
+.b-1px-t:before {
+  content: " ";
+  position: absolute;
+  left: 0;
+  top: 0;
+  right: 0;
+  height: 1px;
+  border-top: 1px solid #eee;
+  color: #eee;
+  transform-origin: 0 0;
+  transform: scaley(0.5);
+  box-sizing: border-box;
+}
+
+.b-1px-b:after {
+  content: " ";
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  height: 1px;
+  border-bottom: 1px solid #eee;
+  color: #eee;
+  transform-origin: 0 100%;
+  transform: scaley(0.5);
+  box-sizing: border-box;
+}
+
+.b-1px-tb:before {
+  content: " ";
+  position: absolute;
+  left: 0;
+  top: 0;
+  right: 0;
+  height: 1px;
+  border-top: 1px solid #eee;
+  color: #eee;
+  transform-origin: 0 0;
+  transform: scaley(0.5);
+  box-sizing: border-box;
+}
+
+.b-1px-tb:after {
+  content: " ";
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  right: 0;
+  height: 1px;
+  border-bottom: 1px solid #eee;
+  color: #eee;
+  transform-origin: 0 100%;
+  transform: scaley(0.5);
+  box-sizing: border-box;
+}
+
+.b-1px-l::before {
+  content: " ";
+  position: absolute;
+  left: 0;
+  top: 0;
+  width: 1px;
+  bottom: 0;
+  border-left: 1px solid #eee;
+  color: #eee;
+  transform-origin: 0 0;
+  transform: scalex(0.5);
+  box-sizing: border-box;
+}
+
+.b-1px-r::after {
+  content: " ";
+  position: absolute;
+  right: 0;
+  top: 0;
+  width: 1px;
+  bottom: 0;
+  border-right: 1px solid #eee;
+  color: #eee;
+  transform-origin: 100% 0;
+  transform: scalex(0.5);
+  box-sizing: border-box;
+}
\ No newline at end of file
diff --git a/styles/avatar.wxss b/styles/avatar.wxss
new file mode 100644
index 0000000..84d45dc
--- /dev/null
+++ b/styles/avatar.wxss
@@ -0,0 +1,54 @@
+/* 头像 */
+.avatar {
+	margin: 0;
+	padding: 0;
+	display: inline-flex;
+	text-align: center;
+	justify-content: center;
+	align-items: center;
+	/* background: #f4f6f8; */
+	color: #fff;
+	white-space: nowrap;
+	position: relative;
+	width: 120rpx;
+	height: 120rpx;
+	background-size: cover;
+	background-position: center;
+	vertical-align: middle;
+}
+
+.avatar.lg {
+	width: 160rpx;
+	height: 160rpx;
+}
+
+.avatar.md {
+	width: 100rpx;
+	height: 100rpx;
+}
+
+.avatar.sm {
+	width: 80rpx;
+	height: 80rpx;
+}
+
+.avatar-group {
+	direction: ltl;
+	unicode-bidi: bidi-override;
+	display: inline-block;
+}
+
+.avatar-group .avatar {
+	width: 48rpx;
+	height: 48rpx;
+	font-size: 1em;
+	border-radius: 50%;
+	margin-left: -20rpx;
+	border: 4rpx solid white;
+	vertical-align: middle;
+	transform: rotateZ(360deg);
+}
+
+.avatar-group .avatar:nth-child(1) {
+	margin-left: 0rpx;
+}
diff --git a/styles/base.wxss b/styles/base.wxss
new file mode 100644
index 0000000..8251159
--- /dev/null
+++ b/styles/base.wxss
@@ -0,0 +1,187 @@
+ 
+/* 字体大小 */
+.f-little{font-size: 18rpx;}
+.f-icontext{font-size: 22rpx;}/* 很小的文字,一般和图标一起使用 */
+.f-caption{font-size: 24rpx;}/* 辅助描述性文字 */
+.f-desc{font-size: 26rpx;}/* 段落字体 */
+.f-paragraph{font-size: 28rpx;}/* 段落字体 */
+.f-mini-title{font-size: 30rpx;}
+.f-title{font-size: 32rpx;}/* 标题 */
+.f-st-title{font-size: 34rpx;}/* 大点的标题 */ 
+.f-sm-title{font-size: 36rpx;}/* 大点的标题 */ 
+.f-md-title{font-size: 40rpx;}/* 大点的标题 */ 
+.f-lg-title{font-size: 42rpx;}/* 大点的标题 */ 
+.f-big-title{font-size: 46rpx;}/* 大点的标题 */ 
+ 
+
+/* 字体颜色 */
+.c-base{color:#ffffff;}/* 白色 */
+.c-base-rgba{color:rgba(255, 255, 255, 0.6)}/* 白色 */
+.c-black{color: #000000;}/* 黑色 */
+.c-title{color: #232A24}/* 标题/副标题 */
+.c-desc{color:#3D2C1B;}/* 辅助描述性文字 */
+.c-caption{color:#999999;}/* 辅助描述性文字 */
+.c-disable{color: #c7c7c7;}/* 按钮文字禁用 */
+.c-paragraph{color:#666666;}/* 段落字体 */
+.c-success{color:#1BCA62;}/* 成功/链接文字 */ 
+.c-alipay{color:#01AAF2;}/* 支付宝支付文字 */ 
+.c-balance{color:#FA7917;}/* 🈷余额支付文字 */ 
+.c-tips{color:#ffd753;}/* 失效 */ 
+.c-warning{color:#E82F21;}/* 警告/非法 */  
+.c-nodata{color:#cccccc;}/* 链接文字 */
+.c-orange{color:#ff4a00;}/* 首页价格文字 */
+.c-vip{color:#d9cf9a;}/* 充值文字 */
+.c-grey{color:#b9b9b9;}/* 灰色文字 */
+.c-shadow{text-shadow:2rpx 2rpx 2rpx #808080;}/* 字体阴影 */
+
+
+
+/* 填充色 */
+.fill-base{background:#ffffff;}/* 默认 */
+.fill-black{background:#000000;}/* 默认 */
+.fill-body{background:#F7F8FA;}/* 页面 */
+.fill-primary{background:#19c865;}/* 主题色/主要活动按钮 */
+.fill-caption{background:#ffd753;}/* 辅助色 */
+.fill-warning{background:#f12c20;}/* 警告/非法 */ 
+.fill-second{background:#efeff4;}/* 区块分割线 */
+.fill-space{background: #FCFCFC;}/* 次要活动按钮 */
+
+/* 阴影 */
+.box-shadow{box-shadow: 0px 3px 6px 0px rgba(227, 227, 227, 0.47);}
+.box-shadow-mini{box-shadow: 2rpx 0 10rpx rgba(4,0,0,0.08);}
+
+/* 字体样式 */
+text{vertical-align: middle;}/* 上下居中 */
+.text-left{text-align: left;}/* 左对齐 */
+.text-center { text-align: center}/* 中对齐 */
+.text-right {text-align: right}/* 右对齐 */
+.text-justify{text-align: justify;}/* 两端对齐，谨慎使用 */
+.text-justify::after{content: '';width: 100%;display: inline-block;}
+.text-delete {text-decoration: line-through}/* 删除线 */
+.text-underline{text-decoration: underline}/* 下划线 */ 
+.text-bold{ font-weight:bold;}/* 加粗 */
+.text-normal{ font-weight:normal;}
+
+
+/* 文本溢出省略 */
+.ellipsis{display:block;overflow:hidden;white-space:nowrap;text-overflow:ellipsis;}
+.ellipsis-2{display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp:2;overflow: hidden;}
+.ellipsis-3{display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp:3;overflow: hidden;}
+.ellipsis-4{display: -webkit-box;-webkit-box-orient: vertical;-webkit-line-clamp:4;overflow: hidden;}
+ 
+/* 最大宽度 */
+.max-100{max-width: 100rpx;}
+.max-150{max-width: 150rpx;}
+.max-200{max-width: 200rpx;}
+.max-270{max-width: 270rpx;}
+.max-280{max-width: 280rpx;}
+.max-300{max-width: 300rpx;}
+.max-350{max-width: 350rpx;}
+.max-380{max-width: 380rpx;}
+.max-400{max-width: 400rpx;}
+.max-446{max-width: 446rpx;}
+.max-450{max-width: 450rpx;}
+.max-470{max-width: 470rpx;}
+.max-500{max-width: 500rpx;}
+.max-510{max-width: 510rpx;}
+.max-520{max-width: 520rpx;}
+.max-540{max-width: 540rpx;}
+.max-550{max-width: 550rpx;}
+.max-566{max-width: 566rpx;}
+.max-580{max-width: 580rpx;}
+
+/* 外间距 */
+.mg-sm{margin:10rpx;}
+.mg-md{margin:20rpx;}
+.mg-lg{margin:30rpx;}
+
+.mt-sm{margin-top:10rpx;}
+.mt-md{margin-top:20rpx;}
+.mt-lg{margin-top:30rpx;}
+
+.mr-sm{margin-right:10rpx;}
+.mr-md{margin-right:20rpx;}
+.mr-lg{margin-right:30rpx;}
+
+.mb-sm{margin-bottom:10rpx;}
+.mb-md{margin-bottom:20rpx;}
+.mb-lg{margin-bottom:30rpx;}
+
+.ml-sm{margin-left:10rpx;}
+.ml-md{margin-left:20rpx;}
+.ml-lg{margin-left:30rpx;}
+
+
+/* 内间距 */ 
+.pd-sm{padding:10rpx;}
+.pd-md{padding:20rpx;}
+.pd-lg{padding:30rpx;}
+
+.pt-sm{padding-top:10rpx;}
+.pt-md{padding-top:20rpx;}
+.pt-lg{padding-top:30rpx;}
+
+.pr-sm{padding-right:10rpx;}
+.pr-md{padding-right:20rpx;}
+.pr-lg{padding-right:30rpx;}
+
+.pb-sm{padding-bottom:10rpx;}
+.pb-md{padding-bottom:20rpx;}
+.pb-lg{padding-bottom:30rpx;}
+ 
+.pl-sm{padding-left:10rpx;}
+.pl-md{padding-left:20rpx;}
+.pl-lg{padding-left:30rpx;}
+
+
+/* 图标尺寸 */
+.icon-xs{width:32rpx; height:32rpx;display: block;font-size: 32rpx;} 
+.icon-sm{width:44rpx; height:44rpx;display: block;font-size: 44rpx;}
+.icon-md{width:60rpx; height:60rpx;display: block;font-size: 60rpx;} 
+.icon-lg{width:80rpx; height:80rpx;display: block;font-size: 80rpx;}  
+
+
+/* 组件间距 */
+.space-sm{height: 10rpx;}
+.space-md{height: 20rpx;}
+.space-lg{height: 30rpx;}
+.space-ht{height: 190rpx;}
+.space-body{height: 150rpx;}
+.space-safe{height: calc(env(safe-area-inset-bottom) / 2);padding-bottom: calc( env(safe-area-inset-bottom) / 2);}
+.space-footer{height: 30rpx;height: calc(30rpx + env(safe-area-inset-bottom) / 2);padding-bottom: calc( env(safe-area-inset-bottom) / 2);}
+.space-tabbar-footer{height: 100rpx;height: calc(100rpx + env(safe-area-inset-bottom) / 2);padding-bottom: calc( env(safe-area-inset-bottom) / 2);}
+.space-max-footer{height: 180rpx;height: calc(180rpx + env(safe-area-inset-bottom) / 2);padding-bottom: calc(env(safe-area-inset-bottom) / 2);}
+.space{height: 1rpx ;background: rgba(216, 216, 216, 0.5);} 
+
+  
+/* 圆角 */
+.radius{border-radius: 5000rpx;}
+.radius-5 {border-radius: 5rpx;}
+.radius-10 {border-radius: 10rpx;}
+.radius-16 {border-radius: 16rpx;}  
+.radius-18 {border-radius: 18rpx;}
+.radius-20 {border-radius: 20rpx;}   
+.radius-24 {border-radius: 24rpx;}
+.radius-26 {border-radius: 26rpx;}
+.radius-32 {border-radius: 32rpx;}
+.radius-34 {border-radius: 34rpx;}
+
+/* 旋转 */
+.rotate-45{transform: rotate(45deg);}
+.rotate-90{transform: rotate(90deg);}
+.rotate-180{transform: rotate(180deg);}
+.rotate-270{transform: rotate(270deg);}
+
+/* 定位 */
+.rel{position: relative;}
+.abs{position: absolute;}
+.fix{position: fixed;width: 100%;z-index: 100;}
+.fixed-top{position: fixed;left: 0;right: 0;top: 0;z-index: 100;}
+.fixed-bottom{position: fixed;left: 0;right: 0;bottom: 0;z-index: 100;}
+
+/* 灰度 */
+.grayscale {-webkit-filter: grayscale(100%);filter: grayscale(100%);}
+
+
+/* 字体颜色 */
+.icon-font-color{-webkit-background-clip: text;-webkit-text-fill-color: transparent;}
\ No newline at end of file
diff --git a/styles/button.wxss b/styles/button.wxss
new file mode 100644
index 0000000..1ad5b36
--- /dev/null
+++ b/styles/button.wxss
@@ -0,0 +1,104 @@
+/* button样式修改 */
+button {
+	font-size: 30rpx;
+	border-radius: 15rpx;
+	/* line-height: 96rpx; */
+	padding: 0rpx;
+	margin: 0rpx;
+	color: #fff;
+	background: transparent;
+}
+
+button::after {
+	border-color: transparent;
+	border-radius: 30rpx;
+}
+
+button.plain::after {
+	border-color: currentColor;
+}
+
+button[type='grey'] {
+	color: #999999;
+	background: #EEEEEE;
+}
+
+/* 订单按钮 */
+button.order {
+	min-width: 140rpx;
+	padding: 0 20rpx;
+	line-height: 52rpx;
+	color: #5B5B5B;
+	background: #fff;
+	border-radius: 8rpx;
+	border: 1rpx solid #979797;
+	transform: rotateZ(360deg);
+	font-size: 26rpx;
+	font-weight: bold;
+	display: inline-flex;
+	align-items: center;
+	justify-content: center;
+	margin-left: 20rpx
+}
+
+
+/* 购物车按钮 */
+button.reduce,
+button.add {
+	width: 38rpx;
+	height: 38rpx;
+	border-radius: 10rpx;
+	border: 1rpx solid #EEEEEE;
+	transform: rotateZ(360deg);
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	overflow: hidden;
+}
+
+button.reduce .iconfont,
+button.add .iconfont {
+	font-size: 24rpx;
+	line-height: 24rpx;
+	overflow: hidden;
+}
+
+button.addreduce,
+input.addreduce {
+	min-width: 60rpx;
+	padding: 0 10rpx;
+	height: 38rpx;
+	color: #666666;
+	font-size: 28rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	margin: 0rpx 10rpx;
+}
+
+input.addreduce {
+	text-align: center;
+	max-width: 150rpx;
+}
+
+
+/* 按钮按下 */
+.button-hover {
+	opacity: 0.6;
+}
+
+/* 清除按钮默认样式 */
+.clear-btn {
+	margin: 0;
+	padding: 0;
+	background: transparent;
+	border-radius: 0rpx;
+	line-height: 1.5;
+	border: none;
+	text-align: left;
+	color: #333;
+}
+
+.clear-btn::after {
+	border: none;
+}
diff --git a/styles/icon.wxss b/styles/icon.wxss
new file mode 100644
index 0000000..87980da
--- /dev/null
+++ b/styles/icon.wxss
@@ -0,0 +1,1657 @@
+@font-face {
+  font-family: 'iconfont';  /* Project id 4110196 */
+  src: url('https://at.alicdn.com/t/c/font_4110196_r2eepy29ecm.woff2?t=1690765463726') format('woff2'),
+       url('https://at.alicdn.com/t/c/font_4110196_r2eepy29ecm.woff?t=1690765463726') format('woff'),
+       url('https://at.alicdn.com/t/c/font_4110196_r2eepy29ecm.ttf?t=1690765463726') format('truetype');
+}
+@font-face {
+  font-family: "iconfont"; /* Project id 2649930 */
+  src: url('https://at.alicdn.com/t/c/font_2649930_kwmue8hcdxj.woff2?t=1685093547270') format('woff2'),
+       url('https://at.alicdn.com/t/c/font_2649930_kwmue8hcdxj.woff?t=1685093547270') format('woff'),
+       url('https://at.alicdn.com/t/c/font_2649930_kwmue8hcdxj.ttf?t=1685093547270') format('truetype');
+}
+
+.iconfont {
+  font-family: "iconfont" !important;
+  font-size: 16px;
+  line-height:1;
+  font-style: normal;
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+.icon-kzz:before {
+  content: "\e90c";
+}
+
+.icon-kpk:before {
+  content: "\e932";
+}
+
+.icon-kzj:before {
+  content: "\e819";
+}
+
+.icon-khz:before {
+  content: "\e9b1";
+}
+
+.icon-kpb:before {
+  content: "\e9c3";
+}
+
+.icon-kdt:before {
+  content: "\e9c9";
+}
+
+.icon-khydj:before {
+  content: "\e97f";
+}
+
+.icon-kcpss:before {
+  content: "\e982";
+}
+
+.icon-kcfmx:before {
+  content: "\e90d";
+}
+
+.icon-ksc1:before {
+  content: "\e945";
+}
+
+.icon-ksc:before {
+  content: "\e9c0";
+}
+
+.icon-kqh1:before {
+  content: "\e929";
+}
+
+.icon-kdd2:before {
+  content: "\e81d";
+}
+
+.icon-kqh:before {
+  content: "\e856";
+}
+
+.icon-kdqr:before {
+  content: "\e911";
+}
+
+.icon-kwd:before {
+  content: "\e918";
+}
+
+.icon-ktg:before {
+  content: "\e919";
+}
+
+.icon-kfs:before {
+  content: "\e921";
+}
+
+.icon-shouyi:before {
+  content: "\e92a";
+}
+
+.icon-kefu:before {
+  content: "\e95c";
+}
+
+.icon-ksy:before {
+  content: "\e922";
+}
+
+.icon-qichuyue:before {
+  content: "\e66e";
+}
+
+.icon-kfkjy1:before {
+  content: "\f917";
+}
+
+.icon-kdzf:before {
+  content: "\e9a5";
+}
+
+.icon-kfkjy:before {
+  content: "\e937";
+}
+
+.icon-kye:before {
+  content: "\faf6";
+}
+
+.icon-khhr2:before {
+  content: "\e956";
+}
+
+.icon-kjs:before {
+  content: "\e917";
+}
+
+.icon-kqds1:before {
+  content: "\e9ef";
+}
+
+.icon-khhr:before {
+  content: "\e972";
+}
+
+.icon-dd:before {
+  content: "\e97b";
+}
+
+.icon-kqds:before {
+  content: "\e850";
+}
+
+.icon-kyhj:before {
+  content: "\e889";
+}
+
+.icon-kll:before {
+  content: "\e831";
+}
+
+.icon-kdd:before {
+  content: "\e80d";
+}
+
+.icon-kpj:before {
+  content: "\e66f";
+}
+
+.icon-dizhi:before {
+  content: "\e871";
+}
+
+.icon-shijian:before {
+  content: "\e909";
+}
+
+.icon-shuxian:before {
+  content: "\e908";
+}
+
+.icon-tech:before {
+  content: "\e905";
+}
+
+.icon-tuijian:before {
+  content: "\e906";
+}
+
+.icon-tuijian1:before {
+  content: "\e907";
+}
+
+.icon-czsg:before {
+  content: "\e902";
+}
+
+.icon-csmt:before {
+  content: "\e901";
+}
+
+.icon-qcbz:before {
+  content: "\e904";
+}
+
+.icon-sybp:before {
+  content: "\e903";
+}
+
+.icondianqianhetong:before {
+  content: "\e7b2";
+}
+
+.iconduanxinyanzhengma:before {
+  content: "\e61e";
+}
+
+.iconshoujitianchong:before {
+  content: "\e6e3";
+}
+
+.iconemiyanzhengma:before {
+  content: "\e61b";
+}
+
+.iconbiaoqianye-dituzhaoren1:before {
+  content: "\e7ac";
+}
+
+.iconbiaoqianye-dituzhaoren2:before {
+  content: "\e7ae";
+}
+
+.icondituzhaoren2:before {
+  content: "\e7a1";
+}
+
+.iconshimingrenzheng:before {
+  content: "\e7a3";
+}
+
+.iconzizhirenzheng:before {
+  content: "\e7a7";
+}
+
+.iconshaixuan:before {
+  content: "\e7a8";
+}
+
+.iconliebiaomoshi2:before {
+  content: "\e7aa";
+}
+
+.iconhetongguanli:before {
+  content: "\e66d";
+}
+
+.iconfenleiyingyongtongzhi2:before {
+  content: "\e6a9";
+}
+
+.iconjingjirenshuoming:before {
+  content: "\e79f";
+}
+
+.iconxiangxiazhankai:before {
+  content: "\e8f2";
+}
+
+.iconyinhangqia:before {
+  content: "\e622";
+}
+
+.icontixingshixin:before {
+  content: "\ec72";
+}
+
+.iconwoyaofabu:before {
+  content: "\e79e";
+}
+
+.icondaijiedan1:before {
+  content: "\e78c";
+}
+
+.iconyijiedan1:before {
+  content: "\e792";
+}
+
+.iconyiwancheng1:before {
+  content: "\e79d";
+}
+
+.iconedit-fill:before {
+  content: "\eb5c";
+}
+
+.iconbianzu-8_2x:before {
+  content: "\e606";
+}
+
+.iconbianzu-8_2x_1_:before {
+  content: "\e607";
+}
+
+.iconjinrong_financebeifen-2_2x:before {
+  content: "\e619";
+}
+
+.iconshangjia_1:before {
+  content: "\e78f";
+}
+
+.iconbangdingqudaoshang:before {
+  content: "\e767";
+}
+
+.iconbangdingyewuyuan:before {
+  content: "\e780";
+}
+
+.icondaizhuandan:before {
+  content: "\e791";
+}
+
+.icondaifuwu4:before {
+  content: "\e795";
+}
+
+.iconjujuetuikuan:before {
+  content: "\e796";
+}
+
+.iconjishidaoda1:before {
+  content: "\e799";
+}
+
+.iconjishichufa1:before {
+  content: "\e79b";
+}
+
+.iconjishijiedan1:before {
+  content: "\e79c";
+}
+
+.icontixianshenqing1:before {
+  content: "\e7a0";
+}
+
+.icontixianjilu1:before {
+  content: "\e7a2";
+}
+
+.iconlianxifangshi:before {
+  content: "\e7a4";
+}
+
+.icontongyituikuan:before {
+  content: "\e7a5";
+}
+
+.iconyongjinxinxi1:before {
+  content: "\e7a6";
+}
+
+.iconwodeshouyi2:before {
+  content: "\e7a9";
+}
+
+.iconyiwancheng:before {
+  content: "\e7ab";
+}
+
+.iconwodeyaoqing1:before {
+  content: "\e7ad";
+}
+
+.iconzhanghaoshezhi:before {
+  content: "\e7b0";
+}
+
+.iconshenqingzhong:before {
+  content: "\e7b3";
+}
+
+.iconpeiwanguan2:before {
+  content: "\e760";
+}
+
+.iconpeiwanguan1:before {
+  content: "\e77f";
+}
+
+.iconshangcheng2:before {
+  content: "\e75e";
+}
+
+.icondaipinglun:before {
+  content: "\e755";
+}
+
+.icondaifukuan:before {
+  content: "\e756";
+}
+
+.icondaifuwu3:before {
+  content: "\e758";
+}
+
+.icondizhi2:before {
+  content: "\e759";
+}
+
+.icondituzhaoren1:before {
+  content: "\e75c";
+}
+
+.icondingdan11:before {
+  content: "\e75f";
+}
+
+.icongexingbiaoqian:before {
+  content: "\e765";
+}
+
+.iconhezuohuoban:before {
+  content: "\e766";
+}
+
+.icondizhiguanli3:before {
+  content: "\e768";
+}
+
+.iconfuwuzhong3:before {
+  content: "\e76c";
+}
+
+.iconjishixiangqing:before {
+  content: "\e772";
+}
+
+.iconjishi11:before {
+  content: "\e774";
+}
+
+.iconlianxikefu3:before {
+  content: "\e783";
+}
+
+.icondianpu:before {
+  content: "\e784";
+}
+
+.iconpinglun3:before {
+  content: "\e785";
+}
+
+.iconqiehuan:before {
+  content: "\e78b";
+}
+
+.iconshoucang23:before {
+  content: "\e78d";
+}
+
+.iconshenqingjishi3:before {
+  content: "\e78e";
+}
+
+.iconwode12:before {
+  content: "\e793";
+}
+
+.icontuikuan3:before {
+  content: "\e794";
+}
+
+.iconwoshiqudao2:before {
+  content: "\e797";
+}
+
+.iconwentifankui4:before {
+  content: "\e798";
+}
+
+.iconshoucang13:before {
+  content: "\e79a";
+}
+
+.iconbuxihuan-xuanzhong:before {
+  content: "\e753";
+}
+
+.iconbuxihuan:before {
+  content: "\e754";
+}
+
+.icondizhiguanli2:before {
+  content: "\e757";
+}
+
+.iconfaxian-1:before {
+  content: "\e75b";
+}
+
+.iconfaxian-2:before {
+  content: "\e75d";
+}
+
+.iconhehuoren1:before {
+  content: "\e762";
+}
+
+.iconpeiwanguan:before {
+  content: "\e76a";
+}
+
+.iconpinglun2:before {
+  content: "\e76b";
+}
+
+.iconshangchuantupian:before {
+  content: "\e76d";
+}
+
+.iconshezhi:before {
+  content: "\e76e";
+}
+
+.iconshenqingfenxiaoyuan:before {
+  content: "\e76f";
+}
+
+.iconshouye12:before {
+  content: "\e770";
+}
+
+.iconshichang:before {
+  content: "\e771";
+}
+
+.iconshouye2:before {
+  content: "\e777";
+}
+
+.iconwentifankui3:before {
+  content: "\e778";
+}
+
+.iconwode-1:before {
+  content: "\e77a";
+}
+
+.iconwode-2:before {
+  content: "\e781";
+}
+
+.iconxiaoxi2:before {
+  content: "\e786";
+}
+
+.iconwoshiqudaoshang:before {
+  content: "\e782";
+}
+
+.iconwoyaoruzhu:before {
+  content: "\e788";
+}
+
+.iconxiaoxi1:before {
+  content: "\e789";
+}
+
+.iconxiangqing2:before {
+  content: "\e78a";
+}
+
+.iconshoucang22:before {
+  content: "\e72b";
+}
+
+.iconshoucang12:before {
+  content: "\e730";
+}
+
+.icondizhi_1:before {
+  content: "\e737";
+}
+
+.icondadianhua_1:before {
+  content: "\e73d";
+}
+
+.iconshipin2:before {
+  content: "\e735";
+}
+
+.iconbangdingjishi1:before {
+  content: "\e723";
+}
+
+.icondaifuwu2:before {
+  content: "\e72a";
+}
+
+.icondaipingjia2:before {
+  content: "\e72c";
+}
+
+.icondaizhifu2:before {
+  content: "\e72d";
+}
+
+.icondizhi1:before {
+  content: "\e72e";
+}
+
+.icondizhiguanli1:before {
+  content: "\e72f";
+}
+
+.icondingdan1:before {
+  content: "\e731";
+}
+
+.icondianming:before {
+  content: "\e732";
+}
+
+.iconfuwuzhong2:before {
+  content: "\e733";
+}
+
+.icongongsi:before {
+  content: "\e734";
+}
+
+.iconjingxiaoshang:before {
+  content: "\e736";
+}
+
+.iconjuli3:before {
+  content: "\e738";
+}
+
+.iconjishi1:before {
+  content: "\e739";
+}
+
+.iconlianxikefu2:before {
+  content: "\e73a";
+}
+
+.iconmendian1:before {
+  content: "\e73b";
+}
+
+.iconpingjia:before {
+  content: "\e73c";
+}
+
+.iconqiehuanjishiduan2:before {
+  content: "\e740";
+}
+
+.iconputonghuiyuan:before {
+  content: "\e741";
+}
+
+.iconshijian1:before {
+  content: "\e742";
+}
+
+.iconshenqingjishi2:before {
+  content: "\e743";
+}
+
+.iconshoucang:before {
+  content: "\e745";
+}
+
+.iconshouye1:before {
+  content: "\e746";
+}
+
+.iconwentifankui2:before {
+  content: "\e747";
+}
+
+.icontuiguanghaibao1:before {
+  content: "\e748";
+}
+
+.iconwode11:before {
+  content: "\e749";
+}
+
+.iconwodeshouyi1:before {
+  content: "\e74b";
+}
+
+.iconwodefensi:before {
+  content: "\e74c";
+}
+
+.iconwoshiqudao1:before {
+  content: "\e74d";
+}
+
+.iconyingyezhizhao:before {
+  content: "\e74e";
+}
+
+.iconshenqingfenxiaoshang:before {
+  content: "\e74f";
+}
+
+.icontuikuan2:before {
+  content: "\e750";
+}
+
+.iconyingyeshijian:before {
+  content: "\e751";
+}
+
+.iconzuizaokeyue1:before {
+  content: "\e752";
+}
+
+.icon-hezuoguanxi:before {
+  content: "\e8a9";
+}
+
+.iconpinglun1:before {
+  content: "\e70d";
+}
+
+.iconjuli2:before {
+  content: "\e70e";
+}
+
+.iconshoucang11:before {
+  content: "\e713";
+}
+
+.iconshoucang21:before {
+  content: "\e715";
+}
+
+.iconxiangqing1:before {
+  content: "\e716";
+}
+
+.iconcamera-fill:before {
+  content: "\e711";
+}
+
+.icondaipingjia1:before {
+  content: "\e718";
+}
+
+.icondaifuwu1:before {
+  content: "\e719";
+}
+
+.icondaizhifu1:before {
+  content: "\e71a";
+}
+
+.icondizhi:before {
+  content: "\e71b";
+}
+
+.iconlianxikefu1:before {
+  content: "\e71c";
+}
+
+.iconhehuoren:before {
+  content: "\e71d";
+}
+
+.iconpingbiyonghu:before {
+  content: "\e71e";
+}
+
+.iconshenqingjishi1:before {
+  content: "\e71f";
+}
+
+.icontixianjilu:before {
+  content: "\e720";
+}
+
+.icontuikuan1:before {
+  content: "\e721";
+}
+
+.iconfuwuzhong1:before {
+  content: "\e722";
+}
+
+.iconwentifankui1:before {
+  content: "\e724";
+}
+
+.iconwodeyaoqing:before {
+  content: "\e725";
+}
+
+.iconqiehuanjishiduan1:before {
+  content: "\e726";
+}
+
+.iconwodeyouhuiquan:before {
+  content: "\e727";
+}
+
+.iconwoshiqudao:before {
+  content: "\e728";
+}
+
+.iconyongjinliushui:before {
+  content: "\e729";
+}
+
+.icondingdan4:before {
+  content: "\e709";
+}
+
+.iconpingfen1:before {
+  content: "\e70a";
+}
+
+.iconjuli1:before {
+  content: "\e70b";
+}
+
+.iconanmo3:before {
+  content: "\e70c";
+}
+
+.iconshangjia:before {
+  content: "\e70f";
+}
+
+.iconshijian:before {
+  content: "\e710";
+}
+
+.iconshouye31:before {
+  content: "\e712";
+}
+
+.iconwode3:before {
+  content: "\e714";
+}
+
+.iconzuizaokeyue:before {
+  content: "\e717";
+}
+
+.icon-account:before {
+  content: "\e610";
+}
+
+.icon-alipay-fill:before {
+  content: "\e669";
+}
+
+.iconshipin:before {
+  content: "\e618";
+}
+
+.iconshang:before {
+  content: "\e862";
+}
+
+.iconxia:before {
+  content: "\e863";
+}
+
+.icon-android:before {
+  content: "\e63d";
+}
+
+.icon-play-video:before {
+  content: "\e66e";
+}
+
+.icon-shield:before {
+  content: "\e65d";
+}
+
+.icondingdanguanli:before {
+  content: "\e700";
+}
+
+.iconshouhuodepinglun:before {
+  content: "\e703";
+}
+
+.iconxinzengguanzhu:before {
+  content: "\e706";
+}
+
+.icontixianshenqing:before {
+  content: "\e707";
+}
+
+.iconyongjinxinxi:before {
+  content: "\e708";
+}
+
+.iconkeyuyue:before {
+  content: "\e6ff";
+}
+
+.icon-bofang:before {
+  content: "\e621";
+}
+
+.icon-caidan:before {
+  content: "\e790";
+}
+
+.icon-edit:before {
+  content: "\ec7c";
+}
+
+.icon-kefuwu:before {
+  content: "\e702";
+}
+
+.icon-dongtai2:before {
+  content: "\e6f7";
+}
+
+.icon-dongtai1:before {
+  content: "\e6fb";
+}
+
+.icon-shoucang-fill:before {
+  content: "\e6fc";
+}
+
+.icon-shoucang:before {
+  content: "\e6fd";
+}
+
+.icon-pinglun:before {
+  content: "\e6fe";
+}
+
+.iconshengji:before {
+  content: "\e6f4";
+}
+
+.icon-required:before {
+  content: "\e649";
+}
+
+.iconchefeitixianjilu:before {
+  content: "\e6f0";
+}
+
+.icondengjiguanli:before {
+  content: "\e6f1";
+}
+
+.iconyanzhengma:before {
+  content: "\e624";
+}
+
+.icondangqianweizhi:before {
+  content: "\e6de";
+}
+
+.iconshijianguanli2:before {
+  content: "\e6df";
+}
+
+.iconweizhigengxin1:before {
+  content: "\e6e0";
+}
+
+.iconyijianbaojing:before {
+  content: "\e6e1";
+}
+
+.icontishishuoming:before {
+  content: "\e64c";
+}
+
+.iconshuyi_shuoming:before {
+  content: "\e668";
+}
+
+.icon-alipay:before {
+  content: "\e68a";
+}
+
+.icon-level-line:before {
+  content: "\e6dd";
+}
+
+.icon-level-icon:before {
+  content: "\e6d4";
+}
+
+.icon-xiuxi:before {
+  content: "\e667";
+}
+
+.icon-jiedan:before {
+  content: "\e625";
+}
+
+.icon-zaixian:before {
+  content: "\e89d";
+}
+
+.icon-caiwuguanli:before {
+  content: "\e617";
+}
+
+.icon-guanbi-fill:before {
+  content: "\e85f";
+}
+
+.iconwodeshoucang:before {
+  content: "\e6c8";
+}
+
+.iconwodekaquan:before {
+  content: "\e6c9";
+}
+
+.iconshouye:before {
+  content: "\e6e2";
+}
+
+.icontushucxuanzebofangtiaozhuan:before {
+  content: "\e677";
+}
+
+.icongengduo1:before {
+  content: "\e644";
+}
+
+.iconbianjiziliao:before {
+  content: "\e6c4";
+}
+
+.iconchapingshensu:before {
+  content: "\e6c5";
+}
+
+.iconchefeimingxi:before {
+  content: "\e6c6";
+}
+
+.iconchongzhijine:before {
+  content: "\e6c7";
+}
+
+.iconfenchengmingxi:before {
+  content: "\e6ca";
+}
+
+.iconfenxiang:before {
+  content: "\e6cb";
+}
+
+.iconjifenmingxi:before {
+  content: "\e6cc";
+}
+
+.iconguanbi:before {
+  content: "\e6cd";
+}
+
+.iconqiehuanyonghuduan:before {
+  content: "\e6ce";
+}
+
+.iconjiazhongtongji:before {
+  content: "\e6cf";
+}
+
+.iconriqi:before {
+  content: "\e6d0";
+}
+
+.iconshangchuanzhaopian:before {
+  content: "\e6d1";
+}
+
+.iconsousuo:before {
+  content: "\e6d2";
+}
+
+.iconshijianguanli1:before {
+  content: "\e6d3";
+}
+
+.iconweizhigengxin:before {
+  content: "\e6d5";
+}
+
+.iconwentifankui:before {
+  content: "\e6d6";
+}
+
+.iconwuliaoshangcheng:before {
+  content: "\e6d7";
+}
+
+.iconyejimingxi:before {
+  content: "\e6d9";
+}
+
+.iconzhuxiaozhanghu:before {
+  content: "\e6db";
+}
+
+.iconwoyaojieyue:before {
+  content: "\e6dc";
+}
+
+.icongengduo:before {
+  content: "\e6b8";
+}
+
+.iconguan:before {
+  content: "\e6bc";
+}
+
+.iconkai:before {
+  content: "\e6c1";
+}
+
+.icon-weixin:before {
+  content: "\e627";
+}
+
+.icon-apple:before {
+  content: "\e60f";
+}
+
+.icongerenxinxi:before {
+  content: "\e616";
+}
+
+.iconzhiweixiangqing:before {
+  content: "\e6e5";
+}
+
+.icon-account-line:before {
+  content: "\e688";
+}
+
+.icon-person-accounts:before {
+  content: "\e6ba";
+}
+
+.icon-chaifenyemian:before {
+  content: "\e6c0";
+}
+
+.icon-diy:before {
+  content: "\e629";
+}
+
+.icon-zuzhi:before {
+  content: "\eaaa";
+}
+
+.icon-qudao:before {
+  content: "\e63b";
+}
+
+.iconjishijiedan:before {
+  content: "\e6b9";
+}
+
+.iconerweima3:before {
+  content: "\e84c";
+}
+
+.iconerweima:before {
+  content: "\e623";
+}
+
+.iconjishidaoda:before {
+  content: "\e6b3";
+}
+
+.iconjishichufa:before {
+  content: "\e6b5";
+}
+
+.iconjishifuwu:before {
+  content: "\e6b6";
+}
+
+.iconjishiwancheng:before {
+  content: "\e6bd";
+}
+
+.iconyijiedan:before {
+  content: "\e6be";
+}
+
+.icondaijiedan:before {
+  content: "\e6bf";
+}
+
+.iconjingbao:before {
+  content: "\e636";
+}
+
+.iconanmo1:before {
+  content: "\e857";
+}
+
+.iconanmo2:before {
+  content: "\e858";
+}
+
+.iconchongzhi:before {
+  content: "\e859";
+}
+
+.iconbodadianhua:before {
+  content: "\e85a";
+}
+
+.icondaipingjia:before {
+  content: "\e85b";
+}
+
+.icondizhiguanli:before {
+  content: "\e85c";
+}
+
+.icondingdan2:before {
+  content: "\e85d";
+}
+
+.iconfuwuzhong:before {
+  content: "\e85e";
+}
+
+.iconjifen3:before {
+  content: "\e860";
+}
+
+.icondingdan3:before {
+  content: "\e861";
+}
+
+.iconjuli:before {
+  content: "\e867";
+}
+
+.iconlianxikefu:before {
+  content: "\e868";
+}
+
+.iconbangdingjishi:before {
+  content: "\e869";
+}
+
+.iconpinglun:before {
+  content: "\e86a";
+}
+
+.iconqiehuanjishiduan:before {
+  content: "\e86b";
+}
+
+.icondaizhifu:before {
+  content: "\e86c";
+}
+
+.icondaifuwu:before {
+  content: "\e86d";
+}
+
+.iconshaixuanshang-1:before {
+  content: "\e870";
+}
+
+.iconshijianguanli:before {
+  content: "\e873";
+}
+
+.iconshipin1:before {
+  content: "\e875";
+}
+
+.iconshoucang1:before {
+  content: "\e876";
+}
+
+.iconshenqingjishi:before {
+  content: "\e877";
+}
+
+.iconshoucangjishi:before {
+  content: "\e878";
+}
+
+.iconshouye21:before {
+  content: "\e879";
+}
+
+.iconshouye11:before {
+  content: "\e87a";
+}
+
+.iconpingfen:before {
+  content: "\e87b";
+}
+
+.icontuikuan:before {
+  content: "\e87c";
+}
+
+.icontuiguanghaibao:before {
+  content: "\e87d";
+}
+
+.iconwodeshouyi:before {
+  content: "\e87e";
+}
+
+.iconxiangqing:before {
+  content: "\e87f";
+}
+
+.iconwodetuandui1:before {
+  content: "\e880";
+}
+
+.iconshaixuanxia-1:before {
+  content: "\e881";
+}
+
+.iconsousuo1:before {
+  content: "\e883";
+}
+
+.iconshoucang2:before {
+  content: "\e884";
+}
+
+.iconwode2:before {
+  content: "\e885";
+}
+
+.iconyaoqingyouli:before {
+  content: "\e886";
+}
+
+.iconwode1:before {
+  content: "\e887";
+}
+
+.icon-down-fill:before {
+  content: "\e665";
+}
+
+.icon-up-fill:before {
+  content: "\e666";
+}
+
+.iconweixin:before {
+  content: "\e64f";
+}
+
+.icon-share:before {
+  content: "\e638";
+}
+
+.iconnan-xiaotu:before {
+  content: "\e7b1";
+}
+
+.iconnv-xiaotu:before {
+  content: "\e7b4";
+}
+
+.icontongzhi:before {
+  content: "\e64e";
+}
+
+.iconsanjiao_xia:before {
+  content: "\e671";
+}
+
+.iconbalance:before {
+  content: "\e763";
+}
+
+.iconweixinzhifu1:before {
+  content: "\e764";
+}
+
+.iconqianbao:before {
+  content: "\e829";
+}
+
+.iconhuiyuanka:before {
+  content: "\e7af";
+}
+
+.icon-liuyanguanli:before {
+  content: "\e6bb";
+}
+
+.iconguanzhu:before {
+  content: "\e68c";
+}
+
+.iconguanzhuxuanzhong:before {
+  content: "\e689";
+}
+
+.iconyduixingxingkongxin:before {
+  content: "\e779";
+}
+
+.iconyduixingxingshixin:before {
+  content: "\e77b";
+}
+
+.icon-yuyue:before {
+  content: "\e6da";
+}
+
+.icon-yingxiao:before {
+  content: "\e701";
+}
+
+.icon-gouwuche-fill:before {
+  content: "\e600";
+}
+
+.icon-dingwei-fill:before {
+  content: "\e602";
+}
+
+.icon-left:before {
+  content: "\e604";
+}
+
+.icon-right:before {
+  content: "\e608";
+}
+
+.icon-close:before {
+  content: "\e609";
+}
+
+.icon-add:before {
+  content: "\e611";
+}
+
+.icon-gouwudai:before {
+  content: "\e73e";
+}
+
+.icon-caiwu:before {
+  content: "\e6a7";
+}
+
+.icon-kehu:before {
+  content: "\e6ad";
+}
+
+.icon-member:before {
+  content: "\e761";
+}
+
+.icon-shenhe:before {
+  content: "\e695";
+}
+
+.icon-xitong:before {
+  content: "\e6a8";
+}
+
+.icon-daifukuan:before {
+  content: "\e787";
+}
+
+.icon-dingdanguanli:before {
+  content: "\e632";
+}
+
+.icon-shangpin:before {
+  content: "\e63c";
+}
+
+.icon-dianpu:before {
+  content: "\e66c";
+}
+
+.icon-daihexiao:before {
+  content: "\e6f8";
+}
+
+.icon-yiwancheng:before {
+  content: "\e6f9";
+}
+
+.icon-pingjia:before {
+  content: "\e77e";
+}
+
+.icon-home:before {
+  content: "\e775";
+}
+
+.icon-home-fill:before {
+  content: "\e776";
+}
+
+.icon-dingwei:before {
+  content: "\e612";
+}
+
+.icon-shouhouguanli:before {
+  content: "\e773";
+}
+
+.icon-jishi:before {
+  content: "\e652";
+}
+
+.icon-wodeshouhou:before {
+  content: "\e60d";
+}
+
+.icon-tongzhi-fill:before {
+  content: "\e615";
+}
+
+.icon-jishi-fill:before {
+  content: "\e601";
+}
+
+.icon-tuichu:before {
+  content: "\e603";
+}
+
+.icon-camera:before {
+  content: "\e60e";
+}
+
+.icon-down:before {
+  content: "\e60a";
+}
+
+.icon-xuanze:before {
+  content: "\e77c";
+}
+
+.icon-xuanze-fill:before {
+  content: "\e77d";
+}
+
+.icon-switch:before {
+  content: "\e642";
+}
+
+.icon-switch-on:before {
+  content: "\e643";
+}
+
+.icon-jian-fill:before {
+  content: "\e61f";
+}
+
+.icon-jian:before {
+  content: "\e6fa";
+}
+
+.icon-radio-fill:before {
+  content: "\e620";
+}
+
+.icon-gouwudai-fill:before {
+  content: "\e6d8";
+}
+
+.icon-eyeclose:before {
+  content: "\e6ab";
+}
+
+.icon-eyeopen:before {
+  content: "\e6ac";
+}
+
+.icon-mima:before {
+  content: "\e69e";
+}
+
+.icon-username:before {
+  content: "\e6b7";
+}
+
+.icon-mine:before {
+  content: "\e6f5";
+}
+
+.icon-mine-fill:before {
+  content: "\e6f6";
+}
+
+.icon-tongzhi:before {
+  content: "\e60b";
+}
+
+.icon-jia-bold:before {
+  content: "\e613";
+}
+
+.icon-jian-bold:before {
+  content: "\e614";
+}
+
+.icon-tianjia:before {
+  content: "\e653";
+}
+
+.icon-zhuanhuan:before {
+  content: "\e6c2";
+}
+
+.icon-xiaochengxu:before {
+  content: "\e6c3";
+}
+
+.icon-warn:before {
+  content: "\e6a5";
+}
+
+.icon-weirenzheng:before {
+  content: "\e63a";
+}
+
+.icon-biaoqian:before {
+  content: "\e60c";
+}
+
+.icon-shuaxin:before {
+  content: "\e654";
+}
diff --git a/styles/index.wxss b/styles/index.wxss
new file mode 100644
index 0000000..b9a2929
--- /dev/null
+++ b/styles/index.wxss
@@ -0,0 +1,9 @@
+@import './1px.wxss';
+@import './avatar.wxss';
+@import './base.wxss';
+@import './button.wxss';
+@import './icon.wxss';
+@import './layout.wxss';
+@import './navbar.wxss';
+@import './popup.wxss';
+@import './pages.wxss';
diff --git a/styles/layout.wxss b/styles/layout.wxss
new file mode 100644
index 0000000..b9ecb6d
--- /dev/null
+++ b/styles/layout.wxss
@@ -0,0 +1,60 @@
+/*flex布局,可以自己定义适合自己的*/
+.flex {
+	display: flex;
+}
+
+.flex-1 {
+	flex: 1;
+}
+
+.flex-column {
+	display: flex;
+	flex-direction: column;
+}
+
+.flex-warp {
+	display: flex;
+	flex-wrap: wrap;
+}
+
+.flex-center {
+	display: flex;
+	align-items: center;
+	justify-content: center;
+}
+
+.flex-between {
+	display: flex;
+	align-items: center;
+	justify-content: space-between;
+}
+
+.flex-x-center {
+	display: flex;
+	justify-content: center;
+}
+
+.flex-x-between {
+	display: flex;
+	justify-content: space-between;
+}
+
+.flex-y-center {
+	display: flex;
+	align-items: center;
+}
+
+.flex-y-start {
+	display: flex;
+	align-items: flex-start;
+}
+
+.flex-y-end {
+	display: flex;
+	align-items: flex-end;
+}
+
+.flex-y-baseline {
+	display: flex;
+	align-items: baseline;
+}
diff --git a/styles/navbar.wxss b/styles/navbar.wxss
new file mode 100644
index 0000000..a701bbd
--- /dev/null
+++ b/styles/navbar.wxss
@@ -0,0 +1,100 @@
+/* ios_自定义navBar */
+.back-user-ios {
+	width: 87px;
+	height: 32px;
+	border-radius: 32px;
+	margin-top: 6px;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	background: #fff;
+	border: 1px solid #eeeeee;
+	margin-left: 24rpx;
+	transform: rotateZ(360deg);
+}
+
+.back-user-ios .back-user_avatar {
+	width: 24px;
+	height: 24px;
+	border-radius: 50%;
+	background: #f4f6f8;
+}
+
+.back-user-ios .back-user_text {
+	font-size: 11px;
+	line-height: 44px;
+	margin-left: 5px;
+}
+
+/* .nav_c_text {
+	line-height: 44px;
+	font-size: 16px;
+} */
+
+/* android_自定义navBar */
+.back-user-android {
+	/* #ifdef MP-BAIDU */
+	width: 74.5px;
+	height: 28px;
+	border-radius: 28px;
+	margin-top: 5px;
+	/* #endif */
+	/* #ifndef MP-BAIDU */
+	width: 87px;
+	height: 32px;
+	border-radius: 32px;
+	margin-top: 6px;
+	/* #endif */
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	background: #fff;
+	border: 1px solid #eeeeee;
+	margin-left: 24rpx;
+	transform: rotateZ(360deg);
+}
+
+
+.back-user-android .back-user_avatar {
+	/* #ifdef MP-BAIDU */
+	width: 20px;
+	height: 20px;
+	/* #endif */
+	/* #ifndef MP-BAIDU */
+	width: 24px;
+	height: 24px;
+	/* #endif */
+	border-radius: 50%;
+	background: #f4f6f8;
+}
+
+
+.back-user-android .back-user_text {
+	/* #ifdef MP-BAIDU */
+	font-size: 10px;
+	line-height: 28px;
+	margin-left: 3px;
+	/* #endif */
+	/* #ifndef MP-BAIDU */
+	font-size: 11px;
+	line-height: 44px;
+	margin-left: 5px;
+	/* #endif */
+}
+
+.back-user-ios.none,
+.back-user-android.none {
+	color: #fff;
+	background: none;
+}
+
+.nav_c_text {
+	/* #ifdef MP-BAIDU */
+	line-height: 36px;
+	font-size: 15px;
+	/* #endif */
+	/* #ifndef MP-BAIDU */
+	line-height: 44px;
+	font-size: 16px;
+	/* #endif */
+}
diff --git a/styles/pages.wxss b/styles/pages.wxss
new file mode 100644
index 0000000..55603f1
--- /dev/null
+++ b/styles/pages.wxss
@@ -0,0 +1,440 @@
+.page-height {
+	width: 100%;
+	height: 100vh;
+	background: #fff;
+}
+
+/* 单选/多选按钮 */
+.pay-icon {
+	font-size: 40rpx;
+}
+
+/* 分享按钮 */
+.common-share-btn {
+	right: 30rpx;
+	bottom: 140rpx;
+	width: 90rpx;
+	height: 90rpx;
+	margin-bottom: calc(env(safe-area-inset-bottom) / 2);
+
+	.iconfont {
+		font-size: 40rpx;
+	}
+}
+
+.common-share-btn.detail {
+	bottom: 170rpx;
+}
+
+.map-info {
+	.iconjuli {
+		font-size: 42rpx;
+	}
+
+	.icon-down {
+		transform: scale(0.5);
+	}
+}
+
+/* 海报 */
+.hideCanvasView {
+	position: relative;
+
+	.hideCanvas {
+		position: absolute;
+		left: -9999rpx;
+		top: -9999rpx
+	}
+}
+
+/* 技-师页面 */
+.pages-technician {
+	.fix-info {
+		height: 225rpx;
+
+		.space-top {
+			width: 100%;
+			height: 40rpx;
+			top: 0;
+		}
+
+		.search-info {
+			width: 100%;
+			top: 0;
+
+			.city-info {
+				width: 170rpx;
+
+				.iconfont {
+					font-size: 20rpx;
+					transform: scale(0.5);
+				}
+			}
+		}
+	}
+
+	.fix-info.choose {
+		height: 135rpx;
+	}
+
+
+	.choose-city-popup {
+		padding: 0 32rpx 0 30rpx;
+
+		.city-img {
+			width: 688rpx;
+			height: 364rpx;
+		}
+
+		.text {
+			top: 256rpx;
+			left: 78rpx;
+			width: 606rpx;
+		}
+
+		.flex-between {
+			margin-top: 25rpx;
+
+			.item-btn {
+				width: 238rpx;
+				height: 85rpx;
+				background: #F9F9F9;
+			}
+		}
+
+	}
+}
+
+
+/* 订单相关页面 */
+.order-pages {
+
+	.service-type-item {
+		min-width: 143rpx;
+		height: 59rpx;
+		padding: 0 10rpx;
+		background: #F5F5F5;
+		border-radius: 8rpx
+	}
+
+	.address-info {
+		.address-icon {
+			width: 64rpx;
+			height: 64rpx;
+
+			.iconfont {
+				font-size: 38rpx;
+			}
+		}
+
+		.username {
+			font-size: 30rpx;
+		}
+	}
+
+	.store-info {
+
+		.item-icon {
+			width: 40rpx;
+			height: 40rpx;
+
+			.iconfont {
+				font-size: 28rpx;
+			}
+
+			.item-icon {
+				top: 0;
+				left: 0;
+				opacity: 0.1;
+			}
+		}
+	}
+
+
+
+	.item-child {
+		.bell-tag {
+			top: 0;
+			left: 0;
+			width: 120rpx;
+			height: 40rpx;
+			border-radius: 16rpx 0 16rpx 0;
+		}
+
+		.grayscale {
+
+			.c-title,
+			.c-warning {
+				color: #999;
+			}
+		}
+
+		.cover {
+			width: 155rpx;
+			height: 155rpx;
+		}
+
+		.refund-img {
+			width: 196rpx;
+			height: 196rpx;
+		}
+
+		.refund-img:nth-child(3n) {
+			margin-right: 0
+		}
+	}
+
+	.item-textarea {
+		width: 570rpx;
+		height: 300rpx;
+	}
+
+	.menu-list {
+		margin-top: -30rpx;
+
+		.menu-title {
+			height: 90rpx;
+
+			.iconfont {
+				font-size: 24rpx;
+			}
+		}
+
+		.menu-line {
+			width: 80%;
+			top: 76rpx;
+			left: 10%;
+		}
+
+		.item-child {
+			width: 20%;
+			margin: 10rpx 0;
+
+			.item-img {
+				width: 72rpx;
+				height: 72rpx;
+				z-index: 9;
+				border: 1px solid #666;
+
+				.iconfont {
+					font-size: 40rpx;
+				}
+			}
+		}
+
+	}
+
+	.add-bell {
+		.menu-line {
+			width: 70%;
+			top: 76rpx;
+			left: 15%;
+		}
+
+		.item-child {
+			width: 33.33%;
+		}
+
+	}
+
+	.order-agent-info {
+		color: #4A4A4A;
+
+		.coach-img {
+			width: 94rpx;
+			height: 94rpx;
+		}
+
+		.title {
+			width: 200rpx;
+			font-weight: bold;
+		}
+
+		.text {
+			color: #777;
+			font-size: 26rpx;
+		}
+	}
+
+	.copy-btn {
+		width: 60rpx;
+		height: 32rpx;
+		border: 1rpx solid #fff;
+		transform: rotateZ(360deg);
+	}
+
+	.copy-btn.fill {
+		color: 333;
+		borderColor: #eee;
+		background: #eee;
+		padding: 2rpx 6rpx;
+	}
+
+	.copy-btn.span {
+		padding: 2rpx 6rpx;
+	}
+
+	.footer-info {
+
+		bottom: 0;
+
+		.item-btn {
+			min-width: 150rpx;
+			height: 64rpx;
+			padding: 0 10rpx;
+			background: #EEEEEE;
+		}
+
+	}
+
+}
+
+
+/* 申请表单相关页面 */
+.apply-pages {
+	.apply-form {
+
+		.item-text {
+			width: 200rpx;
+			height: 30rpx;
+			line-height: 30rpx;
+			font-size: 30rpx;
+			color: #1F1F1F;
+		}
+
+		.item-input {
+			min-height: 30rpx;
+			line-height: 30rpx;
+			padding: 25rpx 0;
+			font-size: 26rpx;
+			color: #A9A9A9;
+		}
+
+		.item-input.text {
+			padding: 30rpx 0;
+		}
+
+		.item-textarea {
+			width: 630rpx;
+			height: 400rpx;
+			color: #A9A9A9;
+		}
+
+		.icon-switch,
+		.icon-switch-on {
+			font-size: 90rpx;
+			line-height: 46rpx;
+		}
+	}
+}
+
+/* 储值明细记录 */
+.stored-record-pages {
+	.list-time {
+		z-index: 99999;
+
+		.item-child {
+			width: 50%;
+			height: 95rpx;
+
+			.iconfont {
+				font-size: 28rpx;
+			}
+		}
+	}
+
+	movable-area,
+	movable-view {
+		width: 686rpx;
+		height: 148rpx;
+		overflow: hidden;
+	}
+
+	.touch-item {
+		font-size: 14px;
+		display: flex;
+		justify-content: space-between;
+		width: 686rpx;
+		height: 100%;
+		overflow: hidden
+	}
+
+	.content {
+		width: 100%;
+		-webkit-transition: all 0.4s;
+		transition: all 0.4s;
+		-webkit-transform: translateX(270rpx);
+		transform: translateX(270rpx);
+		margin-left: -270rpx;
+	}
+
+	.delete-btn {
+		width: 120rpx;
+		height: 100%;
+		color: #fff;
+		border-radius: 0 15rpx 15rpx 0;
+		-webkit-transform: translateX(270rpx);
+		transform: translateX(270rpx);
+		-webkit-transition: all 0.4s;
+		transition: all 0.4s;
+	}
+
+	.touch-move-active .content,
+	.touch-move-active .delete-btn {
+		-webkit-transform: translateX(0);
+		transform: translateX(0);
+	}
+
+	.popup-choose-time {
+		.item-child {
+			width: 50%;
+		}
+	}
+}
+
+.container {
+	width: 100%;
+}
+
+/* 技-师等级 */
+.technician-level {
+	height: 333rpx;
+	background: linear-gradient(206deg, #464749 0%, #020202 30%, #000000 100%);
+	border-radius: 16rpx;
+	transform: rotateZ(360deg);
+	overflow: hidden;
+
+	.icon-level-icon {
+		font-size: 505rpx;
+		top: -86rpx;
+		left: 40rpx;
+		z-index: -1;
+	}
+
+	.level-icon-img {
+		top: 22rpx;
+		right: 41rpx;
+		width: 111rpx;
+		height: 111rpx;
+	}
+
+	.level-title {
+		font-size: 38rpx;
+		color: #F9F9F9;
+	}
+
+	.level-line {
+		width: 100%;
+		height: 20rpx;
+		background: #2D333C;
+	}
+
+	.level-line.cur {
+		top: 0;
+		left: 0;
+	}
+
+	.f-icontext {
+		color: rgba(255, 255, 255, 0.7);
+	}
+}
\ No newline at end of file
diff --git a/styles/popup.wxss b/styles/popup.wxss
new file mode 100644
index 0000000..9bfac09
--- /dev/null
+++ b/styles/popup.wxss
@@ -0,0 +1,72 @@
+.common-popup-content {
+	width: 620rpx;
+	height: auto;
+	padding: 50rpx;
+	display: flex;
+	align-items: center;
+	justify-content: center;
+	flex-direction: column;
+
+	.title {
+		font-size: 40rpx;
+		font-family: Microsoft YaHei;
+		font-weight: bold;
+		color: #333;
+	}
+
+	.desc,
+	.name {
+		font-size: 24rpx;
+		font-family: Microsoft YaHei;
+		font-weight: 400;
+		color: #666;
+		margin-top: 5rpx;
+	}
+
+	.name {
+		color: #999;
+		margin-top: 15rpx;
+	}
+
+	.image {
+		width: 200rpx;
+		height: 200rpx;
+		border-radius: 15rpx;
+		margin-top: 40rpx;
+	}
+
+	.image.middle {
+		width: 300rpx;
+		height: 300rpx;
+	}
+
+	.input {
+		width: 480rpx;
+		height: 110rpx;
+		background: #F7F7F7;
+	}
+	.textarea {
+		width: 480rpx;
+		height: 300rpx;
+		background: #F7F7F7;
+	}
+
+	.button {
+		display: flex;
+		align-items: center;
+		justify-content: center;
+		margin-top: 50rpx;
+
+		.item-child {
+			width: 240rpx;
+			height: 90rpx;
+			color: #666;
+			background: #EEEEEE;
+			border-radius: 45rpx;
+			margin: 0 20rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+		}
+	}
+}
diff --git a/technician/pages/apply.vue b/technician/pages/apply.vue
new file mode 100644
index 0000000..fc5b116
--- /dev/null
+++ b/technician/pages/apply.vue
@@ -0,0 +1,704 @@
+<template>
+	<view class="apply-pages" v-if="isLoad">
+
+		<view class="page-height"
+			v-if="(options.admin_id && coach_status != -1)  || (!options.admin_id && [1,2,3].includes(coach_status))">
+			<abnor percent="150%" @confirm="confirm" @cancel="$util.goUrl({url:`/pages/mine`,openType: `reLaunch`})"
+				:title="title[coach_status]" :tip="tipArr[coach_status]" :button="buttonArr[coach_status]"
+				:image="image[coach_status]" :tipMax="coach_status == 4? '690rpx':''"></abnor>
+		</view>
+
+		<block v-else>
+
+			<view class="apply-info-box rel" :style="{background:primaryColor}">
+				<image class="bg-1 abs" src="https://lbqny.migugu.com/admin/anmo/apply/bg-1.png">
+				</image>
+				<image class="bg-2 abs" src="https://lbqny.migugu.com/admin/anmo/apply/bg-2.png">
+				</image>
+				<view class="technician-money flex-center f-md-title c-title text-bold abs">{{max_level || 0}}</view>
+				<image class="join-us abs" src="https://lbqny.migugu.com/admin/anmo/apply/join-us.png">
+				</image>
+				<view class="join-us pd-lg abs" style="z-index: 3;">
+					<view style="height:90rpx"></view>
+					<view class="f-title c-title text-bold">您的姓名</view>
+					<input v-model="form.coach_name" type="text"
+						class="item-input fill-base f-mini-title c-title mt-sm pl-lg pr-lg radius-10" maxlength="20"
+						placeholder-class="c-caption" :placeholder="rule[0].errorMsg"
+						:style="{borderColor:primaryColor}" />
+					<view class="mt-md f-title c-title text-bold">您的性别</view>
+					<view class="flex-y-center mt-sm">
+						<view @tap.stop="form.sex = index" class="flex-y-center f-mini-title c-title"
+							:style="{color:form.sex == index ? primaryColor:'',marginRight:index===0?'80rpx':''}"
+							v-for="(item,index) in ['男','女']" :key="index"><i class="iconfont mr-sm"
+								:class="[{'icon-xuanze':form.sex != index},{'icon-radio-fill':form.sex == index}]"></i>{{item}}
+						</view>
+					</view>
+					<view class="mt-md f-title c-title text-bold">您的生日</view>
+					<view class="item-input fill-base text f-mini-title c-title mt-sm pl-lg pr-md radius-10"
+						:style="{borderColor:primaryColor}">
+						<picker @change="pickerChange($event,'birthday')" mode="date" :end="endYear"
+							:value="form.birthday">
+							<view class="flex-between">
+								<view class="max-400 ellipsis">{{form.birthday||'请选择'}}</view>
+								<i class="iconfont icon-right ml-sm" style="font-size: 28rpx;"></i>
+							</view>
+						</picker>
+					</view>
+					<view class="mt-md f-title c-title text-bold">手机号</view>
+					<view class="item-input fill-base f-mini-title c-title mt-sm pl-lg pr-lg radius-10"
+						style="height:auto;min-height:82rpx" :style="{borderColor:primaryColor}">
+						<input v-model="form.mobile" type="text" maxlength="11" placeholder-class="c-caption"
+							:placeholder="rule[2].errorMsg" style="margin-top: 15rpx;" />
+						<view class="flex-between" v-if="configInfo.short_code_status">
+							<input v-model="form.short_code" type="text" maxlength="6" placeholder-class="c-caption"
+								placeholder="请输入验证码" :style="{borderColor:primaryColor}" />
+							<view @tap.stop="toSend" :style="{color:primaryColor}">
+								{{authTime>0?`重新获取(${authTime}s)`:'获取验证码'}}
+							</view>
+						</view>
+					</view>
+					<view class="mt-md f-title c-title text-bold">意向工作城市</view>
+					<view class="item-input fill-base text f-mini-title c-title mt-sm pl-lg pr-md radius-10"
+						:style="{borderColor:primaryColor}">
+						<picker @change="pickerChange($event,'city')" :value="cityIndex" :range="cityList"
+							range-key="title">
+							<view class="flex-between">
+								<view class="max-400 ellipsis">{{cityIndex!=-1?cityList[cityIndex].title:'请选择'}}</view>
+								<i class="iconfont icon-right ml-sm" style="font-size: 28rpx;"></i>
+							</view>
+						</picker>
+					</view>
+					<!-- <block v-if="configInfo.plugAuth.store && form.admin_id">
+						<view class="mt-md f-title c-title text-bold">挂靠门店</view>
+						<view class="item-input fill-base text f-mini-title c-title mt-sm pl-lg pr-md radius-10"
+							:style="{borderColor:primaryColor}">
+							<picker @change="pickerChange($event,'store')" :value="storeIndex" :range="storeList"
+								range-key="title">
+								<view class="flex-between">
+									<view class="max-400 ellipsis">{{storeIndex!=-1?storeList[storeIndex].title:'请选择'}}
+									</view>
+									<i class="iconfont icon-right ml-sm" style="font-size: 28rpx;"></i>
+								</view>
+							</picker>
+						</view>
+					</block> -->
+					<view class="flex-y-baseline mt-md">
+						<view class="f-title c-title text-bold">工作形象照</view>
+						<view class="f-caption c-caption ml-sm">图片建议尺寸: 750 * 750</view>
+					</view>
+					<view class="f-caption c-caption mt-sm">请上传本人近期照片，图片大小不超过10M</view>
+					<view class="flex-between mt-sm">
+						<upload @upload="imgUpload" :imagelist="form.work_img" imgtype="work_img" text="上传图片"
+							:imgsize="1" imgclass="apply">
+						</upload>
+					</view>
+				</view>
+				<view class="flex-center f-caption c-title abs" style="width:100%;top:1842rpx;left:0;">
+					平台不会通过任何渠道泄露您的个人信息，请放心输入
+				</view>
+				<image @tap.stop="submit" class="submit abs" src="https://lbqny.migugu.com/admin/anmo/apply/submit.png">
+				</image>
+			</view>
+		</block>
+	</view>
+</template>
+
+<script>
+	import wPicker from "@/components/w-picker/w-picker.vue";
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {
+			wPicker
+		},
+		data() {
+			return {
+				isLoad: false,
+				options: {},
+				cityList: [],
+				cityIndex: -1,
+				storeList: [],
+				storeIndex: 0,
+				// -1未申请，1审核中，2审核通过，3取消授权，4审核失败(可再次申请)
+				tipArr: {
+					'1': [{
+						text: '审核成功后将直接入驻平台',
+						color: 0
+					}],
+					'2': [{
+						text: '恭喜您，审核通过！',
+						color: 0
+					}, {
+						text: '快去管理订单吧',
+						color: 0
+					}],
+					'3': [{
+						text: '平台管理员已取消授权',
+						color: 0
+					}],
+					'4': [{
+						text: '请联系平台管理人员询问原因',
+						color: 0
+					}]
+				},
+				buttonArr: {
+					'1': [{
+						text: '个人中心',
+						type: 'cancel'
+					}],
+					'2': [{
+						text: '去管理',
+						type: 'confirm'
+					}],
+					'3': [{
+						text: '个人中心',
+						type: 'cancel'
+					}],
+					'4': [{
+						text: '再次申请',
+						type: 'confirm'
+					}, {
+						text: '个人中心',
+						type: 'cancel'
+					}]
+				},
+				title: {
+					'1': '等待审核',
+					'2': '您已经是' + this.$t('action.attendantName') + '了',
+					'3': '取消授权',
+					'4': '申请失败',
+				},
+				image: {
+					'1': 'https://lbqny.migugu.com/admin/public/apply_wait.jpg',
+					'2': 'https://lbqny.migugu.com/admin/public/apply_suc.jpg',
+					'3': 'https://lbqny.migugu.com/admin/public/apply_fail.jpg',
+					'4': 'https://lbqny.migugu.com/admin/public/apply_fail.jpg',
+				},
+				coach_status: -1,
+				max_level: 0,
+				authTime: 0,
+				timer: null,
+				form: {
+					id: 0,
+					admin_id: 0,
+					partner_id: 0,
+					coach_name: '', //姓名 
+					mobile: '', //手机号 
+					short_code: '',
+					sex: 0, //性别 
+					birthday: '',
+					work_time: '', //从业年份 
+					city_id: '', //城市 
+					store_id: '', //门店
+					lng: '',
+					lat: '',
+					address: '', //详细地址 
+					text: '', //备注 
+					id_code: '', //身份证号
+					id_card: [], //身份证
+					license: [], //资格证书
+					work_img: [], // 工作照
+					self_img: [], // 生活照
+					video: []
+				},
+				rule: [{
+						name: "coach_name",
+						checkType: "isNotNull",
+						errorMsg: "输入您的姓名",
+						regType: 2
+					}, {
+						name: "birthday",
+						checkType: "isNotNull",
+						errorMsg: "请选择您的生日",
+						regType: 2
+					},
+					{
+						name: "mobile",
+						checkType: "isMobile",
+						errorMsg: "输入手机号"
+					}, {
+						name: "city_id",
+						checkType: "isNotNull",
+						errorMsg: "请选择意向工作城市"
+					},
+					{
+						name: "work_img",
+						checkType: "isNotNull",
+						errorMsg: "请上传工作形象照"
+					}
+				],
+				lockTap: false
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+			location: state => state.user.location,
+		}),
+		async onLoad(options) {
+			let {
+				admin_id = 0,
+					partner_id = 0,
+			} = options
+			options = admin_id || partner_id ? await this.updateCommonOptions(options) : options
+			this.options = options
+			this.form.admin_id = admin_id
+			this.form.partner_id = partner_id
+			this.$util.showLoading()
+			await this.initIndex()
+			let {
+				coach_status
+			} = this
+			uni.setNavigationBarTitle({
+				title: coach_status == -1 ? `申请` + this.$t(
+					'action.attendantName') : ''
+			})
+			this.isLoad = true
+		},
+		onUnload() {
+			if (this.timer) clearInterval(this.timer)
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getUserInfo', 'updateCommonOptions']),
+			...mapMutations(['updateUserItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				if (!this.configInfo.id || !this.configInfo.hasOwnProperty(
+						'plugAuth') || (this.configInfo.hasOwnProperty(
+						'plugAuth') && !this.configInfo.plugAuth.hasOwnProperty(
+						'store')) || refresh) {
+					await this.getConfigInfo()
+				}
+				await this.getCityList()
+
+				let [data] = await Promise.all([this.$api.technician.coachInfo(), this.getStoreList()])
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				this.max_level = data.max_level
+				if (data && !data.id) {
+					this.$util.hideAll()
+					return
+				}
+				let imgArr = ['id_card', 'license', 'self_img']
+				imgArr.map(item => {
+					data[item] = data[item] && data[item].length > 0 ? data[item].map(aitem => {
+						return {
+							path: aitem
+						}
+					}) : []
+				})
+				if (data.id_card && data.id_card.length > 1) {
+					data.id_card_fan = [data.id_card[1]]
+					data.id_card_people = [data.id_card[2]]
+					data.id_card.splice(1, 3)
+				}
+				let imgArrs = ['work_img', 'video']
+				imgArrs.map(item => {
+					data[item] = data[item] && data[item].length > 0 ? [{
+						path: data[item]
+					}] : []
+				})
+				data.birthday = data.birthday ? this.$util.formatTime(data.birthday * 1000, 'YY-M-D') : ''
+				let {
+					admin_id = 0,
+						partner_id = 0,
+				} = this.options
+				if (admin_id) {
+					data.admin_id = admin_id
+				}
+				if (partner_id) {
+					data.partner_id = partner_id
+				}
+
+				for (let key in this.form) {
+					this.form[key] = data[key]
+				}
+				let {
+					city_id,
+					store_id,
+					status,
+					sh_text
+				} = data
+				this.cityIndex = this.cityList.findIndex(item => {
+					return item.id == city_id
+				})
+				this.storeIndex = this.storeList.findIndex(item => {
+					return item.id == store_id
+				})
+				this.coach_status = !admin_id && status == 4 ? -1 : status
+				if (status == 4 && sh_text) {
+					this.tipArr[4][0].text = sh_text
+				}
+				this.$util.hideAll()
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			async getCityList() {
+				let {
+					location
+				} = this
+				if (!location.lat) {
+					// #ifdef H5
+					if (this.$jweixin.isWechat()) {
+						this.$util.showLoading()
+						// await this.$jweixin.initJssdk();
+						await this.$jweixin.wxReady2();
+						let {
+							latitude: lat = 0,
+							longitude: lng = 0
+						} = await this.$jweixin.getWxLocation()
+						location = {
+							lng,
+							lat,
+							address: '定位失败',
+							province: '',
+							city: '',
+							district: ''
+						}
+						if (lat && lng) {
+							let key = `${lat},${lng}`
+							let data = await this.$api.base.getMapInfo({
+								location: key
+							})
+							let {
+								status,
+								result
+							} = JSON.parse(data)
+							if (status == 0) {
+								let {
+									address,
+									address_component
+								} = result
+								let {
+									province,
+									city,
+									district
+								} = address_component
+								location = {
+									lng,
+									lat,
+									address,
+									province,
+									city,
+									district
+								}
+							}
+						}
+					}
+					// #endif
+					// #ifndef H5
+					location = await this.$util.getBmapLocation()
+					// #endif
+
+					this.updateUserItem({
+						key: 'location',
+						val: location
+					})
+				}
+
+				let {
+					lng = 0,
+						lat = 0
+				} = location
+				if (lat && lng) {
+					let city = await this.$api.base.getCity({
+						lng,
+						lat
+					})
+					this.$util.hideAll()
+					this.cityList = city
+					this.form.city_id = city.length > 0 ? city[0].id : 0
+				}
+			},
+			async getStoreList() {
+				let {
+					admin_id = 0
+				} = this.form
+				if (!admin_id) return
+				let data = await this.$api.mine.getStoreSelect({
+					admin_id
+				})
+				data.unshift({
+					id: 0,
+					title: '不挂靠门店'
+				})
+				this.storeList = data
+			},
+			pickerChange(e, key) {
+				let ind = e.target.value
+				if (key === 'birthday') {
+					let unix = this.$util.DateToUnix(ind)
+					if (unix > new Date(Math.ceil(new Date().getTime())) / 1000) {
+						this.$util.showToast({
+							title: `不能选择未来时间哦`
+						})
+						return
+					}
+					this.form[key] = ind
+					return
+				}
+				this[`${key}Index`] = ind
+				this.form[`${key}_id`] = this[`${key}List`][ind].id
+			},
+			// 发送验证码
+			async toSend() {
+				let {
+					authTime
+				} = this
+				if (authTime) return
+				let {
+					mobile = ''
+				} = this.form
+				if (mobile == null || !/^(1[0-9]{10})$/.test(mobile)) {
+					this.$util.showToast({
+						title: mobile == null ? `请输入手机号` : `${mobile} 手机号无效`
+					});
+					return;
+				}
+				if (this.lockTap) return
+				this.lockTap = true
+				this.$util.showLoading()
+				try {
+					await this.$api.user.sendShortMsg({
+						phone: mobile
+					})
+					this.$util.hideAll()
+					this.lockTap = false
+					let time = 60
+					this.timer = setInterval(() => {
+						if (time === 0) {
+							clearInterval(this.timer)
+							return
+						}
+						time--
+						this.authTime = time
+					}, 1000)
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+			},
+			imgUpload(e) {
+				let {
+					imagelist,
+					imgtype
+				} = e;
+				this.form[imgtype] = imagelist;
+			},
+			// 选择地区
+			async toChooseLocation(e) {
+				await this.$util.checkAuth({
+					type: 'userLocation'
+				})
+				let {
+					lat: locaLat = '',
+					lng: locaLng = ''
+				} = this.location
+				let {
+					id = 0,
+						lat: addrLat,
+						lng: addrLng
+				} = this.form
+
+				if (id) {
+					locaLat = addrLat
+					locaLng = addrLng
+				}
+
+				let param = {}
+				if (!locaLat && !locaLng) {
+					// #ifdef H5
+					if (this.$jweixin.isWechat()) {
+						this.$util.showLoading()
+						await this.$jweixin.wxReady2();
+						let {
+							latitude,
+							longitude
+						} = await this.$jweixin.getWxLocation()
+						locaLat = latitude
+						locaLng = longitude
+					}
+					// #endif
+					// #ifdef APP-PLUS
+					let location = await this.$util.getBmapLocation()
+					locaLat = location.lat
+					locaLng = location.lng
+					// #endif
+				}
+
+				// #ifndef MP-WEIXIN
+				param = {
+					latitude: locaLat,
+					longitude: locaLng
+				}
+				// #endif
+
+				let [, {
+					address = '',
+					longitude,
+					latitude
+				}] = await uni.chooseLocation(param);
+				if (!address) return
+				this.form.address = address
+				this.form.lng = longitude
+				this.form.lat = latitude
+			},
+			// 去管理/再次申请
+			async confirm() {
+				let {
+					coach_status
+				} = this
+				if (coach_status == 4) {
+					this.coach_status = -1
+					uni.setNavigationBarTitle({
+						title: this.$t('action.attendantName')
+					})
+					return
+				}
+				this.$util.goUrl({
+					url: `/pages/mine?type=2`,
+					openType: `reLaunch`
+				})
+			},
+			//表单验证
+			validate(param) {
+				let validate = new this.$util.Validate();
+				this.rule.map(item => {
+					let {
+						name,
+					} = item
+					validate.add(param[name], item);
+				})
+				let message = validate.start();
+				return message;
+			},
+			async submit() {
+				let param = this.$util.deepCopy(this.form)
+				param.work_img = param.work_img.length > 0 ? param.work_img[0].path : ''
+				let msg = this.validate(param);
+				if (msg) {
+					this.$util.showToast({
+						title: msg
+					});
+					return;
+				}
+				let {
+					short_code_status
+				} = this.configInfo
+				if (short_code_status && (param.short_code == null || param.short_code.length != 6)) {
+					this.$util.showToast({
+						title: `请输入6位数短信验证码`
+					})
+					return
+				}
+				if (!short_code_status) {
+					delete param.short_code
+				}
+				param.birthday = this.$util.DateToUnix(param.birthday)
+				if (this.lockTap) return
+				this.lockTap = true
+				this.$util.showLoading()
+				try {
+					await this.$api.technician.coachApply(param)
+					this.$util.hideAll()
+					this.$util.showToast({
+						title: `提交成功，即将跳转个人中心`,
+					})
+					if (this.timer) {
+						clearInterval(this.timer)
+					}
+					setTimeout(() => {
+						if (getCurrentPages().length > 1) {
+							this.$util.back()
+						}
+						this.$util.goUrl({
+							url: '/pages/mine',
+							openType: `reLaunch`
+						})
+					}, 2000)
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.apply-info-box {
+		width: 100%;
+		height: 2050rpx;
+
+		.bg-1 {
+			width: 750rpx;
+			height: 1999rpx;
+			top: 0;
+			left: 0;
+			z-index: 1;
+		}
+
+		.bg-2 {
+			width: 750rpx;
+			height: 620rpx;
+			top: 30rpx;
+			z-index: 2;
+		}
+
+		.technician-money {
+			width: 45rpx;
+			top: 355rpx;
+			left: 460rpx;
+			z-index: 3;
+		}
+
+		.join-us {
+			width: 668rpx;
+			height: 1351rpx;
+			top: 468rpx;
+			left: 44rpx;
+			z-index: 2;
+
+			.item-input {
+				height: 74rpx;
+				border: 4rpx solid #069F5E;
+
+				.flex-between {
+					height: 74rpx;
+				}
+			}
+
+			.item-input.text {
+				height: 82rpx;
+			}
+		}
+
+		.submit {
+			width: 662rpx;
+			height: 93rpx;
+			top: 1900rpx;
+			left: 47rpx;
+			z-index: 2;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/technician/pages/bad-comments/box.vue b/technician/pages/bad-comments/box.vue
new file mode 100644
index 0000000..ef458d8
--- /dev/null
+++ b/technician/pages/bad-comments/box.vue
@@ -0,0 +1,159 @@
+<template>
+	<view class="box ">
+		<view class="pl-lg pr-lg">
+			<view class="box-item">
+				<view class="box-item-title f-paragraph pb-lg text-bold flex">
+					<text class="c-warning f-sm-title">*</text>
+					<text>选择关联订单</text>
+				</view>
+				<view class="fill-body radius-16"
+					@tap="$util.goUrl({url:`/technician/pages/bad-comments/choice?id=${orderInfo.id || 0}`})">
+					<view class="ml-lg mr-lg f-mini-title flex-between box-item-cont" :class="orderInfo.id && 'b-1px-b'">
+						<text class="c-5A677E">关联订单</text>
+						<view class="flex-y-center">
+							<text class="pr-md">{{ orderInfo.id ? '重新选择':'请选择'}}</text>
+							<i class="iconfont icon-right text-bold"></i>
+						</view>
+					</view>
+					<blcok v-if="orderInfo.id">
+						<view class="flex-y-center pt-lg pl-md pr-md pb-lg"
+							v-for="(item,index) in orderInfo.order_goods" :key="index">
+							<image mode="aspectFill" class="item-image radius-16" :src="item.goods_cover"></image>
+							<view class="pl-md">
+								<view class="f-mini-title text-bold">{{item.goods_name}}</view>
+								<view class="c-caption f-caption pt-md pb-md">
+									<text class="pr-md">预约时间</text>
+									<text>{{orderInfo.start_time}}</text>
+								</view>
+								<view class="flex-y-center c-warning" style="line-height: 1;">
+									<text class="text-bold f-icontext">¥</text>
+									<text class="f-sm-title text-bold">{{item.true_price}}</text>
+								</view>
+							</view>
+						</view>
+					</blcok>
+				</view>
+			</view>
+			<view class="box-item pt-md">
+				<view class="box-item-title f-paragraph pb-lg text-bold flex">
+					<text class="c-warning f-sm-title">*</text>
+					<text>申诉理由</text>
+				</view>
+				<view class="pd-lg radius-16 fill-body" style="overflow: hidden;">
+					<textarea class="c-paragraph" @input="bindInput" style="width: 100%;" cols="30" rows="10"
+						placeholder="请输入申诉理由" :value="content" maxlength="1000"></textarea>
+					<view class="pt-md text-right c-5A677E f-paragraph">
+						{{content.length > 1000 ? 1000 : content.length}} / 1000
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="space-max-footer"></view>
+
+		<fix-bottom-button @cancel="$util.goUrl({url:`/technician/pages/bad-comments/list`})" @confirm="confirm"
+			:text="[{text:'申诉记录',type:'cancel'},{text:'提交申诉',type:'confirm',isAuth:true}]" bgColor="#fff"
+			:classType="2">
+		</fix-bottom-button>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		data() {
+			return {
+				orderInfo: {},
+				content: ''
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad() {
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+			this.initIndex()
+		},
+		methods: {
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+			},
+			bindInput(e) {
+				this.$nextTick(function() {
+					this.content = e.detail.value;
+				})
+			},
+			confirm() {
+				let {
+					content,
+					orderInfo
+				} = this
+				if (!content.trim()) {
+					return this.$util.showToast({
+						title: '请输入申诉理由'
+					})
+				}
+				if (!orderInfo.id) {
+					return this.$util.showToast({
+						title: '请选择关联订单'
+					})
+				}
+				this.$util.showLoading()
+				this.$api.technician.addAppeal({
+					content,
+					order_code: orderInfo.order_code
+				}).then(res => {
+					//this.$util.showToast({title: '提交成功'})
+					//setTimeout(()=>{this.$util.goUrl({url:1,openType:`navigateBack`})},1500)
+					this.$util.hideAll()
+					this.$util.goUrl({
+						openType: 'redirectTo',
+						url: `/technician/pages/bad-comments/success`
+					})
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background-color: #fff;
+	}
+
+	.box-item {
+		.box-item-title {
+			padding-top: 40rpx;
+		}
+
+		.box-item-cont {
+			min-height: 110rpx;
+		}
+
+		.c-5A677E {
+			color: #5A677E;
+		}
+
+		.item-image {
+			width: 155rpx;
+			height: 155rpx;
+			overflow: hidden;
+			vertical-align: bottom;
+		}
+	}
+</style>
diff --git a/technician/pages/bad-comments/choice.vue b/technician/pages/bad-comments/choice.vue
new file mode 100644
index 0000000..50fdd89
--- /dev/null
+++ b/technician/pages/bad-comments/choice.vue
@@ -0,0 +1,232 @@
+<template>
+	<view class="order" v-if="isLoad">
+		<fixed>
+			<view class="fare-top rel">
+				<view class="abs fare-top-bgcolor" :style="{backgroundColor:primaryColor}"></view>
+				<view class="pl-lg pr-lg fill-base flex flex-y-center fare-search box-shadow">
+					<search class="flex-1" @input="toSearch" type="input" :confirmSearch="false" :padding="0"
+						:radius="30" placeholder="输入服务名称或订单号"></search>
+				</view>
+			</view>
+		</fixed>
+		<view class="order-list pd-md">
+			<block v-for="(item,index) in list.data" :key="index">
+				<view class="order-item fill-base pl-lg pr-lg pb-lg radius-16 mb-md" @tap="setOrderState(index)">
+					<view class="order-item-title b-1px-b flex-y-center">
+						<view v-if="current == index" class="icon-radio-fill iconfont" style="font-size: 20px;"
+							:style="{color:primaryColor}"></view>
+						<view v-else class="icon-xuanze iconfont" style="font-size: 20px;color: #BEC3CE;"></view>
+
+						<view class="f-paragraph c-paragraph pl-md">订单号 {{item.order_code}}</view>
+					</view>
+					<view class="flex-y-center pt-md" v-for="(citem,cindex) in item.order_goods" :key="cindex">
+						<image mode="aspectFill" class="item-image radius-16" :src="citem.goods_cover"></image>
+						<view class="pl-md">
+							<view class="f-mini-title text-bold">{{citem.goods_name}}</view>
+							<view class="c-caption f-caption pt-md pb-md">
+								<text class="pr-md">预约时间</text>
+								<text>{{item.start_time}}</text>
+							</view>
+							<view class="flex-y-center c-warning" style="line-height: 1;">
+								<text class="text-bold f-icontext">¥</text>
+								<text class="f-sm-title text-bold">{{citem.true_price}}</text>
+							</view>
+						</view>
+					</view>
+				</view>
+			</block>
+		</view>
+		
+		<view class="space-max-footer"></view>
+
+		<fix-bottom-button @cancel="$util.goUrl({url:1,openType:`navigateBack`})" @confirm="confirm"
+			:text="[{text:'关闭',type:'cancel'},{text:'确定',type:'confirm'}]" bgColor="#fff" :classType="2">
+		</fix-bottom-button>
+	</view>
+</template>
+
+<script>
+	let play = null
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		data() {
+			return {
+				loading: true,
+				isLoad: false,
+				current: -1,
+				param: {
+					page: 1,
+					limit: 10
+				},
+				list: {
+					data: []
+				},
+				id: 0
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad(options) {
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+			this.id = options.id
+			this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList()
+		},
+		methods: {
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				this.getList();
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			async getList() {
+				this.$util.showLoading()
+				let {
+					id = 0,
+						list: oldList,
+						param
+				} = this
+				let newList = await this.$api.technician.appealOrder(param)
+				newList.data.map((item, index) => {
+					if (item.id == id) {
+						this.current = index
+					}
+				})
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.isLoad = true
+				this.loading = false
+				this.$util.hideAll()
+			},
+			toSearch(val) {
+				play = setTimeout(() => {
+					this.param.name = val
+					this.current = -1
+					this.initRefresh()
+				}, 1000)
+			},
+			setOrderState(index) {
+				this.current = index
+			},
+			confirm() {
+				let {
+					current = -1
+				} = this
+				if (current == -1) {
+					this.$util.showToast({
+						title: `请选择订单`
+					})
+					return
+				}
+				this.$util.getPage(-1).orderInfo = this.list.data[current]
+				this.$util.goUrl({
+					url: 1,
+					openType: `navigateBack`
+				})
+			},
+		},
+	}
+</script>
+
+<style lang="scss">
+	.order {
+		.fare-top {
+			padding-top: 10rpx;
+
+			.fare-top-bgcolor {
+				height: 60rpx;
+				top: 0;
+				left: 0;
+				width: 100%;
+				z-index: -1;
+			}
+		}
+
+		.fare-search {
+			height: 130rpx;
+			border-radius: 40rpx;
+			overflow: hidden;
+			margin-bottom: -2rpx;
+
+			.fare-top-time {
+				width: 70rpx;
+				height: 70rpx;
+
+				.fare-top-bg {
+					width: 70rpx;
+					height: 70rpx;
+					border-radius: 70rpx;
+					opacity: 0.1;
+				}
+			}
+		}
+
+		.order-list {
+			.order-item-title {
+				line-height: 95rpx;
+				height: 95rpx;
+			}
+
+			.item-image {
+				width: 155rpx;
+				height: 155rpx;
+				overflow: hidden;
+				vertical-align: bottom;
+			}
+		}
+
+		.box-footer {
+			position: fixed;
+			bottom: 0;
+			width: 100%;
+			left: 0;
+			padding-left: 40rpx;
+			padding-right: 40rpx;
+
+			.btn {
+				height: 90rpx;
+				line-height: 90rpx;
+				border-radius: 90rpx;
+			}
+
+			.btn1 {
+				border: 1px solid #ccc;
+			}
+		}
+	}
+</style>
diff --git a/technician/pages/bad-comments/list.vue b/technician/pages/bad-comments/list.vue
new file mode 100644
index 0000000..95f2758
--- /dev/null
+++ b/technician/pages/bad-comments/list.vue
@@ -0,0 +1,147 @@
+<template>
+	<view>
+		<fixed>
+			<tab @change="handerTabChange" :isLine="true" :list="tabList" :activeIndex="activeIndex*1" color="#9D9D9D"
+				:activeColor="primaryColor" :width="100/tabList.length + '%'" height="100rpx" :numberType="2"></tab>
+		</fixed>
+		<view class="pd-md">
+			<view class="pl-lg pr-lg pb-lg fill-base radius-16 mb-md" v-for="(item,index) in list.data" :key="index">
+				<view class="item-nav flex-between ">
+					<text class="f-paragraph text-bold">订单号 {{item.order_code}}</text>
+					<text :style="{color:primaryColor}" v-if="item.status == 1">未处理</text>
+					<text class="c-caption" v-else>已处理</text>
+				</view>
+				<view class="item-cont radius-16 pd-lg">
+					<view class="f-paragraph text-bold pb-md">申诉理由</view>
+					<view class="c-paragraph ellipsis-2" style="white-space: pre-wrap;">{{item.content}}</view>
+				</view>
+				<view v-if="item.status == 2">
+					<view class="f-paragraph text-bold pb-md pt-lg">处理结果</view>
+					<view class="c-paragraph" style="white-space: pre-wrap;">{{item.reply_content || '无'}}</view>
+				</view>
+			</view>
+		</view>
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+		<view class="space-footer"></view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		data() {
+			return {
+				tabList: [{
+					title: '全部反馈',
+					sort: 'top desc',
+					sign: 1,
+				}, {
+					title: '未处理',
+					sort: 'price',
+					sign: 0,
+					number: 0,
+				}, {
+					title: '已处理',
+					sort: 'total_sale',
+					sign: 0,
+				}],
+				activeIndex: 0,
+				loading: true,
+				isLoad: false,
+				param: {
+					page: 1,
+					limit: 10,
+					status: 0
+				},
+				list: {
+					data: []
+				}
+
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad() {
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+			this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				this.getList();
+			},
+			handerTabChange(index) {
+				this.activeIndex = index
+				this.param.status = index
+				this.getList();
+			},
+
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			async getList() {
+				this.$util.showLoading()
+				let {
+					list: oldList,
+					param
+				} = this
+				let newList = await this.$api.technician.appealList(param)
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.tabList[1].number = newList.wait
+				this.isLoad = true
+				this.loading = false
+				this.$util.hideAll()
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.item-nav {
+		height: 96rpx;
+	}
+
+	.item-cont {
+		background-color: #F7F8FA;
+		min-height: 218rpx;
+	}
+</style>
diff --git a/technician/pages/bad-comments/success.vue b/technician/pages/bad-comments/success.vue
new file mode 100644
index 0000000..2fb7c1e
--- /dev/null
+++ b/technician/pages/bad-comments/success.vue
@@ -0,0 +1,65 @@
+<template>
+	<view>
+		<view class="header flex-center pt-md">
+			<image src="https://lbqny.migugu.com/admin/shop/succ.png" mode="aspectFill"></image>
+		</view>
+		<view class="as-box-cont text-bold text-center">提交成功</view>
+		<view class="f-mini-title c-caption text-center pl-lg pr-lg pt-sm">您已经成功提交申请，申诉结果可在申诉记录里查看。</view>
+		<view class="as-btn c-base f-mini-title text-center ml-lg mr-lg" :style="{backgroundColor:primaryColor}"
+		@tap="$util.goUrl({url:`/technician/pages/bad-comments/list`})">查看申诉记录</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		data() {
+			return {}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad() {
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+			this.initIndex()
+		},
+		methods:{
+			async initIndex(refresh = false){
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+			},
+		}
+	}
+</script>
+
+<style>
+	.header image{
+		width: 260rpx;
+		height: 260rpx;
+	}
+	.as-btn{
+		margin-top: 98rpx;
+		height: 84rpx;
+		line-height: 84rpx;
+		border-radius: 84rpx;
+	}
+	.as-box-cont{
+		padding-top: 40rpx;
+		font-size: 46rpx;
+	}
+</style>
diff --git a/technician/pages/car-fare.vue b/technician/pages/car-fare.vue
new file mode 100644
index 0000000..e3f8d6e
--- /dev/null
+++ b/technician/pages/car-fare.vue
@@ -0,0 +1,220 @@
+<template>
+	<view class="fare" v-if="isLoad">
+		<fixed>
+			<view class="fare-top rel">
+				<view class="abs fare-top-bgcolor" :style="{backgroundColor:primaryColor}"></view>
+				<view class="pl-md fill-base flex flex-y-center fare-search box-shadow">
+					<search class="flex-1" @input="toSearch" type="input" :confirmSearch="false" :padding="0"
+						:radius="30" placeholder="输入订单号查询"></search>
+					<view class="rel fare-top-time flex-center ml-md mr-lg" @tap="showDate = true">
+						<view class="fare-top-bg abs" :style="{backgroundColor:primaryColor}"></view>
+						<i class="iconfont iconriqi" :style="{color:primaryColor,fontSize:'18px'}"></i>
+					</view>
+				</view>
+			</view>
+		</fixed>
+		<view class="fare-list pl-md pr-md pt-md">
+			<view class="fill-base radius-16 pl-lg pr-lg mb-md" v-for="(item , index) in list.data" :key="index">
+				<view class="item-top flex-between b-1px-b">
+					<view class="f-paragraph c-paragraph max-450 ellipsis">订单号 {{item.order_code}}</view>
+					<view class="f-paragraph max-200 ellipsis" :style="{color:primaryColor}">
+						{{ item.trip_end_address | addressMatch}}
+					</view>
+				</view>
+				<view class="item-address flex">
+					<view class="item-address-label flex-center c-base" style="background-color: #44A860;">起</view>
+					<view class="c-title f-paragraph flex-1 pl-sm">{{item.trip_start_address}}</view>
+				</view>
+				<view class="pt-md flex">
+					<view class="item-address-label flex-center c-base" style="background-color: #FF8213;">终</view>
+					<view class="c-title f-paragraph flex-1 pl-sm">{{item.trip_end_address}}</view>
+				</view>
+				<view class="pt-lg f-desc c-caption">出发时间 {{item.serout_time}}</view>
+				<view class="pt-sm f-desc c-caption">到达时间 {{item.arrive_time}}</view>
+				<view class="pt-md pb-md"></view>
+				<view class="pt-lg pb-lg b-1px-t ">
+					<view class="f-paragraph flex-y-center">
+						<text>金额</text>
+						<text class="c-caption pl-sm pr-md">(往返车费):</text>
+						<text class="c-warning">{{item.car_price}}元</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		<w-picker mode="range" :startYear="startYear*1-10" :endYear="startYear" :value="toDay" :current="false"
+			fields="day" @confirm="onConfirm($event)" :disabled-after="false" ref="day" :themeColor="primaryColor"
+			:visible.sync="showDate">
+		</w-picker>
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+		<view class="space-footer"></view>
+	</view>
+</template>
+
+<script>
+	let play = null
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		data() {
+			return {
+				startYear: '',
+				showDate: false,
+				toDay: '',
+				loading: true,
+				isLoad: false,
+				list: {
+					data: []
+				},
+				param: {
+					start_time: '',
+					end_time: '',
+					name: '',
+					page: 1
+				}
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad() {
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+			this.toDay = this.$util.formatTime(new Date(), 'YY-M-D')
+			this.startYear = this.$util.formatTime(new Date(), 'YY')
+			this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList()
+		},
+		methods: {
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				this.getList();
+			},
+			toSearch(val) {
+				clearTimeout(play)
+				play = setTimeout(() => {
+					this.param.name = val
+					this.initRefresh()
+				}, 1000)
+			},
+			onConfirm(e) {
+				let start_time = e.value[0]
+				let end_time = e.value[1]
+				this.param.start_time = this.$util.DateToUnix(start_time)
+				this.param.end_time = this.$util.DateToUnix(end_time) + 24 * 3600 - 1
+				this.initRefresh()
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			async getList() {
+				this.$util.showLoading()
+				let {
+					list: oldList,
+					param
+				} = this
+				let newList = await this.$api.technician.carMoneyList(param)
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.isLoad = true
+				this.loading = false
+				this.$util.hideAll()
+			},
+		},
+		filters: {
+			addressMatch(val) {
+				if (!val) return ''
+				var reg = /.+?(省|市|自治区|自治州|县|区)/g;
+				let address = Array.from(val.match(reg))[1]
+				return address
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.fare {
+		.fare-top {
+			padding-top: 10rpx;
+
+			.fare-top-bgcolor {
+				height: 60rpx;
+				top: 0;
+				left: 0;
+				width: 100%;
+				z-index: -1;
+			}
+		}
+
+		.fare-search {
+			height: 130rpx;
+			border-radius: 40rpx;
+			overflow: hidden;
+			margin-bottom: -2rpx;
+
+			.fare-top-time {
+				width: 70rpx;
+				height: 70rpx;
+
+				.fare-top-bg {
+					width: 70rpx;
+					height: 70rpx;
+					border-radius: 70rpx;
+					opacity: 0.1;
+				}
+			}
+		}
+
+		.fare-list {
+			.item-top {
+				line-height: 88rpx;
+				height: 88rpx;
+			}
+
+			.item-address {
+				padding-top: 40rpx;
+			}
+
+			.item-address-label {
+				width: 30rpx;
+				height: 30rpx;
+				border-radius: 30rpx;
+				font-size: 18rpx;
+				margin-top: 6rpx;
+			}
+		}
+
+	}
+</style>
diff --git a/technician/pages/edit.vue b/technician/pages/edit.vue
new file mode 100644
index 0000000..911f566
--- /dev/null
+++ b/technician/pages/edit.vue
@@ -0,0 +1,700 @@
+<template>
+	<view class="apply-pages" v-if="isLoad">
+		<view class="apply-form">
+			<view class="fill-base mt-md radius-16">
+				<view class="flex-between pl-lg pr-lg b-1px-b">
+					<view class="item-text flex-y-center"><i class="iconfont icon-required c-warning"></i>姓名</view>
+					<input v-model="form.coach_name" type="text" class="item-input flex-1" maxlength="20"
+						:placeholder="rule[0].errorMsg" />
+				</view>
+				<view class="flex-between pl-lg pr-lg b-1px-b">
+					<view class="item-text flex-y-center"><i class="iconfont icon-required c-warning"></i>性别</view>
+					<view class="item-input flex-1 flex-y-center">
+						<view @tap.stop="form.sex = index" class="flex-y-center" :class="[{'mr-lg':index==0}]"
+							:style="{color:form.sex == index ? primaryColor:''}" v-for="(item,index) in ['男','女']"
+							:key="index"><i class="iconfont icon-xuanze mr-sm"
+								:class="[{'icon-xuanze-fill':form.sex == index}]"></i>{{item}}
+						</view>
+					</view>
+				</view>
+				<view class="flex-between ml-lg mr-lg b-1px-b">
+					<view class="item-text flex-y-center"><i class="iconfont icon-required c-warning"></i>生日</view>
+					<view class="item-input text flex-1">
+						<picker @change="pickerChange($event,'birthday')" mode="date" :end="endYear"
+							:value="form.birthday">
+							<view class="flex-between">
+								{{form.birthday||'请选择'}}
+								<i class="iconfont icon-right ml-sm" style="font-size: 28rpx;"></i>
+							</view>
+						</picker>
+					</view>
+				</view>
+				<view class="flex-between pl-lg pr-lg b-1px-b">
+					<view class="item-text flex-y-center"><i class="iconfont icon-required c-warning"></i>手机号</view>
+					<input v-model="form.mobile" type="text" class="item-input flex-1" maxlength="11"
+						:placeholder="rule[2].errorMsg" />
+				</view>
+				<view class="flex-between pl-lg pr-lg b-1px-b"
+					v-if="configInfo.short_code_status && form.mobile.length==11 &&form.mobile !== old_phone">
+					<view class="item-text flex-y-center"><i class="iconfont icon-required c-warning"></i>验证码</view>
+					<view class="flex-between">
+						<input v-model="form.short_code" type="text" class="item-input flex-1" maxlength="6"
+							placeholder="请输入验证码" />
+						<view @tap.stop="toSend" :style="{color:primaryColor}">
+							{{authTime>0?`重新获取(${authTime}s)`:'获取验证码'}}
+						</view>
+					</view>
+				</view>
+				<view class="flex-between pl-lg pr-lg b-1px-b">
+					<view class="item-text flex-y-center"><i class="iconfont icon-required c-warning"></i>从业年份</view>
+					<input v-model="form.work_time" type="number" class="item-input flex-1"
+						:placeholder="rule[3].errorMsg" />
+				</view>
+				<view class="flex-between pl-lg pr-lg b-1px-b">
+					<view class="item-text flex-y-center" style="width:230rpx"><i
+							class="iconfont icon-required c-warning"></i>意向工作城市</view>
+					<view class="item-input text flex-1">
+						<picker @change="pickerChange($event,'city')" :value="cityIndex" :range="cityList"
+							range-key="title">
+							<view class="flex-between">
+								{{cityIndex!=-1?cityList[cityIndex].title:'请选择'}}
+								<i class="iconfont icon-right ml-sm" style="font-size: 28rpx;"></i>
+							</view>
+						</picker>
+					</view>
+				</view>
+				<!-- <view class="flex-between pl-lg pr-lg b-1px-b">
+					<view class="item-text flex-y-center" style="width:230rpx"><i
+							class="iconfont icon-required c-warning"></i>出行配置</view>
+					<view class="item-input text flex-1">
+						<view @tap.stop="$util.goUrl({url:`/technician/pages/time-set`})" class="flex-between">
+							<view>{{`点击进行设置`}}</view>
+							<i class="iconfont icon-right ml-sm" style="font-size: 28rpx;"></i>
+						</view>
+					</view>
+				</view> -->
+				<view class="flex-between pl-lg pr-lg b-1px-b" v-if="configInfo.plugAuth.store && form.admin_id">
+					<view class="item-text">挂靠门店</view>
+					<view class="item-input text flex-1">
+						<picker @change="pickerChange($event,'store')" :value="storeIndex" :range="storeList"
+							range-key="title">
+							<view class="flex-between">
+								<view class="max-400 ellipsis">{{storeIndex!=-1?storeList[storeIndex].title:'请选择'}}
+								</view>
+								<i class="iconfont icon-right ml-sm" style="font-size: 28rpx;"></i>
+							</view>
+						</picker>
+					</view>
+				</view>
+				<view class="flex-between pl-lg pr-lg">
+					<view class="item-text flex-y-center"><i class="iconfont icon-required c-warning"></i>所在地址</view>
+					<view class="item-input text flex-1">
+						<view @tap.stop="toChooseLocation" class="flex-between">
+							<view>{{form.address || `点击右边图标设置`}}</view>
+							<i class="iconfont iconjuli ml-sm" :style="{color: primaryColor}"></i>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="fill-base mt-md radius-16">
+				<view class="flex-between pl-lg pr-lg">
+					<view class="item-text flex-y-center" style="width:auto"><i
+							class="iconfont icon-required c-warning"></i>{{$t('action.attendantName')}}简介</view>
+					<input :disabled="true" type="text" class="item-input flex-1" />
+				</view>
+				<textarea v-model="form.text" class="item-textarea pd-lg" maxlength="300"
+					:placeholder="'输入'+$t('action.attendantName')+'简介'" />
+				<view class="text-right pb-lg pr-lg">
+					{{form.text.length>300?300:form.text.length}}/300
+				</view>
+			</view>
+			<view class="fill-base mt-md radius-16">
+				<view class="flex-between pl-lg pr-lg">
+					<view class="item-text flex-y-center"><i class="iconfont icon-required c-warning"></i>身份证号</view>
+					<input v-model="form.id_code" type="text" class="item-input flex-1"
+						:placeholder="rule[7].errorMsg" />
+				</view>
+			</view>
+			<view class="fill-base mt-md radius-16">
+				<view class="flex-between pl-lg pr-lg">
+					<view class="item-text flex-y-center"><i class="iconfont icon-required c-warning"></i>身份证照片</view>
+					<view class="item-input flex-1">图片大小不超过10M</view>
+				</view>
+				<view class="flex-between pl-lg pr-lg pb-md">
+					<upload @upload="imgUpload" :imagelist="form.id_card" imgtype="id_card" imgclass="md" text="身份证人像面"
+						:imgsize="1"></upload>
+					<upload @upload="imgUpload" :imagelist="form.id_card_fan" imgtype="id_card_fan" imgclass="md"
+						text="身份证国徽面" :imgsize="1"></upload>
+				</view>
+				<view class="flex-between pl-lg pr-lg pb-md">
+					<upload @upload="imgUpload" :imagelist="form.id_card_people" imgtype="id_card_people" imgclass="md"
+						text="手持身份证照片" :imgsize="1"></upload>
+				</view>
+			</view>
+			<view class="fill-base mt-md radius-16">
+				<view class="flex-between pl-lg pr-lg">
+					<view class="item-text flex-y-center"><i class="iconfont icon-required c-warning"></i>资格证书</view>
+					<view class="item-input flex-1">图片大小不超过10M</view>
+				</view>
+				<view class="flex-between pl-lg pr-lg pb-md">
+					<upload @upload="imgUpload" @del="imgUpload" :imagelist="form.license" imgtype="license" text="上传图片"
+						:imgsize="15">
+					</upload>
+				</view>
+			</view>
+			<view class="fill-base mt-md radius-16">
+				<view class="flex-between pl-lg pr-lg">
+					<view class="item-text flex-y-center"><i class="iconfont icon-required c-warning"></i>工作形象照</view>
+					<view class="item-input flex-1">图片建议尺寸: 750 * 750，大小不超过10M</view>
+				</view>
+				<view class="flex-between pl-lg pr-lg pb-md">
+					<upload @upload="imgUpload" :imagelist="form.work_img" imgtype="work_img" text="上传图片" :imgsize="1">
+					</upload>
+				</view>
+			</view>
+			<view class="fill-base mt-md radius-16">
+				<view class="flex-between pl-lg pr-lg">
+					<view class="item-text flex-y-center"><i class="iconfont icon-required c-warning"></i>个人生活照</view>
+					<view class="item-input flex-1">图片建议尺寸: 750 * n，大小不超过10M</view>
+				</view>
+				<view class="flex-between pl-lg pr-lg pb-md">
+					<upload @upload="imgUpload" @del="imgUpload" :imagelist="form.self_img" filetype="picture"
+						imgtype="self_img" text="上传图片" :imgsize="9">
+					</upload>
+				</view>
+			</view>
+			<view class="fill-base mt-md radius-16">
+				<view class="flex-between pl-lg pr-lg">
+					<view class="item-text">个人视频介绍</view>
+					<view class="item-input flex-1">视频大小不超过50M</view>
+				</view>
+				<view class="flex-between pl-lg pr-lg pb-md">
+					<upload @upload="imgUpload" @del="imgUpload" :imagelist="form.video" filetype="video"
+						imgtype="video" text="上传视频" :imgsize="1">
+					</upload>
+				</view>
+			</view>
+			<view class="flex-center f-caption c-caption pd-lg">
+				编辑资料将进入重新审核，审核通过之前将显示原资料
+			</view>
+		</view>
+
+		<view class="space-max-footer"></view>
+
+		<fix-bottom-button @confirm="submit" :text="[{text:'确定申请',type:'confirm'}]" bgColor="#fff">
+		</fix-bottom-button>
+	</view>
+</template>
+
+<script>
+	import wPicker from "@/components/w-picker/w-picker.vue";
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {
+			wPicker
+		},
+		data() {
+			return {
+				isLoad: false,
+				options: {},
+				cityList: [],
+				cityIndex: -1,
+				storeList: [],
+				storeIndex: 0,
+				old_phone: '',
+				authTime: 0,
+				timer: null,
+				coach_status: 0,
+				form: {
+					id: 0,
+					admin_id: 0,
+					coach_name: '', //姓名 
+					mobile: '', //手机号 
+					short_code: '',
+					sex: 0, //性别 
+					birthday: '',
+					work_time: '', //从业年份 
+					city_id: '', //城市 
+					store_id: '', //门店
+					lng: '',
+					lat: '',
+					address: '', //详细地址 
+					text: '', //备注 
+					id_code: '', //身份证号
+					id_card: [], //身份证
+					id_card_fan: [], // 身份证反面
+					id_card_people: [], //手持身份证
+					license: [], //资格证书
+					work_img: [], // 工作照
+					self_img: [], // 生活照
+					city_id: '', // 城市 id
+					video: [],
+				},
+				rule: [{
+						name: "coach_name",
+						checkType: "isNotNull",
+						errorMsg: "输入您的姓名",
+						regType: 2
+					}, {
+						name: "birthday",
+						checkType: "isNotNull",
+						errorMsg: "请选择您的生日",
+						regType: 2
+					}, {
+						name: "mobile",
+						checkType: "isMobile",
+						errorMsg: "输入手机号"
+					}, {
+						name: "work_time",
+						checkType: "isNotNull",
+						errorMsg: "请输入从业年份，例如：5"
+					}, {
+						name: "city_id",
+						checkType: "isNotNull",
+						errorMsg: "请选择意向工作城市"
+					},
+					{
+						name: "address",
+						checkType: "isNotNull",
+						errorMsg: "请选择所在地址"
+					}, {
+						name: "text",
+						checkType: "isNotNull",
+						errorMsg: "请输入" + this.$t('action.attendantName') + "简介",
+						regType: 2
+					}, {
+						name: "id_code",
+						checkType: "isIdCard",
+						errorMsg: "输入您的身份证号码"
+					},
+					{
+						name: "id_card",
+						checkType: "isNotNull",
+						errorMsg: "请上传身份证人像面"
+					},
+					{
+						name: "id_card_fan",
+						checkType: "isNotNull",
+						errorMsg: "请上传身份证国徽面"
+					},
+					{
+						name: "id_card_people",
+						checkType: "isNotNull",
+						errorMsg: "请上传手持身份证照片"
+					},
+					{
+						name: "license",
+						checkType: "isNotNull",
+						errorMsg: "请上传资格证书"
+					},
+					{
+						name: "work_img",
+						checkType: "isNotNull",
+						errorMsg: "请上传工作形象照"
+					},
+					{
+						name: "self_img",
+						checkType: "isNotNull",
+						errorMsg: "请上传个人生活照"
+					},
+				],
+				lockTap: false
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+			location: state => state.user.location,
+		}),
+		async onLoad(options) {
+			let {
+				admin_id = 0,
+					is_edit = 0
+			} = options
+			options.is_edit = is_edit
+			options = admin_id ? await this.updateCommonOptions(options) : options
+			this.options = options
+			this.form.admin_id = admin_id
+			this.$util.showLoading()
+			await this.initIndex()
+			this.isLoad = true
+		},
+		onUnload() {
+			if (this.timer) clearInterval(this.timer)
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getUserInfo', 'updateCommonOptions']),
+			...mapMutations(['updateUserItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				if (!this.configInfo.id || !this.configInfo.hasOwnProperty(
+						'plugAuth') || (this.configInfo.hasOwnProperty(
+						'plugAuth') && !this.configInfo.plugAuth.hasOwnProperty(
+						'store')) || refresh) {
+					await this.getConfigInfo()
+				}
+				await this.getCityList()
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				let data = await this.$api.technician.coachInfo()
+				this.form.admin_id = data.id ? data.admin_id : 0
+				await this.getStoreList()
+
+				if (data && !data.id) {
+					this.$util.hideAll()
+					return
+				}
+				let imgArr = ['id_card', 'license', 'self_img']
+				imgArr.map(item => {
+					data[item] = data[item] && data[item].length > 0 ? data[item].map(aitem => {
+						return {
+							path: aitem
+						}
+					}) : []
+				})
+				if (data.id_card && data.id_card.length > 1) {
+					data.id_card_fan = [data.id_card[1]]
+					data.id_card_people = [data.id_card[2]]
+					data.id_card.splice(1, 3)
+				}
+				let imgArrs = ['work_img', 'video']
+				imgArrs.map(item => {
+					data[item] = data[item] && data[item].length > 0 ? [{
+						path: data[item]
+					}] : []
+				})
+
+				data.birthday = data.birthday ? this.$util.formatTime(data.birthday * 1000, 'YY-M-D') : ''
+				for (let key in this.form) {
+					this.form[key] = data[key]
+				}
+				let textArr = ['mobile', 'status']
+				textArr.map(item => {
+					this[item == 'mobile' ? `old_phone` : 'coach_status'] = data[
+						item]
+				})
+				this.cityIndex = this.cityList.findIndex(item => {
+					return item.id == data.city_id
+				})
+				this.storeIndndex = this.storeList.findIndex(item => {
+					return item.id == data.store_id
+				})
+				this.$util.hideAll()
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			async getCityList() {
+				let {
+					location
+				} = this
+				if (!location.lat) {
+					// #ifdef H5
+					if (this.$jweixin.isWechat()) {
+						this.$util.showLoading()
+						// await this.$jweixin.initJssdk();
+						await this.$jweixin.wxReady2();
+						let {
+							latitude: lat = 0,
+							longitude: lng = 0
+						} = await this.$jweixin.getWxLocation()
+						location = {
+							lng,
+							lat,
+							address: '定位失败',
+							province: '',
+							city: '',
+							district: ''
+						}
+						if (lat && lng) {
+							let key = `${lat},${lng}`
+							let data = await this.$api.base.getMapInfo({
+								location: key
+							})
+							let {
+								status,
+								result
+							} = JSON.parse(data)
+							if (status == 0) {
+								let {
+									address,
+									address_component
+								} = result
+								let {
+									province,
+									city,
+									district
+								} = address_component
+								location = {
+									lng,
+									lat,
+									address,
+									province,
+									city,
+									district
+								}
+							}
+						}
+					}
+					// #endif
+					// #ifndef H5
+					location = await this.$util.getBmapLocation()
+					// #endif
+
+					this.updateUserItem({
+						key: 'location',
+						val: location
+					})
+				}
+
+				let {
+					lng = 0,
+						lat = 0
+				} = location
+				if (lat && lng) {
+					let city = await this.$api.base.getCity({
+						lng,
+						lat
+					})
+					this.$util.hideAll()
+					this.cityList = city
+					this.form.city_id = city.length > 0 ? city[0].id : 0
+				}
+			},
+			async getStoreList() {
+				let {
+					admin_id = 0
+				} = this.form
+				if (!admin_id) return
+				let data = await this.$api.mine.getStoreSelect({
+					admin_id
+				})
+				data.unshift({
+					id: 0,
+					title: '不挂靠门店'
+				})
+				this.storeList = data
+			},
+			pickerChange(e, key) {
+				let ind = e.target.value
+				if (key === 'birthday') {
+					let unix = this.$util.DateToUnix(ind)
+					if (unix > new Date(Math.ceil(new Date().getTime())) / 1000) {
+						this.$util.showToast({
+							title: `不能选择未来时间哦`
+						})
+						return
+					}
+					this.form[key] = ind
+					return
+				}
+				this[`${key}Index`] = ind
+				this.form[`${key}_id`] = this[`${key}List`][ind].id
+			},
+			// 发送验证码
+			async toSend() {
+				let {
+					authTime
+				} = this
+				if (authTime) return
+				let {
+					mobile = ''
+				} = this.form
+				if (mobile == null || !/^(1[0-9]{10})$/.test(mobile)) {
+					this.$util.showToast({
+						title: mobile == null ? `请输入手机号` : `${mobile} 手机号无效`
+					});
+					return;
+				}
+				if (this.lockTap) return
+				this.lockTap = true
+				this.$util.showLoading()
+				try {
+					await this.$api.user.sendShortMsg({
+						phone: mobile
+					})
+					this.$util.hideAll()
+					this.lockTap = false
+					let time = 60
+					this.timer = setInterval(() => {
+						if (time === 0) {
+							clearInterval(this.timer)
+							return
+						}
+						time--
+						this.authTime = time
+					}, 1000)
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+			},
+			imgUpload(e) {
+				let {
+					imagelist,
+					imgtype
+				} = e;
+				this.form[imgtype] = imagelist;
+			},
+			// 选择地区
+			async toChooseLocation(e) {
+				await this.$util.checkAuth({
+					type: 'userLocation'
+				})
+				let {
+					lat: locaLat = '',
+					lng: locaLng = ''
+				} = this.location
+				let {
+					id = 0,
+						lat: addrLat,
+						lng: addrLng
+				} = this.form
+
+				if (id) {
+					locaLat = addrLat
+					locaLng = addrLng
+				}
+
+				let param = {}
+				if (!locaLat && !locaLng) {
+					// #ifdef H5
+					if (this.$jweixin.isWechat()) {
+						this.$util.showLoading()
+						await this.$jweixin.wxReady2();
+						let {
+							latitude,
+							longitude
+						} = await this.$jweixin.getWxLocation()
+						locaLat = latitude
+						locaLng = longitude
+					}
+					// #endif
+					// #ifdef APP-PLUS
+					let location = await this.$util.getBmapLocation()
+					locaLat = location.lat
+					locaLng = location.lng
+					// #endif
+				}
+
+				// #ifndef MP-WEIXIN
+				param = {
+					latitude: locaLat,
+					longitude: locaLng
+				}
+				// #endif
+
+				let [, {
+					address = '',
+					longitude,
+					latitude
+				}] = await uni.chooseLocation(param);
+				if (!address) return
+				this.form.address = address
+				this.form.lng = longitude
+				this.form.lat = latitude
+			},
+			//表单验证
+			validate(param) {
+				let validate = new this.$util.Validate();
+				this.rule.map(item => {
+					let {
+						name,
+					} = item
+					validate.add(param[name], item);
+				})
+				let message = validate.start();
+				return message;
+			},
+			async submit() {
+				let param = this.$util.deepCopy(this.form)
+				let arr = ['id_card', 'id_card_fan', 'id_card_people', 'work_img', 'video']
+				arr.map(item => {
+					param[item] = param[item] && param[item].length > 0 ? param[item][0].path : ''
+				})
+				param.license = param.license.map(item => {
+					return item.path
+				})
+				param.self_img = param.self_img.map(item => {
+					return item.path
+				})
+				let msg = this.validate(param);
+				if (msg) {
+					this.$util.showToast({
+						title: msg
+					});
+					return;
+				}
+				param.birthday = this.$util.DateToUnix(param.birthday)
+				param.id_card = [param.id_card, param.id_card_fan, param.id_card_people]
+				delete param.id_card_fan
+				delete param.id_card_people
+				delete param.admin_id
+				let {
+					old_phone
+				} = this
+				let {
+					short_code_status
+				} = this.configInfo
+				if (short_code_status && old_phone != param.mobile && (param.short_code == null || param.short_code
+						.length != 6)) {
+					this.$util.showToast({
+						title: `请输入6位数短信验证码`
+					})
+					return
+				}
+				if (!short_code_status || old_phone == param.mobile) {
+					delete param.short_code
+				}
+				if (this.lockTap) return
+				this.lockTap = true
+				this.$util.showLoading()
+				try {
+					await this.$api.technician.coachUpdateV2(param)
+					this.$util.hideAll()
+					this.$util.showToast({
+						title: `提交成功`
+					})
+					if (this.timer) {
+						clearInterval(this.timer)
+					}
+					setTimeout(() => {
+						if (getCurrentPages().length > 1) {
+							this.$util.back()
+						}
+						this.$util.goUrl({
+							url: '/pages/mine',
+							openType: `reLaunch`
+						})
+					}, 2000)
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+</style>
\ No newline at end of file
diff --git a/technician/pages/income/cash-integral.vue b/technician/pages/income/cash-integral.vue
new file mode 100644
index 0000000..d3925fa
--- /dev/null
+++ b/technician/pages/income/cash-integral.vue
@@ -0,0 +1,532 @@
+<template>
+	<view class="technician-cash-integral">
+
+		<fixed zIndex="997">
+			<view class="record-search-info fill-body pt-md pl-md c-base">
+				<view class="record-info radius-32" :style="{background:primaryColor}">
+					<view class="search-item flex-between ml-lg mr-lg f-desc b-1px-b">
+						<view>查询时间</view>
+						<view @tap.stop="toShowTimePopup($event)" class="flex-y-center">
+							{{ prev_time | handleTimeText(1) }}<i class="iconfont icon-right"></i>
+						</view>
+					</view>
+					<view class="record-list flex-x-center pt-lg pb-lg f-paragraph">
+						<view class="list-item flex-center flex-column">
+							<view class="f-sm-title text-bold">¥{{count.total_cash||0}}</view>
+							<view class="f-caption">累计佣金</view>
+						</view>
+						<view class="list-item flex-center flex-column">
+							<view class="f-sm-title text-bold">{{count.total_integral||0}}</view>
+							<view class="f-caption">累计积分</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</fixed>
+
+		<view class="fill-base" v-if="isLoad && list.data.length>0">
+			<block v-for="(item,index) in list.data" :key="index">
+				<view @tap.stop="toShowTimePopup($event,item.month)" class="count-item fill-body pl-md pr-md"
+					v-if="prev_time.activeIndex==0 && (index==0 || (index>0&&item.month!=list.data[index-1].month))">
+					<veiw class="title flex-y-center">
+						<view class="f-title c-title text-bold">{{item.month_text}}</view>
+						<i class="iconfont iconxia"></i>
+					</veiw>
+					<view class="flex-y-center f-caption c-caption">共计佣金¥{{item.total_cash}}
+						<view class="ml-md">共计积分 {{item.total_integral}}</view>
+					</view>
+				</view>
+				<view @tap.stop="toShowTimePopup($event)" class="count-item fill-body pl-md pr-md"
+					v-if="prev_time.activeIndex==1 && index==0">
+					<veiw class="title flex-y-center">
+						<view class="f-title c-title text-bold">{{ prev_time | handleTimeText(2) }}</view>
+						<i class="iconfont iconxia"></i>
+					</veiw>
+					<view class="flex-y-center f-caption c-caption">共计佣金¥{{count.cash}}
+						<view class="ml-md">共计积分 {{count.integral}}</view>
+					</view>
+				</view>
+				<view class="list-item pt-lg pb-lg ml-lg mr-lg flex-center" :class="[{'b-1px-t':index!=0}]">
+					<view class="item-icon flex-center c-base radius" :style="{background:primaryColor}">
+						<i class="iconfont"
+							:class="[{'iconjifenmingxi':item.type==0},{'iconfenchengmingxi':item.type==1}]"></i>
+					</view>
+					<view class="flex-1">
+						<view class="flex-between">
+							<view class="flex-y-center f-mini-title c-title text-bold">充值金额<view class="ml-sm">
+									{{item.user_cash}}
+								</view>
+							</view>
+							<view class="flex-y-center f-sm-title" :style="{color:primaryColor}">
+								{{item.type==0?item.integral:`¥${item.integral}`}}
+								<view class="f-caption ml-sm" v-if="item.type == 0">积分</view>
+							</view>
+						</view>
+						<view class="flex-y-center f-desc c-paragraph">充值用户<view class="ml-md">{{item.nickName || '-'}}
+							</view>
+						</view>
+						<view class="flex-y-center f-caption c-caption mt-sm">充值时间<view class="ml-md">
+								{{item.create_time}}
+							</view>
+						</view>
+					</view>
+				</view>
+			</block>
+		</view>
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+
+		<view class="space-footer"></view>
+
+		<uni-popup ref="show_choose_time" type="bottom">
+			<view class="popup-choose-time fill-base">
+				<view class="pl-lg pr-lg">
+					<view class="flex-between b-1px-b">
+						<tab @change="handerTabChange" :list="tabList" :activeIndex="activeIndex*1"
+							:activeColor="primaryColor" height="100rpx"></tab>
+						<i @tap.stop="toClose" class="iconfont icon-close"></i>
+					</view>
+					<view class="flex-center mt-md pt-lg pb-lg">
+						<view class="flex-1 flex-y-baseline">
+							<view class="f-paragraph c-title text-bold">{{activeIndex==0?'选择月份':'自定义时间'}}</view>
+							<view class="f-caption c-warning ml-sm" v-if="activeIndex==1">最长可查找时间跨度一年的交易</view>
+						</view>
+						<view class="f-paragraph" @tap.stop="toReset" style="color: #5A677E;"
+							v-if="(activeIndex==0&&check_time.month) || (activeIndex==1&&(check_time.start_time || check_time.end_time))">
+							清除</view>
+					</view>
+					<view class="flex-center pb-lg" v-if="activeIndex==0">
+						<view @tap.stop="toShowTime('month')" class="item-child flex-center flex-column">
+							<view>开始月份</view>
+							<view class="mt-sm" :style="{color:check_time.month ? primaryColor : '#999'}">
+								{{check_time.month || '选择月份'}}
+							</view>
+						</view>
+					</view>
+					<view class="flex-center pb-lg" v-if="activeIndex==1">
+						<view @tap.stop="toShowTime('start_time')" class="item-child flex-center flex-column">
+							<view>开始时间</view>
+							<view class="mt-sm" :style="{color:check_time.start_time ? primaryColor : '#999'}">
+								{{check_time.start_time || '选择时间'}}
+							</view>
+						</view>
+						<view @tap.stop="toShowTime('end_time')" class="item-child flex-center flex-column  b-1px-l">
+							<view>结束时间</view>
+							<view class="mt-sm" :style="{color:check_time.end_time ? primaryColor : '#999'}">
+								{{check_time.end_time || '选择时间'}}
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="flex-center flex-column fill-body">
+					<view class="space-lg"></view>
+					<view @tap.stop="toConfirm" class="confirm-btn flex-center f-title c-base radius-16"
+						:style="{background: primaryColor}">确定</view>
+					<view class="space-lg"></view>
+					<view class="space-safe"></view>
+				</view>
+			</view>
+		</uni-popup>
+
+		<w-picker mode="date" :startYear="startYear*1-10" :endYear="startYear"
+			:value="activeIndex == 0 ?curMonth:curDay" :current="false" :fields="activeIndex == 0 ?'month':'day'"
+			@confirm="onConfirm($event)" :disabled-after="false" ref="day" :themeColor="primaryColor"
+			:visible.sync="showDate">
+		</w-picker>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	import $util from "@/utils/index.js"
+	import wPicker from "@/components/w-picker/w-picker.vue";
+	export default {
+		components: {
+			wPicker
+		},
+		data() {
+			return {
+				isLoad: false,
+				curDay: '',
+				curMonth: '',
+				startYear: '',
+				showKey: '',
+				showDate: false,
+				time_text: '',
+				prev_time: {
+					activeIndex: 0,
+					month: '',
+					start_time: '',
+					end_time: ''
+				},
+				check_time: {
+					activeIndex: 0,
+					month: '',
+					start_time: '',
+					end_time: ''
+				},
+				count: {},
+				activeIndex: 0,
+				tabList: [{
+					id: 1,
+					title: '月份选择'
+				}, {
+					id: 2,
+					title: '自定义时间'
+				}],
+				param: {
+					page: 1,
+				},
+				list: {
+					data: []
+				},
+				loading: true,
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+		}),
+		async onLoad() { 
+			await this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			...mapMutations([]),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				let cur_time = new Date(Math.ceil(new Date().getTime()))
+				this.curDay = this.$util.formatTime(cur_time, 'YY-M-D')
+				this.curMonth = this.$util.formatTime(cur_time, 'YY-M')
+				this.startYear = this.$util.formatTime(cur_time, 'YY')
+				await Promise.all([this.getCount(), this.getList()])
+				this.isLoad = true
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			async getCount() {
+				let {
+					activeIndex
+				} = this
+				let {
+					start_time,
+					end_time
+				} = this.$util.deepCopy(this.check_time)
+				let param = {}
+				if (activeIndex == 1 && start_time && end_time) {
+					param.start_time = this.$util.DateToUnix(start_time)
+					param.end_time = this.$util.DateToUnix(end_time) + 24 * 3600 - 1
+				}
+				this.count = await this.$api.technician.balanceCommissionData(param)
+			},
+			async getList(page) {
+				if (page) {
+					this.param.page = 1
+					this.list.data = []
+					uni.pageScrollTo({
+						scrollTop: 0
+					})
+				}
+				let {
+					list: oldList,
+					activeIndex
+				} = this
+				let param = this.$util.deepCopy(this.param)
+				let {
+					month,
+					start_time,
+					end_time
+				} = this.$util.deepCopy(this.check_time)
+				if (activeIndex == 0) {
+					param.month = month ? this.$util.DateToUnix(`${month}-01`) : ''
+				}
+				if (activeIndex == 1) {
+					param.start_time = start_time && end_time ? this.$util.DateToUnix(start_time) : ''
+					param.end_time = start_time && end_time ? this.$util.DateToUnix(end_time) + 24 * 3600 - 1 : ''
+				}
+				let newList = await this.$api.technician.balanceCommissionList(param);
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+			},
+			handerTabChange(index) {
+				this.activeIndex = index
+				this.check_time.activeIndex = index
+			},
+			toShowTimePopup(e, month = 0) {
+				this.check_time = this.$util.deepCopy(this.prev_time)
+				if (month && month != 0) {
+					this.activeIndex = 0
+					this.curMonth = month
+					this.check_time.month = month
+				}
+				this.activeIndex = this.check_time.activeIndex
+				this.$refs.show_choose_time.open()
+			},
+			toReset() {
+				let {
+					activeIndex
+				} = this
+				if (activeIndex == 0) {
+					this.check_time.month = ''
+					return
+				}
+				this.check_time.start_time = ''
+				this.check_time.end_time = ''
+				this.getList(1)
+			},
+			async toClose() {
+				let {
+					activeIndex
+				} = this
+				let {
+					month,
+					start_time,
+					end_time
+				} = this.check_time
+
+				if ((activeIndex == 0 && !month) || (activeIndex == 1 && (!start_time || !end_time))) {
+					if (activeIndex == 1 && (!start_time || !end_time)) {
+						this.activeIndex = 0
+						this.check_time.activeIndex = 0
+						this.check_time.month = ''
+					}
+					this.prev_time = this.$util.deepCopy(this.check_time)
+				}
+				if ((activeIndex == 0 && month) || (activeIndex == 1 && (start_time && end_time))) {
+					this.check_time = this.$util.deepCopy(this.prev_time)
+				}
+				this.$refs.show_choose_time.close()
+				if (this.activeIndex == 1) {
+					await this.getCount()
+				}
+				this.getList(1)
+			},
+			toShowTime(key) {
+				let {
+					activeIndex
+				} = this
+				if (activeIndex == 1 && key == 'end_time' && !this.check_time.start_time) {
+					this.$util.showToast({
+						title: `请选择开始时间`
+					})
+					return
+				}
+				let showTime = this.check_time[key]
+				if (showTime) {
+					if (key == 'month') {
+						this.curMonth = showTime
+					} else {
+						this.curDay = showTime
+					}
+				}
+				this.showKey = key
+				this.showDate = true
+			},
+			async onConfirm(val) {
+				let {
+					start_time,
+					end_time
+				} = this.check_time
+				let {
+					showKey,
+					activeIndex = 0
+				} = this
+				let show_unit = this.$util.DateToUnix(showKey == 'month' ? `${val.result}-01` : val.result)
+				let start_unit = start_time ? this.$util.DateToUnix(start_time) : 0
+				let end_unit = end_time ? this.$util.DateToUnix(end_time) : 0
+				let cur_month = this.$util.formatTime(new Date(Math.ceil(new Date().getTime())), 'YY-M-D')
+				let cur_unit = this.$util.DateToUnix(cur_month) + 1
+
+				let msgType = {
+					month: '开始月份',
+					start_time: '开始时间',
+					end_time: '结束时间',
+				}
+
+				if (show_unit > cur_unit) {
+					this.$util.showToast({
+						title: `${msgType[showKey]}不能选择未来时间哦`
+					})
+					return
+				}
+
+				if (activeIndex == 1 && ((showKey == 'start_time' && end_unit && end_unit < this.$util.DateToUnix(val
+							.result)) ||
+						(showKey == 'end_time' && start_unit && start_unit > this.$util.DateToUnix(val.result)))) {
+					this.$util.showToast({
+						title: `结束时间不能小于开始时间`
+					})
+					return
+				}
+				this.check_time[showKey] = val.result
+			},
+			async toConfirm() {
+				let {
+					month = '',
+						start_time = '',
+						end_time = ''
+				} = this.check_time
+				let {
+					activeIndex = 0
+				} = this
+				let start_unit = this.$util.DateToUnix(start_time) * 1000
+				let end_unit = this.$util.DateToUnix(end_time) * 1000
+
+				if (activeIndex == 0 && !month) {
+					this.$util.showToast({
+						title: `请选择开始月份`
+					})
+					return
+				}
+				if (activeIndex == 1 && (!start_time || !end_time || (end_unit -
+						start_unit > 365 * 24 * 3600 * 1000))) {
+					this.$util.showToast({
+						title: !start_time ? `请选择开始时间` : !end_time ? `请选择结束时间` : `查询时间跨度最长为一年哦`
+					})
+					return
+				}
+				this.check_time.activeIndex = activeIndex
+				this.prev_time = this.$util.deepCopy(this.check_time)
+				this.$refs.show_choose_time.close()
+				if (activeIndex == 1) {
+					await this.getCount()
+				}
+				this.getList(1)
+			}
+		},
+		filters: {
+			handleTimeText(val, type) {
+				let text = '请选择'
+				let {
+					activeIndex,
+					month,
+					start_time,
+					end_time
+				} = val
+				if (activeIndex == 0 && month) {
+					text = $util.formatTime($util.DateToUnix(`${month}-01`) * 1000, 'YY年M月')
+				}
+				let formatType = type == 1 ? 'YY.M.D' : 'YY年M月D日'
+				if (activeIndex == 1 && start_time && end_time) {
+					text = $util.formatTime($util.DateToUnix(start_time) * 1000, formatType) + ' - ' +
+						$util.formatTime($util.DateToUnix(end_time) * 1000, formatType)
+				}
+				return text
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.technician-cash-integral {
+
+		.record-search-info {
+			width: 750rpx;
+			height: 270rpx;
+
+			.record-info {
+				width: 710rpx;
+
+				.search-item {
+					height: 100rpx;
+
+					.text {
+						color: #3D2C1B;
+					}
+
+					.iconfont {
+						font-size: 26rpx;
+					}
+				}
+
+				.record-list {
+					.list-item {
+						width: 50%;
+					}
+				}
+
+			}
+		}
+
+		.count-item {
+			height: 120rpx;
+
+			.title {
+				padding-top: 18rpx;
+
+				.iconfont {
+					font-size: 16rpx;
+				}
+			}
+
+		}
+
+
+		.list-item {
+			.item-icon {
+				width: 120rpx;
+				height: 120rpx;
+				margin-right: 24rpx;
+
+				.iconfont {
+					font-size: 58rpx;
+				}
+			}
+		}
+
+		.popup-choose-time {
+			width: 750rpx;
+			border-radius: 30rpx 30rpx 0 0;
+
+			.icon-close {
+				color: #A8AEB8;
+				font-size: 40rpx;
+			}
+
+			.item-child {
+				width: 50%;
+			}
+
+			.confirm-btn {
+				width: 670rpx;
+				height: 100rpx;
+			}
+
+		}
+	}
+</style>
diff --git a/technician/pages/income/commission-detail.vue b/technician/pages/income/commission-detail.vue
new file mode 100644
index 0000000..a92df09
--- /dev/null
+++ b/technician/pages/income/commission-detail.vue
@@ -0,0 +1,289 @@
+<template>
+	<view class="technician-commission-detail" v-if="detail.id">
+		<view class="mt-md pd-lg fill-base">
+			<view class="flex-y-center f-mini-title c-title">
+				<view class="dot mr-sm radius" :style="{background:primaryColor}"></view>订单号<view class="ml-sm">
+					{{detail.order_code}}
+				</view>
+			</view>
+			<view class="f-mini-title c-title text-bold mt-lg">项目明细</view>
+			<view class="flex-between f-paragraph" :class="[{'mt-lg':index==0},{'mt-md':index!=0}]"
+				v-for="(item,index) in detail.order_goods" :key="index">
+				<span class="c-paragraph max-500">{{item.goods_name}}<span
+						class="ml-lg">x{{item.true_num}}</span></span>
+				<view class="c-title">¥{{item.true_total_price}}</view>
+			</view>
+			<view class="flex-between f-paragraph mt-lg">
+				<view class="c-paragraph">服务时间</view>
+				<view class="c-caption">{{detail.time_text}}</view>
+			</view>
+			<view class="flex-between f-paragraph mt-lg">
+				<view class="c-paragraph">项目总金额</view>
+				<view class="c-title">¥{{detail.init_service_price}}</view>
+			</view>
+			<view class="flex-between f-paragraph mt-lg" v-if="detail.material_type===1">
+				<view class="c-paragraph">物料费</view>
+				<view class="c-title flex-y-center">¥{{detail.material_price}}
+					<view class="ml-sm c-caption text-delete"
+						v-if="detail.init_material_price*1>detail.material_price*1">
+						¥{{detail.init_material_price}}</view>
+				</view>
+			</view>
+			<view class="flex-between f-paragraph mt-lg">
+				<view class="c-paragraph">卡券优惠</view>
+				<view class="c-title">-¥{{detail.discount}}</view>
+			</view>
+			<view class="flex-between f-paragraph mt-lg mb-lg">
+				<view class="c-paragraph">分成比例</view>
+				<view class="c-title">{{detail.coach_balance}}%</view>
+			</view>
+			<view class="flex-between pt-lg b-1px-t">
+				<view @tap.stop="$refs.show_rule_item.open()" class="f-paragraph c-paragraph flex-y-center">应得收益<i
+						class="iconfont iconshuyi_shuoming ml-sm"></i>
+				</view>
+				<span class="max-500">
+					{{`${detail.coach_text} =`}}
+					<span class="f-caption ml-sm" :style="{color:primaryColor}">¥<span
+							class="f-mini-title">{{detail.coach_cash}}</span>
+					</span>
+				</span>
+			</view>
+		</view>
+
+		<view class="mt-md pd-lg fill-base" v-if="detail.add_order && detail.add_order.length > 0">
+			<view class="f-mini-title c-title text-bold">加钟明细</view>
+			<block v-for="(item,index) in detail.add_order" :key="index">
+				<view class="flex-between f-paragraph" :class="[{'mt-lg':aindex==0},{'mt-md':aindex!=0}]"
+					v-for="(aitem,aindex) in item.order_goods">
+					<span class="c-paragraph max-500">{{aitem.goods_name}}{{aindex==0?` (第${index*1+1}次加钟)`:''}}<span
+							class="ml-lg">x{{aitem.num}}</span></span>
+					<view class="c-title">¥{{aitem.price}}</view>
+				</view>
+				<view class="flex-between f-paragraph mt-lg mb-lg">
+					<view class="c-paragraph">项目总金额</view>
+					<view class="c-title">¥{{item.true_service_price}}</view>
+				</view>
+				<view class="flex-between f-paragraph mt-lg mb-lg" v-if="detail.material_type===1">
+					<view class="c-paragraph">物料费</view>
+					<view class="c-title">¥{{item.material_price}}</view>
+				</view>
+				<view class="flex-between f-paragraph mt-lg mb-lg">
+					<view class="c-paragraph">分成比例</view>
+					<view class="c-title">{{item.coach_balance}}%</view>
+				</view>
+				<view class="flex-between f-paragraph mt-lg mb-lg">
+					<view class="c-paragraph">分摊扣费</view>
+					<view class="c-title">-¥{{item.total_share_cash}}</view>
+				</view>
+				<view class="flex-between f-paragraph mt-lg mb-lg">
+					<view @tap.stop="$refs.show_add_rule_item.open()" class="f-paragraph c-paragraph flex-y-center">
+						应得收益<i class="iconfont iconshuyi_shuoming ml-sm"></i>
+					</view>
+					<span class="max-500">
+						{{`${item.add_coach_text} =`}}
+						<span class="f-caption ml-sm" :style="{color:primaryColor}">¥<span
+								class="f-mini-title">{{item.coach_cash}}</span>
+						</span>
+					</span>
+				</view>
+			</block>
+			<view class="flex-between pt-lg b-1px-t">
+				<view class="f-paragraph c-paragraph flex-y-center">加钟收益</view>
+				<span class="max-500">
+					{{`${detail.add_coach_text} =`}}
+					<span class="f-caption ml-sm" :style="{color:primaryColor}">¥<span
+							class="f-mini-title">{{detail.add_coach_cash}}</span>
+					</span>
+				</span>
+			</view>
+		</view>
+
+		<!-- <view class="mt-md pd-lg fill-base">
+			<view class="f-mini-title c-title text-bold">扣费明细</view>
+			<view class="flex-between f-paragraph mt-lg">
+				<view class="c-paragraph">经纪人扣费</view>
+				<view class="c-title">-¥{{detail.partner_share_cash}}</view>
+			</view>
+			<view class="flex-between f-paragraph mt-lg">
+				<view class="c-paragraph">渠道商扣费</view>
+				<view class="c-title">-¥{{detail.channel_share_cash}}</view>
+			</view>
+			<view class="flex-between f-paragraph mt-lg">
+				<view class="c-paragraph">业务员扣费</view>
+				<view class="c-title">-¥{{detail.salesman_share_cash}}</view>
+			</view>
+			<view class="flex-between mt-lg pt-lg b-1px-t">
+				<view class="f-paragraph c-paragraph">合计扣费</view>
+				<view class="flex-y-center f-caption c-warning">¥<view class="f-mini-title">
+						{{detail.total_share_cash}}
+					</view>
+				</view>
+			</view>
+		</view> -->
+
+
+		<view class="mt-md pd-lg fill-base">
+			<view class="f-mini-title c-title text-bold">车费明细</view>
+			<view class="flex-between f-paragraph mt-lg">
+				<view class="c-paragraph">车费收益</view>
+				<view class="c-title text-bold" :style="{color:primaryColor}">¥{{detail.true_car_price}}</view>
+			</view>
+		</view>
+
+		<view class="space-max-footer"></view>
+
+		<fixed position="bottom">
+			<view class="pd-lg fill-base flex-between f-paragraph" style="width:100%">
+				<view class="f-mini-title c-title text-bold">实际收益</view>
+				<span class="max-500 c-warning">
+					{{`${detail.total_order_text} =`}}
+					<span class="f-caption text-bold ml-sm">¥<span
+							class="f-mini-title">{{detail.total_order_cash}}</span>
+					</span>
+				</span>
+			</view>
+			<view class="space-safe fill-base"></view>
+		</fixed>
+
+
+		<uni-popup ref="show_rule_item" type="center" :maskClick="false" :zIndex="1000">
+			<view class="common-popup-content fill-base pd-lg radius-34">
+				<view class="title">应得收益计算规则</view>
+				<view class="f-desc c-title mt-lg">
+					<block v-if="detail.material_type === 0">
+						应得收益 = (项目总金额 - 卡券优惠) * 分成比例
+					</block>
+					<block v-else>
+						应得收益 = (项目总金额 + 物料费 - 卡券优惠) * 分成比例 - 物料费
+					</block>
+				</view>
+				<view class="button">
+					<view @tap.stop="$refs.show_rule_item.close()" class="item-child c-base"
+						:style="{background: primaryColor,color:'#fff'}">知道了</view>
+				</view>
+			</view>
+		</uni-popup>
+
+		<uni-popup ref="show_add_rule_item" type="center" :maskClick="false" :zIndex="1000">
+			<view class="common-popup-content fill-base pd-lg radius-34">
+				<view class="title">加钟收益计算规则</view>
+				<view class="f-desc c-title mt-lg">
+					<block v-if="detail.material_type === 0">
+						应得收益 = 项目总金额 * 分成比例 - 分摊扣费
+					</block>
+					<block v-else>
+						应得收益 = (项目总金额 + 物料费) * 分成比例 - 物料费 - 分摊扣费
+					</block>
+				</view>
+				<view class="button">
+					<view @tap.stop="$refs.show_add_rule_item.close()" class="item-child c-base"
+						:style="{background: primaryColor,color:'#fff'}">知道了</view>
+				</view>
+			</view>
+		</uni-popup>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		data() {
+			return {
+				isLoad: false,
+				options: {},
+				detail: {}
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+		}),
+		async onLoad(options) {
+			this.options = options
+			await this.initIndex()
+		},
+		methods: {
+			...mapMutations([]),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif 
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				await this.getDetail()
+				this.isLoad = true
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			async getDetail() {
+				let {
+					id
+				} = this.options
+				let data = await this.$api.technician.coachCommissionInfo({
+					id
+				})
+				let {
+					coach_cash,
+					true_car_price,
+					total_share_cash,
+					init_material_price,
+					material_price,
+					material_type = 0,
+					discount
+				} = data
+				if (discount * 1 > 0 && init_material_price * 1 > material_price * 1) {
+					data.discount = (discount * 1 - (init_material_price * 1 - material_price * 1)).toFixed(2)
+				}
+				data.order_goods.map(item => {
+					item.true_num = item.num - item.refund_num
+					item.true_total_price = item.price * item.true_num
+				})
+				data.coach_text = material_type === 0 ?
+					`(${data.init_service_price}-${data.discount})*${data.coach_balance}%` :
+					`(${data.init_service_price}+${data.material_price}-${data.discount})*${data.coach_balance}%-${data.material_price}`
+				let add_coach_cash = 0
+				let add_coach_text = ''
+				data.add_order.map((item, index) => {
+					add_coach_cash += item.coach_cash * 1
+					item.add_coach_text = material_type === 0 ?
+						`${item.true_service_price}*${item.coach_balance}%-${item.total_share_cash}` :
+						`(${item.true_service_price}+${item.material_price})*${item.coach_balance}%-${item.material_price}-${item.total_share_cash}`
+					add_coach_text += `${index==0?'':' + '}${item.coach_cash}`
+				})
+				data.add_coach_cash = add_coach_cash.toFixed(2)
+				data.add_coach_text = add_coach_text
+
+
+				data.total_order_text = data.add_order && data.add_order.length > 0 ?
+					`${coach_cash} + ${add_coach_cash} - ${total_share_cash} + ${true_car_price}` :
+					`${coach_cash} - ${total_share_cash} + ${true_car_price} `
+
+				let total_order_cash = coach_cash * 1 + add_coach_cash * 1 + true_car_price * 1 - total_share_cash * 1
+				data.total_order_cash = total_order_cash.toFixed(2)
+				this.detail = data
+			},
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.technician-commission-detail {
+		.dot {
+			width: 14rpx;
+			height: 14rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/technician/pages/income/commission-list.vue b/technician/pages/income/commission-list.vue
new file mode 100644
index 0000000..23b8bf2
--- /dev/null
+++ b/technician/pages/income/commission-list.vue
@@ -0,0 +1,554 @@
+<template>
+	<view class="technician-cash-integral">
+		<fixed zIndex="997">
+			<view class="record-search-info fill-body pt-md pl-md c-base">
+				<view class="record-info radius-32" :style="{background:primaryColor}">
+					<view class="search-item flex-between ml-lg mr-lg f-desc b-1px-b">
+						<view>查询时间</view>
+						<view @tap.stop="toShowTimePopup($event)" class="flex-y-center">
+							{{ prev_time | handleTimeText(1) }}<i class="iconfont icon-right"></i>
+						</view>
+					</view>
+					<view class="record-list flex-x-center pt-lg pb-lg f-paragraph">
+						<view class="list-item flex-center flex-column" v-for="(item,index) in countList" :key="index">
+							<view class="f-sm-title text-bold">¥{{count[item.key]||0}}</view>
+							<view @tap.stop="toShowDialog(index)" class="flex-y-center f-caption">{{item.title}}<i
+									class="iconfont iconshuyi_shuoming ml-sm"></i></view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</fixed>
+		<view class="fill-base" v-if="isLoad && list.data.length>0">
+			<block v-for="(item,index) in list.data" :key="index">
+				<view @tap.stop="toShowTimePopup($event,item.month)" class="count-item fill-body pl-md pr-md"
+					v-if="prev_time.activeIndex==0 && (index==0 || (index>0&&item.month!=list.data[index-1].month))">
+					<veiw class="title flex-y-center">
+						<view class="f-title c-title text-bold">{{item.month_text}}</view>
+						<i class="iconfont iconxia"></i>
+					</veiw>
+					<view class="flex-y-center f-caption c-caption">实际收益¥{{item.total_cash}}
+						<view class="ml-md">共{{item.total_count}}笔订单</view>
+					</view>
+				</view>
+				<view @tap.stop="toShowTimePopup($event)" class="count-item fill-body pl-md pr-md"
+					v-if="prev_time.activeIndex==1 && index==0">
+					<veiw class="title flex-y-center">
+						<view class="f-title c-title text-bold">{{ prev_time | handleTimeText(2)}}</view>
+						<i class="iconfont iconxia"></i>
+					</veiw>
+					<view class="flex-y-center f-caption c-caption">实际收益¥{{count.service_cash}}
+						<view class="ml-md">共{{count.count}}笔订单</view>
+					</view>
+				</view>
+				<view @tap.stop="goDetail(index)" class="list-item pt-lg pb-lg ml-lg mr-lg"
+					:class="[{'b-1px-t':index!=0}]">
+					<view class="flex-between">
+						<view class="f-mini-title c-title text-bold max-500 ellipsis">
+							订单号 {{item.order_code}}
+						</view>
+						<view class="f-paragraph" :style="{color:primaryColor}">查看详情</view>
+					</view>
+					<view class="f-caption c-caption mt-sm">{{item.create_time}} </view>
+					<view class="flex-between mt-sm">
+						<view class="f-desc c-paragraph">订单收益</view>
+						<view class="flex-y-center f-caption c-warning">¥<view class="f-mini-title">
+								{{item.coach_cash}}
+							</view>
+						</view>
+					</view>
+				</view>
+			</block>
+		</view>
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+
+		<view class="space-footer"></view>
+
+		<uni-popup ref="show_choose_time" type="bottom">
+			<view class="popup-choose-time fill-base">
+				<view class="pl-lg pr-lg">
+					<view class="flex-between b-1px-b">
+						<tab @change="handerTabChange" :list="tabList" :activeIndex="activeIndex*1"
+							:activeColor="primaryColor" height="100rpx"></tab>
+						<i @tap.stop="toClose" class="iconfont icon-close"></i>
+					</view>
+					<view class="flex-center mt-md pt-lg pb-lg">
+						<view class="flex-1 flex-y-baseline">
+							<view class="f-paragraph c-title text-bold">{{activeIndex==0?'选择月份':'自定义时间'}}</view>
+							<view class="f-caption c-warning ml-sm" v-if="activeIndex==1">最长可查找时间跨度一年的交易</view>
+						</view>
+						<view class="f-paragraph" @tap.stop="toReset" style="color: #5A677E;"
+							v-if="(activeIndex==0&&check_time.month) || (activeIndex==1&&(check_time.start_time || check_time.end_time))">
+							清除</view>
+					</view>
+					<view class="flex-center pb-lg" v-if="activeIndex==0">
+						<view @tap.stop="toShowTime('month')" class="item-child flex-center flex-column">
+							<view>开始月份</view>
+							<view class="mt-sm" :style="{color:check_time.month ? primaryColor : '#999'}">
+								{{check_time.month || '选择月份'}}
+							</view>
+						</view>
+					</view>
+					<view class="flex-center pb-lg" v-if="activeIndex==1">
+						<view @tap.stop="toShowTime('start_time')" class="item-child flex-center flex-column">
+							<view>开始时间</view>
+							<view class="mt-sm" :style="{color:check_time.start_time ? primaryColor : '#999'}">
+								{{check_time.start_time || '选择时间'}}
+							</view>
+						</view>
+						<view @tap.stop="toShowTime('end_time')" class="item-child flex-center flex-column  b-1px-l">
+							<view>结束时间</view>
+							<view class="mt-sm" :style="{color:check_time.end_time ? primaryColor : '#999'}">
+								{{check_time.end_time || '选择时间'}}
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="flex-center flex-column fill-body">
+					<view class="space-lg"></view>
+					<view @tap.stop="toConfirm" class="confirm-btn flex-center f-title c-base radius-16"
+						:style="{background: primaryColor}">确定</view>
+					<view class="space-lg"></view>
+					<view class="space-safe"></view>
+				</view>
+			</view>
+		</uni-popup>
+
+		<w-picker mode="date" :startYear="startYear*1-10" :endYear="startYear"
+			:value="activeIndex == 0 ?curMonth:curDay" :current="false" :fields="activeIndex == 0 ?'month':'day'"
+			@confirm="onConfirm($event)" :disabled-after="false" ref="day" :themeColor="primaryColor"
+			:visible.sync="showDate">
+		</w-picker>
+
+		<uni-popup ref="show_rule_item" type="center" :maskClick="false">
+			<view class="common-popup-content fill-base pd-lg radius-34">
+				<view class="title">{{countList[countInd].title}}</view>
+				<view class="f-desc c-title mt-lg">
+					{{countList[countInd].text}}
+				</view>
+				<view class="button">
+					<view @tap.stop="$refs.show_rule_item.close()" class="item-child c-base"
+						:style="{background: primaryColor,color:'#fff'}">知道了</view>
+				</view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	import $util from "@/utils/index.js"
+	import wPicker from "@/components/w-picker/w-picker.vue";
+	export default {
+		components: {
+			wPicker
+		},
+		data() {
+			return {
+				isLoad: false,
+				countList: [{
+					key: 'total_service_cash',
+					title: '项目收益',
+					text: '累计所有项目收益，不包含车费'
+				}, {
+					key: 'total_car_cash',
+					title: '车费收益',
+					text: '累计所有车费'
+				}],
+				countInd: 0,
+				showDialog: false,
+				curDay: '',
+				curMonth: '',
+				startYear: '',
+				showKey: '',
+				showDate: false,
+				prev_time: {
+					activeIndex: 0,
+					month: '',
+					start_time: '',
+					end_time: ''
+				},
+				check_time: {
+					activeIndex: 0,
+					month: '',
+					start_time: '',
+					end_time: ''
+				},
+				count: {},
+				activeIndex: 0,
+				tabList: [{
+					id: 1,
+					title: '月份选择'
+				}, {
+					id: 2,
+					title: '自定义时间'
+				}],
+				param: {
+					page: 1,
+				},
+				list: {
+					data: []
+				},
+				loading: true,
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+		}),
+		async onLoad() { 
+			await this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			...mapMutations([]),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				let cur_time = new Date(Math.ceil(new Date().getTime()))
+				this.curDay = this.$util.formatTime(cur_time, 'YY-M-D')
+				this.curMonth = this.$util.formatTime(cur_time, 'YY-M')
+				this.startYear = this.$util.formatTime(cur_time, 'YY')
+				await Promise.all([this.getCount(), this.getList()])
+				this.isLoad = true
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			async getCount() {
+				let {
+					activeIndex
+				} = this
+				let {
+					start_time,
+					end_time
+				} = this.$util.deepCopy(this.check_time)
+				let param = {}
+				if (activeIndex == 1 && start_time && end_time) {
+					param.start_time = this.$util.DateToUnix(start_time)
+					param.end_time = this.$util.DateToUnix(end_time) + 24 * 3600 - 1
+				}
+				this.count = await this.$api.technician.coachCommissionData(param)
+			},
+			async getList(page) {
+				if (page) {
+					this.param.page = 1
+					this.list.data = []
+					uni.pageScrollTo({
+						scrollTop: 0
+					})
+				}
+				let {
+					list: oldList,
+					activeIndex
+				} = this
+				let param = this.$util.deepCopy(this.param)
+				let {
+					month,
+					start_time,
+					end_time
+				} = this.$util.deepCopy(this.check_time)
+				if (activeIndex == 0) {
+					param.month = month ? this.$util.DateToUnix(`${month}-01`) : ''
+				}
+				if (activeIndex == 1) {
+					param.start_time = start_time && end_time ? this.$util.DateToUnix(start_time) : ''
+					param.end_time = start_time && end_time ? this.$util.DateToUnix(end_time) + 24 * 3600 - 1 : ''
+				}
+				let newList = await this.$api.technician.coachCommissionList(param);
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+			},
+			toShowDialog(index) {
+				this.countInd = index
+				this.$refs.show_rule_item.open()
+			},
+			handerTabChange(index) {
+				this.activeIndex = index
+				this.check_time.activeIndex = index
+			},
+			toShowTimePopup(e, month = 0) {
+				this.check_time = this.$util.deepCopy(this.prev_time)
+				if (month && month != 0) {
+					this.activeIndex = 0
+					this.curMonth = month
+					this.check_time.month = month
+				}
+				this.activeIndex = this.check_time.activeIndex
+				this.$refs.show_choose_time.open()
+			},
+			toReset() {
+				let {
+					activeIndex
+				} = this
+				if (activeIndex == 0) {
+					this.check_time.month = ''
+					return
+				}
+				this.check_time.start_time = ''
+				this.check_time.end_time = ''
+				this.getList(1)
+			},
+			async toClose() {
+				let {
+					activeIndex
+				} = this
+				let {
+					month,
+					start_time,
+					end_time
+				} = this.check_time
+
+				if ((activeIndex == 0 && !month) || (activeIndex == 1 && (!start_time || !end_time))) {
+					if (activeIndex == 1 && (!start_time || !end_time)) {
+						this.activeIndex = 0
+						this.check_time.activeIndex = 0
+						this.check_time.month = ''
+					}
+					this.prev_time = this.$util.deepCopy(this.check_time)
+				}
+				if ((activeIndex == 0 && month) || (activeIndex == 1 && (start_time && end_time))) {
+					this.check_time = this.$util.deepCopy(this.prev_time)
+				}
+				this.$refs.show_choose_time.close()
+				if (this.activeIndex == 1) {
+					await this.getCount()
+				}
+				this.getList(1)
+			},
+			toShowTime(key) {
+				let {
+					activeIndex
+				} = this
+				if (activeIndex == 1 && key == 'end_time' && !this.check_time.start_time) {
+					this.$util.showToast({
+						title: `请选择开始时间`
+					})
+					return
+				}
+				let showTime = this.check_time[key]
+				if (showTime) {
+					if (key == 'month') {
+						this.curMonth = showTime
+					} else {
+						this.curDay = showTime
+					}
+				}
+				this.showKey = key
+				this.showDate = true
+			},
+			async onConfirm(val) {
+				let {
+					start_time,
+					end_time
+				} = this.check_time
+				let {
+					showKey,
+					activeIndex = 0
+				} = this
+				let show_unit = this.$util.DateToUnix(showKey == 'month' ? `${val.result}-01` : val.result)
+				let start_unit = start_time ? this.$util.DateToUnix(start_time) : 0
+				let end_unit = end_time ? this.$util.DateToUnix(end_time) : 0
+				let cur_month = this.$util.formatTime(new Date(Math.ceil(new Date().getTime())), 'YY-M-D')
+				let cur_unit = this.$util.DateToUnix(cur_month) + 1
+
+				let msgType = {
+					month: '开始月份',
+					start_time: '开始时间',
+					end_time: '结束时间',
+				}
+
+				if (show_unit > cur_unit) {
+					this.$util.showToast({
+						title: `${msgType[showKey]}不能选择未来时间哦`
+					})
+					return
+				}
+
+				if (activeIndex == 1 && ((showKey == 'start_time' && end_unit && end_unit < this.$util.DateToUnix(val
+							.result)) ||
+						(showKey == 'end_time' && start_unit && start_unit > this.$util.DateToUnix(val.result)))) {
+					this.$util.showToast({
+						title: `结束时间不能小于开始时间`
+					})
+					return
+				}
+				this.check_time[showKey] = val.result
+			},
+			async toConfirm() {
+				let {
+					month = '',
+						start_time = '',
+						end_time = ''
+				} = this.check_time
+				let {
+					activeIndex = 0
+				} = this
+				let start_unit = this.$util.DateToUnix(start_time) * 1000
+				let end_unit = this.$util.DateToUnix(end_time) * 1000
+
+				if (activeIndex == 0 && !month) {
+					this.$util.showToast({
+						title: `请选择开始月份`
+					})
+					return
+				}
+				if (activeIndex == 1 && (!start_time || !end_time || (end_unit -
+						start_unit > 365 * 24 * 3600 * 1000))) {
+					this.$util.showToast({
+						title: !start_time ? `请选择开始时间` : !end_time ? `请选择结束时间` : `查询时间跨度最长为一年哦`
+					})
+					return
+				}
+				this.check_time.activeIndex = activeIndex
+				this.prev_time = this.$util.deepCopy(this.check_time)
+				this.$refs.show_choose_time.close()
+				if (activeIndex == 1) {
+					await this.getCount()
+				}
+				this.getList(1)
+			},
+			goDetail(index) {
+				let {
+					id
+				} = this.list.data[index]
+				this.$util.goUrl({
+					url: `/technician/pages/income/commission-detail?id=${id}`
+				})
+			}
+		},
+		filters: {
+			handleTimeText(val, type) {
+				let text = '请选择'
+				let {
+					activeIndex,
+					month,
+					start_time,
+					end_time
+				} = val
+				if (activeIndex == 0 && month) {
+					text = $util.formatTime($util.DateToUnix(`${month}-01`) * 1000, 'YY年M月')
+				}
+				let formatType = type == 1 ? 'YY.M.D' : 'YY年M月D日'
+				if (activeIndex == 1 && start_time && end_time) {
+					text = $util.formatTime($util.DateToUnix(start_time) * 1000, formatType) + ' - ' +
+						$util.formatTime($util.DateToUnix(end_time) * 1000, formatType)
+				}
+				return text
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.technician-cash-integral {
+
+		.record-search-info {
+			width: 750rpx;
+			height: 270rpx;
+
+			.record-info {
+				width: 710rpx;
+
+				.search-item {
+					height: 100rpx;
+
+					.iconfont {
+						font-size: 26rpx;
+					}
+				}
+
+				.record-list {
+					.list-item {
+						width: 50%;
+
+						.iconfont {
+							font-size: 28rpx;
+						}
+					}
+				}
+
+			}
+		}
+
+		.count-item {
+			height: 120rpx;
+
+			.title {
+				padding-top: 18rpx;
+
+				.iconfont {
+					font-size: 16rpx;
+				}
+			}
+
+		}
+
+		.list-item {
+			.avatar {
+				width: 155rpx;
+				height: 155rpx;
+			}
+
+			.item-bell {
+				width: 66rpx;
+				height: 30rpx;
+				border-radius: 4rpx;
+			}
+		}
+
+		.popup-choose-time {
+			width: 750rpx;
+			border-radius: 30rpx 30rpx 0 0;
+
+			.icon-close {
+				color: #A8AEB8;
+				font-size: 40rpx;
+			}
+
+			.item-child {
+				width: 50%;
+			}
+
+			.confirm-btn {
+				width: 670rpx;
+				height: 100rpx;
+			}
+
+		}
+	}
+</style>
diff --git a/technician/pages/income/index.vue b/technician/pages/income/index.vue
new file mode 100644
index 0000000..7ed7823
--- /dev/null
+++ b/technician/pages/income/index.vue
@@ -0,0 +1,149 @@
+<template>
+	<view class="technician-income-index" v-if="isLoad">
+		<view @tap.stop="$util.goUrl({url:`/user/pages/cash-out?type=technician`})" class="mine-menu-list c-base"
+			:style="{background:primaryColor}">
+			<view class="space-lg"></view>
+			<view class="space-lg"></view>
+			<view class="flex-center f-caption mt-sm">可提现金额(元)</view>
+			<view class="money-info flex-center flex-y-baseline mt-sm mb-sm">¥<view class="money">
+					{{detail.cap_cash}}
+				</view>
+			</view>
+			<view class="flex-center pt-md pb-md f-caption c-base-rgba">每月提现不限次数</view>
+			<view class="cash-out-btn flex-center fill-base f-paragraph radius" :style="{color: primaryColor}">提现
+			</view>
+			<view class="space-lg"></view>
+			<view class="space-lg"></view>
+		</view>
+		<view class="money-count fill-base flex-center pt-md pb-md">
+			<view class="item-child flex-center flex-column">
+				<view class="flex-y-baseline f-md-title mb-sm">{{detail.extract_total_price}}</view>
+				<view class="f-caption c-caption">总收入(元)</view>
+			</view>
+			<view class="item-child flex-center flex-column b-1px-l">
+				<view class="flex-y-baseline f-md-title mb-sm">{{detail.no_received}}</view>
+				<view class="f-caption c-caption">未入账(元)</view>
+			</view>
+		</view>
+		<view @tap.stop="$util.goUrl({url:`/user/pages/distribution/record?type=2`})"
+			class="flex-between mt-md pt-lg pb-lg pl-lg pr-md fill-base">
+			<view class="f-title c-title">提现记录</view>
+			<view class="flex-y-center f-paragraph c-title">
+				<view class="c-warning" v-if="detail.extract_ing_price*1>0">提现中 {{detail.extract_ing_price}}元</view>
+				<i class="iconfont icon-right ml-sm"></i>
+			</view>
+		</view>
+		<view class="space-footer"></view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	import tabbar from "@/components/tabbar.vue"
+	export default {
+		components: {
+			tabbar
+		},
+		data() {
+			return {
+				detail: {},
+				isLoad: false
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			commonOptions: state => state.user.commonOptions,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad() {
+			this.initIndex()
+		},
+		onUnload() {
+			this.$util.back()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		methods: {
+			...mapMutations([]),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				this.$util.showLoading()
+				this.detail = await this.$api.technician.capCashInfo()
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				this.isLoad = true
+				this.$util.hideAll()
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.technician-income-index {
+
+		.mine-menu-list {
+			.money-info {
+				font-size: 50rpx;
+
+				.money {
+					font-size: 70rpx;
+				}
+			}
+
+			.cash-out-btn {
+				width: 169rpx;
+				height: 56rpx;
+				margin: 0 auto;
+			}
+
+			.menu-title {
+				height: 90rpx;
+
+				.iconfont {
+					font-size: 24rpx;
+				}
+			}
+
+			.item-child {
+				width: 25%;
+				margin: 10rpx 0;
+
+				.iconfont {
+					font-size: 46rpx;
+				}
+			}
+
+
+		}
+
+
+		.money-count {
+			.item-child {
+				width: 50%;
+			}
+		}
+
+	}
+</style>
diff --git a/technician/pages/level.vue b/technician/pages/level.vue
new file mode 100644
index 0000000..a388723
--- /dev/null
+++ b/technician/pages/level.vue
@@ -0,0 +1,443 @@
+<template>
+	<view class="pages-technician-level" v-if="isLoad">
+		<swiper class="image-container" :indicator-dots="false" @change="swiperChange" :current="currentIndex"
+			v-if="levelList && levelList.length > 0">
+			<swiper-item class="swiper-item" v-for="(item, index) in levelList" :key="index">
+				<view class="level-line-info flex-center mt-lg ml-md mr-md rel">
+					<view class="space-lg"></view>
+					<i class="iconfont icon-level-line icon-font-color abs" :style="{
+	backgroundImage: `-webkit-linear-gradient(0deg, #000 0%,  ${primaryColor} 50%, #000 100%)`}"></i>
+					<view class="list-item flex-center flex-column" v-for="(aitem,aindex) in 3" :key="aindex">
+						<view class="line-tag" :class="[{'left':aindex==0},{'center':aindex==1},{'right':aindex==2}]"
+							v-if="(aindex==0 && index>0) || aindex == 1 || (aindex ==2 && index!=levelList.length-1)">
+							<view class="tag-lg flex-center">
+								<view class="tag-md flex-center">
+									<view class="tag-sm flex-center" :style="{background:primaryColor}"
+										v-if="aindex==1">
+									</view>
+								</view>
+							</view>
+						</view>
+						<view class="line-text mt-sm"
+							v-if="(aindex==0 && index>0) ||(aindex ==2 && index!=levelList.length-1)">
+							{{aindex==0?levelList[index-1].title : levelList[index+1].title}}
+						</view>
+						<view class="text-tag flex-center mt-sm rel" :style="{background:primaryColor}"
+							v-if="aindex===1">
+							<view class="square-tag flex-center abs"
+								:style="{background:primaryColor,background:`linear-gradient(-45deg, transparent 12rpx,${primaryColor} 0)`}">
+								<view class="square-mini fill-base"></view>
+							</view>
+							<view class="tag-text fill-base flex-center pl-sm pr-sm" :style="{color:primaryColor}">
+								{{item.title}}
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<view class="technician-level pd-lg ml-md mr-md mt-md rel"
+					:style="{border:`1rpx solid ${primaryColor}`}">
+					<i class="iconfont icon-level-icon icon-font-color abs" :style="{left:'60rpx',
+				backgroundImage: `-webkit-linear-gradient(0deg, #000 36%,  ${primaryColor} 100%)`}"></i>
+					<image mode="aspectFill" class="level-icon-img abs"
+						src="https://lbqny.migugu.com/admin/anmo/technician/level-icon.png">
+					</image>
+					<view class="space-md"></view>
+					<view class="flex-y-baseline level-title text-bold">{{item.title}}
+						<view class="ml-sm f-desc">
+							{{ index < curLevelInd ? '已解锁': index == curLevelInd ? '当前等级' : '未解锁' }}
+						</view>
+					</view>
+					<view style="height: 55rpx;"></view>
+					<view class="level-line radius rel">
+						<view class="level-line cur radius abs" :style="{width:`35%`,background:primaryColor}"></view>
+					</view>
+					<view style="height: 25rpx;"></view>
+					<view class="flex-between f-paragraph c-base text-bold">
+						<view>{{item.data.title}}</view>
+						<view>{{item.data.next_level_title}}</view>
+					</view>
+					<view class="flex-warp f-icontext mt-sm">
+						<text v-for="(aitem,aindex) in item.data.differ_text"
+							:key="aindex">{{aindex<2 || aindex==item.data.differ_text.length-1? aitem: `、${aitem}` }}</text>
+					</view>
+				</view>
+			</swiper-item>
+		</swiper>
+
+
+
+		<scroll-view scroll-x class="count-list  mt-lg ml-md mr-md" v-if="coach_level.id">
+			<view class="list-item flex-column" v-for="(item,index) in countList" :key="index">
+				<view class="flex-center num text-bold" :style="{color:primaryColor}">
+					{{coach_level[item.key]}}{{item.unit||''}}
+				</view>
+				<view class="flex-center text">{{item.text}}</view>
+			</view>
+		</scroll-view>
+
+		<view @tap.stop="$refs.show_rule_item.open()" class="flex-y-center ml-md pt-lg pb-lg f-title c-base">
+			<view class="text-bold">规则说明</view> <i class="iconfont iconshuyi_shuoming ml-sm"></i>
+		</view>
+		<scroll-view scroll-x class="rule-list flex-column ml-md mr-md pl-md pr-md"
+			v-if="ruleList && ruleList.length > 0">
+			<view class="list-item flex-warp" v-for="(item,index) in ruleList" :key="index">
+				<view class="flex-center" :class="[{'title':bindex==0},{'text':bindex>0}]"
+					:style="{borderTop: bindex!==0?`1rpx solid #19212C`:''}" v-for="(bitem,bindex) in item"
+					:key="bindex">
+					{{index==1 && bindex > 0?'¥':''}}{{bitem}}{{bindex > 0 ?unitArr[index] : ''}}
+				</view>
+			</view>
+		</scroll-view>
+
+		<view class="space-footer"></view>
+
+		<uni-popup ref="show_rule_item" type="center" :maskClick="false">
+			<view class="common-popup-content fill-base pd-lg radius-34">
+				<view class="title">规则说明</view>
+				<view class="f-desc c-title mt-lg">
+					在折算周期（T）内，{{$t('action.attendantName')}}完成以下维度的考核指标后，{{$t('action.attendantName')}}可以在T+1个周期按照该等级算提成比例，例如折算周期为每月，{{$t('action.attendantName')}}在这个月内完成了多少，会在月底30号系统核算，满足某个等级标准之后，会在下一个月的1号生效
+					<view class="mt-sm flex-1">
+						最低业绩：{{$t('action.attendantName')}}服务的所有服务订单和加钟订单，不包含车费。
+					</view>
+					<view class="mt-sm flex-1">
+						加钟率：加钟订单金额/最低业绩
+					</view>
+					<view class="mt-sm flex-1">
+						服务时长：{{$t('action.attendantName')}}接单服务的时间
+					</view>
+					<view class="mt-sm flex-1">
+						在线时长：{{$t('action.attendantName')}}在线工作的时间
+					</view>
+					<view class="mt-sm flex-1">
+						积分：若储值返佣设置勾选了返积分，则{{$t('action.attendantName')}}邀请用户充值将获得积分，积分和金额按照1:1比例换算
+					</view>
+				</view>
+				<view class="button">
+					<view @tap.stop="$refs.show_rule_item.close()" class="item-child c-base"
+						:style="{background: primaryColor,color:'#fff'}">知道了</view>
+				</view>
+			</view>
+		</uni-popup>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		data() {
+			return {
+				isLoad: false,
+				options: {},
+				currentIndex: 0,
+				curLevelInd: 0,
+				levelList: [],
+				countList: [{
+					key: 'coach_price',
+					text: '本期业绩'
+				}, {
+					key: 'coach_integral',
+					text: '本期积分'
+				}, {
+					key: 'coach_add_balance',
+					text: '本期加钟率',
+					unit: '%'
+				}, {
+					key: 'coach_time_long',
+					text: '本期服务时长(分钟)'
+				}, {
+					key: 'online_time',
+					text: '本期在线时长(小时)'
+				}],
+				ruleList: [],
+				unitArr: [],
+				coach_level: {}
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			userInfo: state => state.user.userInfo,
+			location: state => state.user.location,
+		}),
+		async onLoad(options) {
+			this.$util.showLoading()
+			await this.initIndex()
+			this.isLoad = true
+		},
+		methods: {
+			...mapActions(['getUserInfo']),
+			...mapMutations(['updateUserItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				let data = await this.$api.technician.coachLevel()
+
+				let {
+					coach_level,
+					level_list,
+					coach_level_show = 1
+				} = data
+
+				level_list.map(item => {
+					let {
+						differ_time_long,
+						differ_online_time,
+						differ_price,
+						differ_add_price,
+						differ_integral
+					} = item.data
+					let differ_text = []
+					if (differ_time_long || differ_online_time || differ_price || differ_add_price ||
+						differ_integral) {
+						differ_text = [`还差`]
+						if (differ_time_long) {
+							differ_text.push(`${differ_time_long}分钟服务时长`)
+						}
+						if (differ_online_time) {
+							differ_text.push(`${differ_online_time}小时在线时长`)
+						}
+						if (differ_price) {
+							differ_text.push(`${differ_price}业绩`)
+						}
+						if (differ_add_price) {
+							differ_text.push(`${differ_add_price}元加钟订单额`)
+						}
+						if (differ_integral) {
+							differ_text.push(`${differ_integral}积分`)
+						}
+						differ_text.push(`可升级`)
+					}
+					item.data.differ_text = differ_text
+				})
+
+				let ruleList = [
+					['等级'],
+					['最低业绩'],
+					['加钟率'],
+					['服务时长'],
+					['在线时长'],
+					['积分'],
+				]
+				let arr = ['title', 'price', 'add_balance', 'time_long', 'online_time', 'integral']
+				let unitArr = ['', '', '%', '分钟', '小时', '']
+				if (coach_level_show == 1) {
+					ruleList.push(['分成比例'])
+					arr.push('balance')
+					unitArr.push('%')
+				}
+				arr.map((item, index) => {
+					level_list.map(aitem => {
+						let datas = item === 'time_long' ? `${aitem.lower}至${aitem[item]}` : aitem[
+							item]
+						ruleList[index].push(datas)
+					})
+				})
+				let {
+					id = 0
+				} = coach_level
+				let ind = level_list.findIndex(item => {
+					return item.id == id
+				})
+				this.currentIndex = ind
+				this.curLevelInd = ind
+				this.ruleList = ruleList
+				this.levelList = level_list
+				this.unitArr = unitArr
+				this.coach_level = coach_level
+				this.isLoad = true
+				this.$util.hideAll()
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			swiperChange(e) {
+				this.currentIndex = e.detail.current
+			},
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	page {
+		background: #19212C;
+	}
+
+	.pages-technician-level {
+
+
+		.image-container {
+			width: 750rpx;
+			height: 504rpx;
+
+			.swiper-item {
+				width: 750rpx;
+				height: 504rpx;
+
+				.level-line-info {
+					height: 120rpx;
+
+					.icon-level-line {
+						top: 30rpx;
+						left: 0;
+						font-size: 94rpx;
+						z-index: -1;
+					}
+
+					.list-item {
+						width: 33.33%;
+
+						.line-tag {
+							.tag-lg {
+								width: 16px;
+								height: 16px;
+								border-radius: 50%;
+								background: rgba(255, 255, 255, 0.3);
+
+								.tag-md {
+									width: 10px;
+									height: 10px;
+									border-radius: 50%;
+									background: rgba(255, 255, 255, 0.7);
+								}
+							}
+
+						}
+
+						.line-tag.left,
+						.line-tag.right {
+							margin-top: 48rpx;
+						}
+
+						.line-tag.center {
+							margin-top: 4rpx;
+						}
+
+						.line-tag.center {
+							.tag-lg {
+								width: 26px;
+								height: 26px;
+								border-radius: 50%;
+
+								.tag-md {
+									width: 18px;
+									height: 18px;
+									border-radius: 50%;
+
+									.tag-sm {
+										width: 14px;
+										height: 14px;
+										border-radius: 50%;
+									}
+								}
+							}
+						}
+
+						.line-text {
+							font-size: 20rpx;
+							color: #E5F4F5;
+						}
+
+						.text-tag {
+							margin-top: 16rpx;
+							min-width: 70rpx;
+							height: 38rpx;
+							padding: 4rpx;
+							border-radius: 8rpx;
+
+							.square-tag {
+								top: -4rpx;
+								left: 50%;
+								margin-left: -8rpx;
+								width: 16rpx;
+								height: 16rpx;
+								transform: rotate(45deg);
+
+								.square-mini {
+									width: 8rpx;
+									height: 8rpx;
+								}
+							}
+
+							.tag-text {
+								font-size: 20rpx;
+								height: 30rpx;
+								border-radius: 6rpx;
+							}
+						}
+					}
+				}
+			}
+		}
+
+
+
+		.count-list {
+			white-space: nowrap;
+			width: 710rpx;
+			height: 160rpx;
+			background: rgba(255, 255, 255, 0.05);
+			border-radius: 16rpx;
+
+			.list-item {
+				display: inline-block;
+				width: 30%;
+				margin-top: 34rpx;
+
+				.num {
+					font-size: 38rpx;
+				}
+
+				.text {
+					font-size: 22rpx;
+					color: #7E8DA3;
+					margin-top: 5rpx;
+				}
+			}
+		}
+
+		.rule-list {
+			white-space: nowrap;
+			width: 670rpx;
+			background: rgba(255, 255, 255, 0.05);
+			border-radius: 16rpx;
+
+			.list-item {
+				display: inline-block;
+				font-size: 26rpx;
+
+				.title {
+					width: 190rpx;
+					height: 108rpx;
+					color: #E5EBF5;
+				}
+
+				.text {
+					width: 190rpx;
+					height: 95rpx;
+					color: #7E8DA3;
+				}
+			}
+		}
+
+		.iconshuyi_shuoming {
+			font-size: 34rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/technician/pages/order/detail.vue b/technician/pages/order/detail.vue
new file mode 100644
index 0000000..a82c794
--- /dev/null
+++ b/technician/pages/order/detail.vue
@@ -0,0 +1,1137 @@
+<template>
+	<view class="order-pages" v-if="detail.id">
+		<!-- 开始服务倒计时 -->
+		<view class="fix" style="top:-100%;left: -100%;" v-if="detail.pay_type==6">
+			<!-- <min-countdown @end="toCountDownEnd(detail.id)" :targetTime="detail.start_service_time_unix * 1000"
+				:isPlay="true"></min-countdown> -->
+		</view>
+
+		<view class="item-child  pd-lg fill-base f-paragraph c-base" :style="{background:primaryColor}">
+			<view class="text-bold">{{statusType[detail.pay_type]}}</view>
+			<view class="f-caption mt-sm" v-if="detail.pay_type == 1 && detail.end_time > 0">请在<min-countdown
+					:targetTime="over_time_text" @callback="countEnd"></min-countdown>内完成支付，逾期未支付，订单将自动取消</view>
+			<view class="space-lg"></view>
+		</view>
+
+		<!-- // pay_type 1待支付，2待服务，3技-师接单，4技-师出发，5技-师到达，6服务中，7服务完成，8待评价 -->
+		<view
+			class="menu-list flex-warp rel ml-lg mr-lg pt-lg pb-lg pl-md pr-md fill-base f-paragraph c-caption radius-16"
+			:class="[{'add-bell':detail.is_add || detail.store_id}]">
+			<view class="menu-line abs b-1px-b"></view>
+			<block v-for="(item,index) in lineList" :key="index">
+				<view class="item-child flex-center flex-column f-icontext c-paragraph"
+					:style="{color:detail.pay_type > item.pay_type -1?primaryColor:''}" v-if="item.icon">
+					<view class="item-img fill-base flex-center mb-sm radius"
+						:style="{borderColor:detail.pay_type > item.pay_type -1?primaryColor:''}">
+						<i class="iconfont" :class="item.icon"></i>
+					</view>
+					<view class="ellipsis" style="max-width:100%">{{item.title}}</view>
+				</view>
+			</block>
+		</view>
+
+
+		<view class="item-child mt-md ml-lg mr-lg pd-lg fill-base radius-16">
+			<view class="flex-between pb-lg">
+				<view class="f-paragraph c-title max-380 ellipsis">服务内容</view>
+			</view>
+			<view class="flex-warp" :class="[{'mb-lg':aindex != detail.order_goods.length -1}]"
+				v-for="(aitem,aindex) in detail.order_goods" :key="aindex">
+				<!-- #ifdef H5 -->
+				<view class="avatar lg radius-16">
+					<view class="h5-image avatar lg radius-16"
+						:style="{ backgroundImage : `url('${aitem.goods_cover}')`}">
+					</view>
+				</view>
+				<!-- #endif -->
+				<!-- #ifndef H5 -->
+				<image mode="aspectFill" class="avatar lg radius-16" :src="aitem.goods_cover"></image>
+				<!-- #endif -->
+				<view class="flex-1 ml-md">
+					<view class="flex-between">
+						<view class="f-mini-title c-title text-bold ellipsis"
+							:class="[{'max-300':aitem.refund_num>0},{'max-450':aitem.refund_num == 0}]">
+							{{aitem.goods_name}}
+						</view>
+						<view class="f-caption c-warning" v-if="aitem.refund_num>0">已退x{{aitem.refund_num}}</view>
+					</view>
+					<view class="f-caption c-caption mt-md">服务时长：{{aitem.time_long}}分钟</view>
+					<view class="f-caption c-caption" v-if="aitem.material_price*1>0">物料费：¥{{aitem.material_price}}
+					</view>
+					<view class="flex-between">
+						<view class="flex-y-baseline f-caption c-warning">¥<view class="f-title text-bold">
+								{{aitem.price}}
+							</view>
+						</view>
+						<view class="c-paragraph">x{{aitem.num}}</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="store-info mt-md ml-lg mr-lg pd-lg  fill-base radius-16" v-if="detail.store_id">
+			<view class="f-mini-title c-title text-bold pb-md">
+				{{detail.store_info.title}}
+			</view>
+			<view class="flex-between">
+				<view class="flex-y-center" style="color: #303030;">
+					<i class="iconfont icondizhi1 mr-sm"></i>
+					<view class="c-title flex-1 mr-md">
+						<span>{{detail.store_info.address || `暂未设置门店地址`}}</span>
+						<span @tap.stop="$util.goUrl({url:detail.store_info.address,openType:'copy'})"
+							class="copy-btn span f-icontext ml-sm radius-5"
+							:style="{color:primaryColor,borderColor:primaryColor}"
+							v-if="detail.store_info.address">复制</span>
+					</view>
+				</view>
+				<view class="flex-center">
+					<view @tap.stop="$util.goUrl({url:detail.store_info.phone,openType:'call'})"
+						class="item-icon rel flex-center radius-16">
+						<view class="item-icon radius-16 abs" :style="{background:primaryColor}"></view>
+						<i class="iconfont icondadianhua_1" :style="{color:primaryColor}"></i>
+					</view>
+					<view @tap.stop="toMap('store_info')" class="item-icon rel flex-center radius-16 ml-md"
+						v-if="detail.store_info.address">
+						<view class="item-icon radius-16 abs" :style="{background:primaryColor}"></view>
+						<i class="iconfont icondizhi_1" :style="{color:primaryColor}"></i>
+					</view>
+				</view>
+			</view>
+		</view>
+
+
+		<view class="mt-md ml-lg mr-lg pd-lg fill-base f-paragraph c-caption radius-16">
+			<view class="flex-between">
+				<view>下单人</view>
+				<view class="flex-y-center">
+					<view class="c-title max-350 ellipsis">{{detail.address_info.user_name}}</view>
+					<view @tap.stop="toLabel" class="ml-sm" :style="{color:primaryColor}">查看标签
+					</view>
+				</view>
+			</view>
+			<view @tap="toTel" class="flex-between mt-md">
+				<view>联系方式</view>
+				<view class="flex-y-center" :style="{color:primaryColor}">
+					<i class="iconfont iconbodadianhua mr-sm"></i>
+					<view>拨打电话</view>
+				</view>
+			</view>
+			<view class="mt-md" v-if="!detail.store_id">
+				<view>服务地址</view>
+				<view class="flex-center">
+					<view class="c-title mt-sm flex-1 mr-md">
+						<span>{{`${detail.address_info.address}${detail.address_info.address_info}`}}</span>
+						<span @tap="toCopy" class="copy-btn fill radius-5 f-icontext ml-sm">复制</span>
+					</view>
+					<view @tap="toMap('address_info')" class="flex-center flex-column f-icontext"
+						:style="{color:primaryColor}">
+						<i class="iconfont icon-dingwei" style="font-size: 42rpx;"></i>
+						<view>立刻导航去</view>
+					</view>
+				</view>
+			</view>
+			<view class="mt-md" v-if="detail.text">
+				<view>订单备注</view>
+				<view class="c-title mt-sm">{{detail.text}}</view>
+			</view>
+		</view>
+
+		<view class="mt-md ml-lg mr-lg pd-lg fill-base f-paragraph c-caption radius-16">
+			<view class="flex-between mt-md">
+				<view>下单时间</view>
+				<view class="c-title">{{detail.create_time}}</view>
+			</view>
+			<view class="flex-between mt-md">
+				<view>服务时间</view>
+				<view class="c-title">{{detail.start_time}}</view>
+			</view>
+			<view class="flex-between mt-md">
+				<view>服务时长</view>
+				<view class="c-title">{{detail.time_long}}分钟</view>
+			</view>
+			<block v-if="!detail.is_add && !detail.store_id">
+				<view class="flex-between mt-md">
+					<view>车费详情</view>
+					<view class="flex-y-center c-title">{{carType[detail.car_type]}}
+						<view class="ml-md" v-if="detail.car_type == 1">全程{{detail.distance}}</view>
+					</view>
+				</view>
+				<view class="flex-between mt-md" v-if="detail.car_type == 1">
+					<view>出行费用</view>
+					<view class="c-warning">出租车 ¥{{detail.car_price}}</view>
+				</view>
+			</block>
+			<view class="flex-between mt-md">
+				<view>服务项目费用</view>
+				<view class="c-warning">¥{{detail.init_service_price}}</view>
+			</view>
+			<view class="flex-between mt-md" v-if="detail.material_price*1>0">
+				<view>物料费</view>
+				<view class="c-warning">¥{{detail.material_price}}</view>
+			</view>
+			<view class="flex-between mt-md" v-if="detail.discount*1 > 0">
+				<view>卡券优惠</view>
+				<view class="c-warning">-¥{{detail.discount}}</view>
+			</view>
+			<view class="flex-between mt-md">
+				<view>支付方式</view>
+				<view class="c-title">{{payType[detail.pay_model]}}</view>
+			</view>
+			<view class="flex-between mt-md pt-md b-1px-t">
+				<view></view>
+				<view class="flex-y-baseline c-title">总计：<view class="c-warning">¥{{detail.pay_price}}</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="mt-md ml-lg mr-lg pd-lg fill-base f-paragraph c-caption radius-16">
+			<view class=" flex-y-center pb-lg flex-warp">
+				<view class="flex-between c-title">订单编号：</view>
+				<view class="flex-between flex-1 ">
+					<view class="c-title">{{detail.order_code}}</view>
+					<view class="copy-btn flex-center text-center f-icontext radius-5"
+						@tap.stop="$util.goUrl({openType:'copy',url:detail.order_code})"
+						:style="{borderColor:primaryColor ,color:primaryColor}">复制</view>
+				</view>
+			</view>
+			<timeline :list="lineList" :info="detail"></timeline>
+		</view>
+
+		<view class="space-max-footer"></view>
+		<view class="footer-info fix fill-base"
+			v-if="statusPayType.includes(detail.pay_type) || (detail.pay_type == 7 && !detail.is_add && !detail.label_time)">
+			<view class="flex-between pd-lg">
+				<view></view>
+				<view class="flex-center f-desc c-title">
+					<!-- // pay_type 2待接单，5待服务，6服务中，7服务完成 -->
+					<!-- 待接单 -->
+					<block v-if="detail.pay_type == 2">
+						<button @tap.stop="toTel" class="clear-btn order">联系客户</button>
+						<button @tap.stop="toRefuse" class="clear-btn order">拒绝接单</button>
+						<button @tap.stop="toConfirm(3)" class="clear-btn order"
+							:style="{color:'#fff',background:primaryColor,borderColor:primaryColor}">确认接单</button>
+					</block>
+					<!-- 待服务 -->
+					<block v-if="[3,4,5].includes(detail.pay_type)">
+						<button  class="clear-btn order" :style="{color:'#fff',background:primaryColor,borderColor:primaryColor}" @tap.stop="orderPass()" v-if="detail.user_sure_arrival == 0 && detail.arrive_time != 0 && detail.start_service_time == 0">客户爽约</button>
+						<button @tap.stop="toTel" class="clear-btn order">联系客户</button>
+						<button @tap.stop="toConfirm(detail.is_add || detail.store_id  ? 6 : detail.pay_type*1+1 )"
+					       :class="{isActiveBack:isPayType}"
+							class="clear-btn order"
+							:style="{color:'#fff',background:primaryColor,borderColor:primaryColor}">{{detail.is_add || detail.store_id ? '开始服务' : detail.pay_type == 3 ? '已出发': detail.pay_type == 4 ?'拍照确认到达' : '开始服务'}}</button>
+					</block>
+					<!-- 服务中 -->
+					<block v-if="detail.pay_type == 6">
+						<button @tap.stop="toTel" class="clear-btn order">联系客户</button>
+						<button @tap.stop="toConfirm(7)" class="clear-btn order"
+							:style="{color:'#fff',background:primaryColor,borderColor:primaryColor}">拍照完成服务</button>
+					</block>
+					<!-- 已完成 -->
+					<block v-if="detail.pay_type == 7">
+						<button
+							@tap.stop="$util.goUrl({url:`/technician/pages/order/label?id=${detail.id}&uid=${detail.user_id}`})"
+							class="clear-btn order"
+							:style="{color:'#fff',background:primaryColor,borderColor:primaryColor}">评价客户</button>
+
+					</block>
+				</view>
+			</view>
+			<view class="space-safe"></view>
+		</view>
+
+		<uni-popup ref="label_item" type="bottom" :custom="true">
+			<view class="popup-label fill-base pd-lg rel">
+				<i @tap.stop="$refs.label_item.close()" class="iconfont iconguanbi abs"></i>
+				<view class="pb-md flex-center f-title c-title text-bold">客户标签</view>
+				<view class="space-lg"></view>
+				<view class="space-lg"></view>
+				<scroll-view scroll-y style="width: 100%;max-height:50vh;">
+					<view class="list-item f-caption">
+						<view class="pb-lg f-paragraph" v-if="check_label.length==0">暂无评价标签</view>
+						<view class="list-child cur radius rel" v-for="(item,index) in check_label" :key="index">
+							<view class="bg-item radius abs"
+								:style="{background:primaryColor,borderColor:primaryColor}">
+							</view>
+							<view class="tag-item flex-center" :style="{color:primaryColor}">{{item.title}}</view>
+						</view>
+					</view>
+				</scroll-view>
+				<view class="space-safe"></view>
+			</view>
+		</uni-popup>
+
+		<uni-popup ref="refuse_item" type="center" :custom="true">
+			<view class="common-popup-content fill-base pd-lg radius-34">
+				<view class="title">拒绝接单</view>
+				<view class="desc">请确认是否拒接接单</view>
+				<textarea v-model="coach_refund_text" class="pd-lg textarea f-desc c-title mt-lg radius-20"
+					maxlength="200" placeholder="请输入拒单原因" placeholder-class="f-desc c-caption"></textarea>
+				<view class="flex-center mt-md" style="width: 540rpx">
+					<view class="flex-1"></view>
+					<view>{{coach_refund_text.length>200?200:coach_refund_text.length}}/200</view>
+				</view>
+				<view class="button">
+					<view @tap.stop="$refs.refuse_item.close()" class="item-child">取消</view>
+					<view @tap.stop="confirmRefuse" class="item-child c-base"
+						:style="{background: primaryColor,color:'#fff'}">确定</view>
+				</view>
+			</view>
+		</uni-popup>
+
+
+
+		<uni-popup ref="oper_item" type="center" :custom="true">
+			<view class="common-popup-content fill-base pd-lg radius-34">
+				<view class="title">{{popupInfo.title}}</view>
+				<view class="space-md"></view>
+				<view class="flex-warp mt-md" style="width: 100%;" v-if="popupInfo.type !== 4">
+					<view>拍照打卡：</view>
+					<view class="flex-1">
+						<upload @upload="imgUpload" @del="imgUpload" :imagelist="popupInfo.imgs" filetype="picture"
+							imgtype="imgs" text="拍摄图片" :imgsize="1" :sourceType="2">
+						</upload>
+					</view>
+				</view>
+				<view class="flex-warp mt-md" style="width: 100%;">
+					<view>当前地点：</view>
+					<view @tap.stop="toGetLocation" class="flex-1"
+						:class="[{'c-title':popupInfo.location.address},{'c-caption':!popupInfo.location.address}]">
+						{{popupInfo.location.address || '点击获取定位'}}
+					</view>
+				</view>
+				<view class="button">
+					<view @tap.stop="$refs.oper_item.close()" class="item-child">取消</view>
+					<view @tap.stop="confirmOper" class="item-child c-base"
+						:style="{background: primaryColor,color:'#fff'}">确定</view>
+				</view>
+			</view>
+		</uni-popup>
+
+
+		<!-- #ifdef H5 -->
+		<!-- <block v-if="configInfo.plugAuth.recording && configInfo.service_recording_show">
+			<mumu-recorder ref="recorder" @success='handlerSuccess' @error='handlerError'></mumu-recorder>
+		</block> -->
+		<!-- #endif -->
+
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	import timeline from '@/components/timeline.vue'
+	// #ifdef H5
+	import MumuRecorder from '@/uni_modules/mumu-recorder/components/mumu-recorder/mumu-recorder.vue'
+	// #endif
+	// #ifndef H5
+	var recorderManager = null;
+	var timer = null
+	// #endif
+	export default {
+		components: {
+			timeline
+			// #ifdef H5
+			,
+			MumuRecorder
+			// #endif
+		},
+		data() {
+			return {
+				options: {},
+				statusPayType: [2, 3, 4, 5, 6],
+				statusType: {
+					'-1': '已拒单',
+					2: '待接单',
+					3: '已接单',
+					4: '已出发',
+					5: '已到达',
+					6: '服务中',
+					7: '已完成',
+				},
+				carType: {
+					0: '公交/地铁',
+					1: '出租车'
+				},
+				payType: {
+					1: '微信支付',
+					2: '余额支付',
+					3: '支付宝支付'
+				},
+				lineList: [],
+				base_service: [{
+					pay_type: 3,
+					title: this.$t('action.attendantName') + '接单',
+					time: 'receiving_time',
+					icon: 'iconjishijiedan'
+				}, {
+					pay_type: 4,
+					title: this.$t('action.attendantName') + '出发',
+					time: 'serout_time',
+					icon: 'iconjishichufa'
+				}, {
+					pay_type: 5,
+					title: this.$t('action.attendantName') + '到达',
+					time: 'arrive_time',
+					icon: 'iconjishidaoda'
+				}, {
+					pay_type: 6,
+					title: '开始服务',
+					time: 'start_service_time',
+					icon: 'iconjishifuwu'
+				}, {
+					pay_type: 7,
+					title: '服务完成',
+					time: 'order_end_time',
+					icon: 'iconjishiwancheng'
+				}, {
+					pay_type: 7,
+					title: '签字确认',
+					time: 'sign_time',
+					icon: ''
+				}],
+				base_bell: [{
+					pay_type: 3,
+					title: this.$t('action.attendantName') + '接单',
+					time: 'receiving_time',
+					icon: 'iconjishijiedan'
+				}, {
+					pay_type: 6,
+					title: '开始服务',
+					time: 'start_service_time',
+					icon: 'iconjishifuwu'
+				}, {
+					pay_type: 7,
+					title: '服务完成',
+					time: 'order_end_time',
+					icon: 'iconjishiwancheng'
+				}],
+				detail: {
+					pay_type: 0
+				},
+				check_label: [],
+				coach_refund_text: '',
+				lockTap: false,
+				popupInfo: {
+					title: '',
+					type: '',
+					param: {},
+					imgs: [],
+					location: {
+						lat: 0,
+						lng: 0,
+						address: ''
+					}
+				},
+				isPayType:false,
+				// #ifndef H5
+				isReset: false,
+				duration_time: 600,
+				duration: ''
+				// #endif
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			recorder: state => state.order.recorder,
+			recorder_status: state => state.order.recorder_status,
+			recorder_order_id: state => state.order.recorder_order_id,
+			over_time_text() {
+				return new Date().getTime() + this.detail.end_time * 1000
+			}
+		}),
+		onLoad(options) {
+			this.options = options
+			this.initIndex()
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getCoachInfo', 'toPlayAudio']),
+			...mapMutations(['updateOrderItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				if (!this.configInfo.id || refresh) {
+					await this.getConfigInfo()
+				}
+				let {
+					id
+				} = this.options
+				let data = await this.$api.technician.orderInfo({
+					id
+				})
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				data.is_balance = data.balance * 1 > 0 ? 1 : 0
+				let {
+					pay_type,
+					time_long,
+					start_service_time,
+					is_add = 0,
+					store_id = 0
+				} = data
+				if (pay_type == 6) {
+					data.start_service_time_unix = this.$util.DateToUnix(start_service_time) + time_long * 60
+				}
+				let lineList = this.$util.deepCopy(is_add || store_id ? this.base_bell : this.base_service)
+				if (store_id) {
+					lineList.push({
+						pay_type: 7,
+						title: '签字确认',
+						time: 'sign_time',
+						icon: ''
+					})
+				}
+				this.lineList = lineList
+				this.detail = data
+				if(this.detail.arrive_time  != 0 && this.detail.start_service_time == 0 &&   this.detail.user_sure_arrival == 0){
+              this.isPayType = true
+				}
+
+				if (refresh) return
+				// #ifndef H5
+				// recorderManager = uni.getRecorderManager()
+				// //开始录音
+				// recorderManager.onStart(() => {
+				// 	this.$util.log('开始录音')
+				// 	this.recordingTimer()
+				// })
+				// //结束录音
+				// recorderManager.onStop((res) => {
+				// 	this.$util.log('结束录音', res)
+				// 	this.handlerOnSave(res)
+				// 	this.recordingTimer(false)
+				// 	let {
+				// 		duration
+				// 	} = res
+				// 	let currentTime = parseInt(duration / 1000)
+				// 	let isReset = this.duration_time * 1 - currentTime > 1 ? false : true
+				// 	// console.log(this.duration_time, currentTime, isReset, "===========hhhhhhhhhhhh")
+				// 	this.isReset = isReset
+				// 	if (isReset) {
+				// 		this.handlerOnChanger()
+				// 	}
+				// })
+				// // 录音异常
+				// recorderManager.onError((e) => {
+				// 	this.$util.log('录音异常', e)
+				// 	this.updateOrderItem({
+				// 		key: 'recorder_status',
+				// 		val: false
+				// 	})
+				// })
+				// #endif
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			countEnd() {
+				this.$util.log("倒计时完了")
+				setTimeout(() => {
+					this.initRefresh()
+					this.$util.back()
+				}, 1000)
+			},
+			// 开始录音
+			async handlerOnChanger() {
+				// #ifndef H5
+				await this.$util.checkAuth({
+					type: "record"
+				});
+				// #endif
+				let {
+					recorder_status,
+					duration_time
+				} = this
+				if (recorder_status) {
+					// #ifdef H5
+					this.$refs.recorder.stop()
+					// #endif
+					// #ifndef H5
+					recorderManager.stop()
+					// #endif
+				} else {
+					// #ifdef H5
+					this.$refs.recorder.start()
+					// #endif
+					// #ifndef H5
+					recorderManager.start({
+						format: 'mp3',
+						duration: duration_time * 1000,
+					})
+					// #endif
+				}
+				this.updateOrderItem({
+					key: 'recorder_status',
+					val: !recorder_status
+				})
+			},
+			async handlerOnEnd() {
+				// #ifdef H5
+				this.$refs.recorder.stop()
+				setTimeout(() => {
+					this.handlerOnSave()
+				}, 200)
+				// #endif
+				// #ifndef H5
+				recorderManager.stop()
+				// #endif
+				this.updateOrderItem({
+					key: 'recorder_status',
+					val: false
+				})
+			},
+			async handlerOnSave(res = {}) {
+				let filePath = ''
+				let unix = parseInt(new Date().getTime() / 1000)
+				let name = `服务过程录音-${unix}.mp3`
+				// #ifdef H5
+				let {
+					localUrl
+				} = this.recorder
+				filePath = localUrl
+				// #endif
+				// #ifndef H5
+				let {
+					tempFilePath,
+				} = res
+				filePath = tempFilePath
+				// #endif
+
+				let {
+					attachment_path: link
+				} = await this.$api.base.uploadFile({
+					filePath,
+					formData: {
+						type: 'audio',
+						name
+					}
+				})
+				let {
+					recorder_order_id: order_id
+				} = this
+				await this.$api.technician.recordingAdd({
+					order_id,
+					link
+				})
+				this.updateOrderItem({
+					key: 'recorder_order_id',
+					val: 0
+				})
+				// #ifdef H5
+				this.$refs.recorder.chunks = []
+				// #endif
+			},
+			// #ifdef H5
+			handlerSuccess(res) {
+				this.updateOrderItem({
+					key: 'recorder',
+					val: res
+				})
+			},
+			handlerError(code) {
+				switch (code) {
+					case '101':
+						uni.showModal({
+							content: '当前浏览器版本较低，请更换浏览器使用，推荐在微信中打开。'
+						})
+						break;
+					case '201':
+						uni.showModal({
+							content: '麦克风权限被拒绝，请刷新页面后授权麦克风权限。'
+						})
+						break
+					default:
+						uni.showModal({
+							content: '未知错误，请刷新页面重试'
+						})
+						break
+				}
+			},
+			// #endif
+			// #ifndef H5
+			recordingTimer(flag = true) {
+				if (flag) {
+					//将计时器赋值给timer
+					if (timer) return
+					timer = setInterval(() => {
+						let {
+							duration
+						} = this
+						duration++
+						// console.log(timer, duration, "======duration")
+						this.duration = duration
+					}, 1000);
+				} else {
+					clearInterval(timer)
+					timer = null
+					console.log("暂停计时 recordingTimer", timer)
+				}
+			},
+			// #endif
+			// 服务倒计时结束
+			toCountDownEnd(id) {
+				let {
+					recorder_status,
+					recorder_order_id
+				} = this
+				if (recorder_order_id == id && recorder_status) {
+					this.handlerOnEnd()
+				}
+			},
+			async toLabel() {
+				let {
+					user_id
+				} = this.detail
+				this.check_label = await this.$api.technician.userLabelList({
+					user_id
+				})
+				this.$refs.label_item.open()
+			},
+			// 拒绝接单
+			async toRefuse() {
+				this.coach_refund_text = ''
+				this.$refs.refuse_item.open()
+			},
+			// 确认：拒绝接单
+			async confirmRefuse() {
+				let {
+					coach_refund_text
+				} = this
+				coach_refund_text = coach_refund_text.length > 0 ? coach_refund_text.replace(/(^\s*)|(\s*$)/g,
+					"") : ''
+				if (coach_refund_text.length == 0) {
+					this.$util.showToast({
+						title: `请输入拒单原因`
+					})
+					return
+				}
+				this.coach_refund_text = this.coach_refund_text.substring(0, 200)
+				this.toConfirm(-1)
+			},
+			// 获取定位
+			async toGetLocation() {
+				let {
+					lat: loca_lat = 0,
+					lng: loca_lng = 0,
+					address: loca_addr = ''
+				} = this.popupInfo
+				if (loca_lat && loca_lng && loca_addr) return
+				// #ifdef H5
+				if (this.$jweixin.isWechat()) {
+					this.$util.showLoading()
+					await this.$jweixin.wxReady2();
+					let {
+						latitude: lat = 0,
+						longitude: lng = 0
+					} = await this.$jweixin.getWxLocation()
+					if (!lat) {
+						this.$util.hideAll()
+						this.$util.showToast({
+							title: `请授权定位当前地址`
+						})
+						return
+					}
+					if (lat && lng) {
+						let key = `${lat},${lng}`
+						let data = await this.$api.base.getMapInfo({
+							location: key
+						})
+						let {
+							status,
+							result
+						} = JSON.parse(data)
+						if (status == 0) {
+							this.$util.hideAll()
+							let {
+								address
+							} = result
+							this.popupInfo.location = {
+								lat,
+								lng,
+								address
+							}
+						}
+					}
+				}
+				// #endif
+				// #ifndef H5
+				this.$util.showLoading()
+				let {
+					lat = '',
+						lng = '',
+						address = ''
+				} = await this.$util.getBmapLocation()
+				if (!lat) {
+					this.$util.hideAll()
+					this.$util.showToast({
+						title: `请授权定位当前地址`
+					})
+					return
+				}
+				this.popupInfo.location = {
+					lat,
+					lng,
+					address
+				}
+				this.$util.hideAll()
+				// #endif
+			},
+			imgUpload(e) {
+				let {
+					imagelist,
+					imgtype
+				} = e;
+				this.popupInfo[imgtype] = imagelist;
+			},
+			// 确认： 4已出发/5已到达/7服务完成
+			confirmOper() {
+				let popupInfo = this.$util.deepCopy(this.popupInfo)
+				let {
+					type,
+					param,
+					imgs,
+					location
+				} = popupInfo
+				let {
+					lat = 0, lng = 0, address = ''
+				} = location
+				if ([5, 7].includes(type) && imgs.length === 0) {
+					this.$util.showToast({
+						title: `请先拍照`
+					})
+					return
+				}
+				if (!lat && !lng && !address) {
+					this.$util.showToast({
+						title: `请先获取当前定位地址`
+					})
+					return
+				}
+				if ([5, 7].includes(type)) {
+					let {
+						path
+					} = imgs[0]
+					location.path = path
+				}
+				this.toConfirmUpdate(type, param, location)
+			},
+			// type: -1拒绝接单，3确定接单，4已出发，5已到达，6开始服务，7完成服务
+			async toConfirm(type) {
+				let {
+					id: order_id,
+				} = this.detail
+				let param = {
+					order_id,
+					type
+				}
+				if (type == -1) {
+					param.coach_refund_text = this.coach_refund_text
+				}
+
+				if ([4, 5, 7].includes(type)) {
+					let arr = {
+						4: '确认出发',
+						5: '确认到达',
+						7: '确认完成',
+					}
+					let title = arr[type]
+					this.popupInfo = Object.assign({}, this.popupInfo, {
+						title,
+						type,
+						param,
+						imgs: [],
+						location: {
+							lat: 0,
+							lng: 0,
+							address: ''
+						}
+					})
+					// #ifndef MP-WEIXIN
+					await this.toGetLocation()
+					// #endif
+					this.$refs.oper_item.open()
+				} else {
+					this.toConfirmUpdate(type, param)
+				}
+			},
+			async   orderPass(){
+				console.log("11",this.detail.id)
+				let param ={
+					order_id:this.detail.id,
+					status:-1
+				}
+				try {
+		          let res  = await this.$api.technician.breakThePromiseOrder(param)
+			
+				  if(res.code == 200){
+						this.$util.showToast({
+					title: `提交成功`
+				})
+                       this.initIndex()
+					  }else{
+						this.$util.showToast({
+					title: `该订单已提交请勿重复提交`
+				})
+					  }
+					
+				
+			
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+					return
+				}
+			},
+			async toConfirmUpdate(type, param, location = {}) {
+				if ([4, 5, 7].includes(type)) {
+					let {
+						lat,
+						lng,
+						address,
+						path
+					} = location
+					if (type === 4) {
+						param.serout_lat = lat
+						param.serout_lng = lng
+						param.serout_address = address
+					}
+					if (type == 5) {
+						param.arrive_img = path
+						param.arr_lat = lat
+						param.arr_lng = lng
+						param.arr_address = address
+					}
+					if (type == 7) {
+						param.end_img = path
+						param.end_lat = lat
+						param.end_lng = lng
+						param.end_address = address
+					}
+				}
+				let msg = {
+					'-1': '已拒绝接单',
+					3: '接单成功',
+					4: '已成功出发',
+					5: '已成功到达',
+					6: '已开始服务',
+					7: '服务已完成'
+				}
+				if (this.lockTap) return;
+				this.lockTap = true;
+				this.$util.showLoading()
+
+
+
+				let {
+					plugAuth,
+					service_recording_show
+				} = this.configInfo
+				let {
+					recording
+				} = plugAuth
+
+				let {
+					recorder_order_id,
+					recorder_status
+				} = this
+
+				let flag = true
+
+				// if (type === 6 && recorder_order_id && recorder_status) {
+				// 	let [res_del, {
+				// 		confirm
+				// 	}] = await uni.showModal({
+				// 		title: '提示',
+				// 		content: "已有开始的服务还未结束录音，请确认是否完成录音并开始新的服务？"
+				// 	})
+				// 	if (confirm) {
+				// 		this.handlerOnEnd()
+				// 	} else {
+				// 		flag = false
+				// 	}
+				// }
+
+				// if (!flag) {
+				// 	this.lockTap = false
+				// 	this.$util.hideAll()
+				// 	return
+				// }
+
+				let {
+					order_id
+				} = param
+
+				try {
+					await this.$api.technician.updateOrder(param)
+					if (type == -1) {
+						this.$refs.refuse_item.close()
+					}
+					if ([4, 5, 7].includes(type)) {
+						this.$refs.oper_item.close()
+					}
+					if (type == 7) {
+						await this.getCoachInfo()
+					}
+					this.$util.hideAll()
+					this.$util.showToast({
+						title: msg[type]
+					})
+					this.lockTap = false;
+					this.initRefresh()
+					this.$util.back()
+					if (type == 6) {
+						// this.toPlayAudio({
+						// 	key: 'service_start_recording'
+						// })
+						// if (recording && service_recording_show) {
+						// 	let [res_del, {
+						// 		confirm
+						// 	}] = await uni.showModal({
+						// 		title: '提示',
+						// 		content: "服务过程将自动录音，直至服务结束！",
+						// 		showCancel: false,
+						// 		confirmText: '知道了'
+						// 	})
+						// 	if (confirm) {
+						// 		this.handlerOnChanger()
+						// 		this.updateOrderItem({
+						// 			key: 'recorder_order_id',
+						// 			val: order_id
+						// 		})
+						// 	}
+						// }
+					}
+					if (type == 7) {
+						if (recorder_order_id == order_id && recorder_status) {
+							this.handlerOnEnd()
+						}
+					}
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+					return
+				}
+			},
+			// 咨询
+			async toTel() {
+				let {
+					id: order_id,
+					pay_type
+				} = this.detail
+				if ([2, 3, 4, 5, 6].includes(pay_type)) {
+					let url = await this.$api.technician.getVirtualPhone({
+						order_id
+					})
+					this.$util.goUrl({
+						url,
+						openType: `call`
+					})
+				} else {
+					let msg = pay_type == 7 ? '服务结束' : '服务取消'
+					this.$util.showToast({
+						title: `${msg}不能联系客户哦`
+					})
+				}
+			},
+			// 复制定位
+			toCopy() {
+				let {
+					address,
+					address_info
+				} = this.detail.address_info
+				let url = `${address}${address_info}`
+				this.$util.goUrl({
+					url,
+					openType: 'copy'
+				})
+			},
+			// 查看定位
+			async toMap(key) {
+				let {
+					address,
+					address_info = '',
+					lat,
+					lng
+				} = this.detail[key]
+				await this.$util.checkAuth({
+					type: 'userLocation'
+				})
+				await uni.getLocation({
+					type: 'gcj02',
+				})
+				await uni.openLocation({
+					latitude: lat * 1,
+					longitude: lng * 1,
+					name: address_info ? `${address} ${address_info}` : address,
+					scale: 28
+				})
+			},
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.popup-label {
+		border-radius: 16rpx 16rpx 0 0;
+
+		.iconguanbi {
+			top: 32rpx;
+			right: 28rpx;
+			color: #A8AEB8;
+			font-size: 40rpx;
+		}
+
+		.list-item {
+
+			.list-child {
+				width: auto;
+				min-width: 120rpx;
+				height: 70rpx;
+				display: inline-block;
+				padding: 0 20rpx;
+				margin: 0 20rpx 25rpx 0;
+
+				.tag-item {
+					height: 70rpx;
+
+					.icon-add {
+						font-size: 24rpx;
+						margin-right: 5rpx;
+					}
+				}
+
+				.bg-item {
+					top: 0;
+					left: 0;
+					width: 100%;
+					height: 100%;
+					opacity: 0.15;
+				}
+
+			}
+		}
+
+	
+	}	.isActiveBack{
+			background:rgba(168, 174, 184,0.4) !important;
+			border:1px solid rgba(168, 174, 184,0.4) !important;
+		}
+</style>
\ No newline at end of file
diff --git a/technician/pages/order/label.vue b/technician/pages/order/label.vue
new file mode 100644
index 0000000..33bcb00
--- /dev/null
+++ b/technician/pages/order/label.vue
@@ -0,0 +1,188 @@
+<template>
+	<view class="pages-technician-label">
+
+		<view class="flex-y-center pd-lg">
+			<view class="f-title c-title text-bold">推荐标签</view>
+			<view class="f-caption c-caption ml-md">点击添加标签</view>
+		</view>
+
+		<view class="list-item ml-lg mr-lg f-caption">
+			<view v-if="base_label.length==0">暂无标签</view>
+			<view @tap="toAddDel(1,index)" class="list-child radius"
+				:style="{color:item.is_select === 1 ? '#CBCBCB' : '#666'}"
+				v-for="(item,index) in base_label" :key="index">
+				<view class="tag-item flex-center">
+					<i class="iconfont icon-add"></i>
+					<view>{{item.title}}</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="flex-y-center pd-lg mt-lg">
+			<view class="f-title c-title text-bold">已选标签</view>
+		</view>
+		<view class="list-item ml-lg mr-lg f-caption">
+			<view v-if="check_label.length==0">暂无选中标签</view>
+			<view @tap="toAddDel(2,index)" class="list-child cur radius rel" style="border: none;"
+				v-for="(item,index) in check_label" :key="index">
+				<view class="bg-item radius abs" :style="{background:primaryColor,borderColor:primaryColor}"></view>
+				<i class="iconfont icon-guanbi-fill abs"></i>
+				<view class="tag-item flex-center" :style="{color:primaryColor}">{{item.title}}</view>
+			</view>
+		</view>
+
+		<view class="space-max-footer"></view>
+
+		<fix-bottom-button @confirm="submitForm" :text="[{text:'确定',type:'confirm'}]" bgColor="#fff">
+		</fix-bottom-button>
+
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+	} from 'vuex';
+	export default {
+		data() {
+			return {
+				options: {},
+				base_label: [],
+				check_label: []
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor
+		}),
+		async onLoad(options) {
+			this.options = options
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+			this.initIndex()
+		},
+		methods: {
+			...mapActions([]),
+			async initIndex() {
+				let data = await this.$api.technician.labelList()
+				data.map(item => {
+					item.selected = 0
+				})
+				this.base_label = data
+			},
+			toAddDel(type, index) {
+				let base_label = this.$util.deepCopy(this.base_label)
+				if (type == 1) {
+					let {
+						is_select
+					} = base_label[index]
+					if (is_select == 1) return
+					base_label[index].is_select = 1
+					this.base_label = base_label
+					let check_label = base_label.filter(item => {
+						return item.is_select == 1
+					})
+					this.check_label = check_label
+					return
+				}
+				let check_label = this.$util.deepCopy(this.check_label)
+				let {
+					id
+				} = check_label[index]
+				let ind = base_label.findIndex(item => {
+					return item.id == id
+				})
+				base_label[ind].is_select = 0
+				this.base_label = base_label
+				check_label.splice(index, 1)
+				this.check_label = check_label
+			},
+			async submitForm() {
+				let label = this.check_label.map(item => {
+					return item.id
+				})
+				if (label.length == 0) {
+					this.$util.showToast({
+						title: '请选中标签'
+					})
+					return
+				}
+				let {
+					id,
+					uid,
+				} = this.options
+				let param = {
+					order_id: id,
+					user_id: uid,
+					label
+				}
+				this.$util.showLoading();
+				await this.$api.technician.userLabelAdd(param);
+				this.$util.hideAll();
+				this.$util.showToast({
+					title: '评价成功'
+				})
+				this.$util.back()
+				setTimeout(() => {
+					this.$util.goUrl({
+						url: 1,
+						openType: `navigateBack`
+					})
+				}, 1000)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background: #fff;
+	}
+
+	.pages-technician-label {
+		.list-item {
+
+			.list-child {
+				width: auto;
+				min-width: 120rpx;
+				height: 70rpx;
+				display: inline-block;
+				padding: 0 20rpx;
+				margin: 0 18rpx 23rpx 0;
+				border: 1rpx solid #E5E5E5;
+
+				.tag-item {
+					height: 70rpx;
+
+					.icon-add {
+						font-size: 24rpx;
+						margin-right: 5rpx;
+					}
+				}
+
+				.bg-item {
+					top: 0;
+					left: 0;
+					width: 100%;
+					height: 100%;
+					opacity: 0.15;
+				}
+
+				.icon-guanbi-fill {
+					top: -10rpx;
+					right: 2rpx;
+					color: #B5BCC8;
+					font-size: 28rpx;
+				}
+
+			}
+
+			.cur {
+				margin: 0 20rpx 28rpx 0;
+			}
+		}
+	}
+</style>
diff --git a/technician/pages/order/list.vue b/technician/pages/order/list.vue
new file mode 100644
index 0000000..553266d
--- /dev/null
+++ b/technician/pages/order/list.vue
@@ -0,0 +1,914 @@
+<template>
+	<view class="order-pages">
+		<view class="fix" style="top:-100%;left:-100%">
+			
+			<!-- <min-countdown @end="toCountDownEnd(item.id)" :targetTime="item.start_service_time_unix * 1000"
+				:isPlay="true" v-for="(item,index) in unix_list" :key="index">
+			</min-countdown> -->
+		</view>
+		<fixed>
+			<tab @change="handerTabChange" :list="tabList" :activeIndex="activeIndex*1" :activeColor="primaryColor"
+				:width="100/tabList.length + '%'" height="100rpx"></tab>
+			<view class="b-1px-b"></view>
+		</fixed>
+
+		<view @tap.stop="goDetail(index)" class="item-child mt-md ml-lg mr-lg pd-lg fill-base radius-16 rel"
+			v-for="(item,index) in list.data" :key="index">
+			<view v-if="item.is_add">
+				<view class="bell-tag flex-center f-icontext c-base abs" :style="{background:primaryColor}">加钟服务
+				</view>
+				<view class="space-md"></view>
+			</view>
+			<view @tap.stop="goShop(index)" class="flex-between pb-lg">
+				<view class="f-paragraph c-title max-500 ellipsis">订单号：{{item.order_code}}</view>
+				<view class="f-caption text-bold"
+					:style="{color:item.pay_type==2?primaryColor: [3,4,5].includes(item.pay_type)?subColor: item.pay_type == 6 ? '#11C95E' : '#333'}">
+					{{statusType[item.pay_type]}}
+				</view>
+			</view>
+			<view class="flex-center mb-lg" v-for="(aitem,aindex) in item.order_goods" :key="aindex">
+				<!-- #ifdef H5 -->
+				<view class="avatar lg radius-16">
+					<view class="h5-image avatar lg radius-16"
+						:style="{ backgroundImage : `url('${aitem.goods_cover}')`}">
+					</view>
+				</view>
+				<!-- #endif -->
+				<!-- #ifndef H5 -->
+				<image mode="aspectFill" class="avatar lg radius-16" :src="aitem.goods_cover"></image>
+				<!-- #endif -->
+
+				<view class="flex-1 ml-md">
+					<view class="flex-between">
+						<view class="f-mini-title c-title text-bold ellipsis"
+							:class="[{'max-300':aitem.refund_num>0},{'max-450':aitem.refund_num==0}]">
+							{{aitem.goods_name}}
+						</view>
+						<view class="f-caption c-warning" v-if="aitem.refund_num>0">已退x{{aitem.refund_num}}</view>
+					</view>
+					<view class="f-caption c-caption mt-md">服务时间：{{item.start_time}}</view>
+					<view class="flex-between">
+						<view class="flex-y-baseline f-caption c-warning">¥<view class="f-title text-bold">
+								{{aitem.price}}
+							</view>
+						</view>
+						<view class="c-paragraph">x{{aitem.num}}</view>
+					</view>
+				</view>
+			</view>
+			<view class="flex-between pt-lg b-1px-t">
+				<view class="flex-y-center f-desc c-title">总计：
+					<view class="f-paragraph c-warning text-bold">¥{{item.pay_price}}</view>
+				</view>
+				<view class="flex-warp">
+					<!-- // pay_type 2待接单，5待服务，6服务中，7服务完成 -->
+					<!-- 待接单 -->
+					<block v-if="item.pay_type == 2">
+						<button @tap.stop="toRefuse(index)" class="clear-btn order">拒绝接单</button>
+						<button @tap.stop="toConfirm(index,3)" class="clear-btn order"
+							:style="{color:'#fff',background:primaryColor,borderColor:primaryColor}">确认接单</button>
+					</block>
+					<!-- 待服务 -->
+					<block v-if="[3,4,5].includes(item.pay_type)">
+						<button @tap.stop="toTel(index)" class="clear-btn order">联系客户</button>
+						<button @tap.stop="toConfirm(index, item.is_add || item.store_id ? 6 : item.pay_type*1+1 )"
+							class="clear-btn order"
+							:style="{color:'#fff',background:primaryColor,borderColor:primaryColor}">{{item.is_add || item.store_id ? '开始服务' : item.pay_type == 3 ? '已出发': item.pay_type == 4 ?'拍照确认到达' : '开始服务'}}</button>
+					</block>
+					<!-- 服务中 -->
+					<block v-if="item.pay_type == 6">
+						<button @tap.stop="toTel(index)" class="clear-btn order">联系客户</button>
+						<button @tap.stop="toConfirm(index,7)" class="clear-btn order"
+							:style="{color:'#fff',background:primaryColor,borderColor:primaryColor}">拍照完成服务</button>
+					</block>
+					<!-- 已完成 -->
+					<block v-if="item.pay_type == 7">
+						<button @tap.stop="toShield(index)" class="clear-btn order" v-if="item.can_shield">屏蔽Ta</button>
+						<button
+							@tap.stop="$util.goUrl({url:`/technician/pages/order/label?id=${item.id}&uid=${item.user_id}`})"
+							class="clear-btn order"
+							:style="{color:'#fff',background:primaryColor,borderColor:primaryColor}"
+							v-if="!item.is_add && !item.label_time">评价客户</button>
+					</block>
+				</view>
+			</view>
+		</view>
+
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+
+		<view class="space-footer"></view>
+
+		<uni-popup ref="refuse_item" type="center" :custom="true">
+			<view class="common-popup-content fill-base pd-lg radius-34">
+				<view class="title">拒绝接单</view>
+				<view class="desc">请确认是否拒接接单</view>
+				<textarea v-model="coach_refund_text" class="pd-lg textarea f-desc c-title mt-lg radius-20"
+					maxlength="200" placeholder="请输入拒单原因" placeholder-class="f-desc c-caption"></textarea>
+				<view class="flex-center mt-md" style="width: 540rpx">
+					<view class="flex-1"></view>
+					<view>{{coach_refund_text.length>200?200:coach_refund_text.length}}/200</view>
+				</view>
+				<view class="button">
+					<view @tap.stop="$refs.refuse_item.close()" class="item-child">取消</view>
+					<view @tap.stop="confirmRefuse" class="item-child c-base"
+						:style="{background: primaryColor,color:'#fff'}">确定</view>
+				</view>
+			</view>
+		</uni-popup>
+
+
+		<uni-popup ref="oper_item" type="center" :custom="true">
+			<view class="common-popup-content fill-base pd-lg radius-34">
+				<view class="title">{{popupInfo.title}}</view>
+				<view class="space-md"></view>
+				<view class="flex-warp mt-md" style="width: 100%;" v-if="popupInfo.type !== 4">
+					<view>拍照打卡：</view>
+					<view class="flex-1">
+						<upload @upload="imgUpload" @del="imgUpload" :imagelist="popupInfo.imgs" filetype="picture"
+							imgtype="imgs" text="拍摄图片" :imgsize="1" :sourceType="2">
+						</upload>
+					</view>
+				</view>
+				<view class="flex-warp mt-md" style="width: 100%;">
+					<view>当前地点：</view>
+					<view @tap.stop="toGetLocation" class="flex-1"
+						:class="[{'c-title':popupInfo.location.address},{'c-caption':!popupInfo.location.address}]">
+						{{popupInfo.location.address || '点击获取定位'}}
+					</view>
+				</view>
+				<view class="button">
+					<view @tap.stop="$refs.oper_item.close()" class="item-child">取消</view>
+					<view @tap.stop="confirmOper" class="item-child c-base"
+						:style="{background: primaryColor,color:'#fff'}">确定</view>
+				</view>
+			</view>
+		</uni-popup>
+
+
+
+		<uni-popup ref="shield_item" type="center" :custom="true">
+			<view class="common-popup-content fill-base pd-lg radius-34">
+				<view class="title">温馨提示</view>
+				<view class="desc">屏蔽客户之后，该客户将不能在列表看到您的信息，会影响你的接单，可以在{{$t('action.attendantName')}}端 -
+					屏蔽客户页面移除屏蔽客户，确认屏蔽吗？</view>
+				<view class="button">
+					<view @tap.stop="$refs.shield_item.close()" class="item-child">我再想想</view>
+					<view @tap.stop="confirmShield" class="item-child c-base"
+						:style="{background: primaryColor,color:'#fff'}">确定</view>
+				</view>
+			</view>
+		</uni-popup>
+
+
+		<!-- #ifdef H5 -->
+		<!-- <block v-if="configInfo.plugAuth.recording && configInfo.service_recording_show">
+			<mumu-recorder ref="recorder" @success='handlerSuccess' @error='handlerError'></mumu-recorder>
+		</block> -->
+		<!-- #endif -->
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	// #ifdef H5
+	// import MumuRecorder from '@/uni_modules/mumu-recorder/components/mumu-recorder/mumu-recorder.vue'
+	// #endif
+	// #ifndef H5
+	var recorderManager = null;
+	var timer = null
+	// #endif
+	export default {
+		components: {
+			// #ifdef H5
+			// MumuRecorder
+			// #endif
+		},
+		data() {
+			return {
+				options: {},
+				activeIndex: 0,
+				tabList: [{
+					// 	title: '全部',
+					// 	id: 0
+					// }, {
+					title: '待接单',
+					id: 2,
+					number: 0
+				}, {
+					title: '待服务',
+					id: 5,
+					number: 0
+				}, {
+					title: '服务中',
+					id: 6,
+					number: 0
+				}, {
+					title: '已完成',
+					id: 7,
+					number: 0
+				}],
+				statusType: {
+					2: '待接单',
+					3: '已接单',
+					4: '已出发',
+					5: '已到达',
+					6: '服务中',
+					7: '已完成',
+					8: '待转单'
+				},
+				param: {
+					page: 1,
+					pay_type: 0,
+				},
+				list: {
+					data: []
+				},
+				loading: true,
+				index: -1,
+				coach_refund_text: '',
+				lockTap: false,
+				popupInfo: {
+					title: '',
+					index: '',
+					type: '',
+					param: {},
+					imgs: [],
+					location: {
+						lat: 0,
+						lng: 0,
+						address: ''
+					}
+				},
+				unix_list: [],
+				// #ifndef H5
+				isReset: false,
+				duration_time: 600,
+				duration: ''
+				// #endif
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			// recorder: state => state.order.recorder,
+			// recorder_status: state => state.order.recorder_status,
+			// recorder_order_id: state => state.order.recorder_order_id,
+		}),
+		async onLoad(options) {
+			this.options = options
+			let {
+				tab = 0
+			} = options
+			this.activeIndex = tab
+			this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getCoachInfo', 'toPlayAudio']),
+			...mapMutations(['updateOrderItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				if (!this.configInfo.id || refresh) {
+					await this.getConfigInfo()
+				}
+				await this.getList()
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				if (refresh) return
+				// #ifndef H5
+				// recorderManager = uni.getRecorderManager()
+				// //开始录音
+				// recorderManager.onStart(() => {
+				// 	this.$util.log('开始录音')
+				// 	this.recordingTimer()
+				// })
+				// //结束录音
+				// recorderManager.onStop((res) => {
+				// 	this.$util.log('结束录音', res)
+				// 	this.handlerOnSave(res)
+				// 	this.recordingTimer(false)
+				// 	let {
+				// 		duration
+				// 	} = res
+				// 	let currentTime = parseInt(duration / 1000)
+				// 	let isReset = this.duration_time * 1 - currentTime > 1 ? false : true
+				// 	// console.log(this.duration_time, currentTime, isReset, "===========hhhhhhhhhhhh")
+				// 	this.isReset = isReset
+				// 	if (isReset) {
+				// 		this.handlerOnChanger()
+				// 	}
+				// })
+				// // 录音异常
+				// recorderManager.onError((e) => {
+				// 	this.$util.log('录音异常', e)
+				// 	this.updateOrderItem({
+				// 		key: 'recorder_status',
+				// 		val: false
+				// 	})
+				// })
+				// #endif
+			},
+			initRefresh() {
+				uni.pageScrollTo({
+					duration: 0,
+					scrollTop: 0
+				})
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			async getList(flag = false) {
+				let {
+					list: oldList,
+					param,
+					tabList,
+					activeIndex
+				} = this
+				param.pay_type = tabList[activeIndex].id
+				let newList = await this.$api.technician.orderList(param)
+
+				if (!flag) {
+					if (this.param.page == 1) {
+						this.list = newList
+					} else {
+						newList.data = oldList.data.concat(newList.data)
+						this.list = newList
+					}
+				}
+
+				this.tabList[0].number = newList.agent_order_count
+				this.tabList[1].number = newList.wait_order_count
+				this.tabList[2].number = newList.service_order_count
+				this.loading = false
+				this.$util.hideAll()
+			},
+			handerTabChange(index) {
+				this.activeIndex = index;
+				this.$util.showLoading()
+				this.param.page = 1;
+				this.getList()
+			},
+			// 开始录音
+			async handlerOnChanger() {
+				// #ifndef H5
+				await this.$util.checkAuth({
+					type: "record"
+				});
+				// #endif
+				let {
+					recorder_status,
+					duration_time
+				} = this
+				if (recorder_status) {
+					// #ifdef H5
+					this.$refs.recorder.stop()
+					// #endif
+					// #ifndef H5
+					recorderManager.stop()
+					// #endif
+				} else {
+					// #ifdef H5
+					this.$refs.recorder.start()
+					// #endif
+					// #ifndef H5
+					recorderManager.start({
+						format: 'mp3',
+						duration: duration_time * 1000,
+					})
+					// #endif
+				}
+				this.updateOrderItem({
+					key: 'recorder_status',
+					val: !recorder_status
+				})
+			},
+			async handlerOnEnd() {
+				// #ifdef H5
+				this.$refs.recorder.stop()
+				setTimeout(() => {
+					this.handlerOnSave()
+				}, 200)
+				// #endif
+				// #ifndef H5
+				recorderManager.stop()
+				// #endif
+				this.updateOrderItem({
+					key: 'recorder_status',
+					val: false
+				})
+			},
+			async handlerOnSave(res = {}) {
+				let filePath = ''
+				let unix = parseInt(new Date().getTime() / 1000)
+				let name = `服务过程录音-${unix}.mp3`
+				// #ifdef H5
+				let {
+					localUrl
+				} = this.recorder
+				filePath = localUrl
+				// #endif
+				// #ifndef H5
+				let {
+					tempFilePath,
+				} = res
+				filePath = tempFilePath
+				// #endif
+
+				let {
+					attachment_path: link
+				} = await this.$api.base.uploadFile({
+					filePath,
+					formData: {
+						type: 'audio',
+						name
+					}
+				})
+				let {
+					recorder_order_id: order_id
+				} = this
+				await this.$api.technician.recordingAdd({
+					order_id,
+					link
+				})
+				this.updateOrderItem({
+					key: 'recorder_order_id',
+					val: 0
+				})
+				// #ifdef H5
+				this.$refs.recorder.chunks = []
+				// #endif
+			},
+			// #ifdef H5
+			handlerSuccess(res) {
+				this.updateOrderItem({
+					key: 'recorder',
+					val: res
+				})
+			},
+			handlerError(code) {
+				switch (code) {
+					case '101':
+						uni.showModal({
+							content: '当前浏览器版本较低，请更换浏览器使用，推荐在微信中打开。'
+						})
+						break;
+					case '201':
+						uni.showModal({
+							content: '麦克风权限被拒绝，请刷新页面后授权麦克风权限。'
+						})
+						break
+					default:
+						uni.showModal({
+							content: '未知错误，请刷新页面重试'
+						})
+						break
+				}
+			},
+			// #endif
+			// #ifndef H5
+			recordingTimer(flag = true) {
+				if (flag) {
+					//将计时器赋值给timer
+					if (timer) return
+					timer = setInterval(() => {
+						let {
+							duration
+						} = this
+						duration++
+						// console.log(timer, duration, "======duration")
+						this.duration = duration
+					}, 1000);
+				} else {
+					clearInterval(timer)
+					timer = null
+					console.log("暂停计时 recordingTimer", timer)
+				}
+			},
+			// #endif
+			// 服务倒计时结束
+			toCountDownEnd(id) {
+				let {
+					recorder_status,
+					recorder_order_id
+				} = this
+				if (recorder_order_id == id && recorder_status) {
+					this.handlerOnEnd()
+				}
+			},
+			// 拒绝接单
+			async toRefuse(index) {
+				this.index = index
+				this.coach_refund_text = ''
+				this.$refs.refuse_item.open()
+			},
+			// 确认：拒绝接单
+			async confirmRefuse() {
+				let {
+					coach_refund_text
+				} = this
+				coach_refund_text = coach_refund_text.length > 0 ? coach_refund_text.replace(/(^\s*)|(\s*$)/g, "") : ''
+				if (coach_refund_text.length == 0) {
+					this.$util.showToast({
+						title: `请输入拒单原因`
+					})
+					return
+				}
+				this.coach_refund_text = this.coach_refund_text.substring(0, 200)
+				let {
+					index,
+				} = this
+				this.toConfirm(index, -1)
+			},
+			// 获取定位
+			async toGetLocation() {
+				let {
+					lat: loca_lat = 0,
+					lng: loca_lng = 0,
+					address: loca_addr = ''
+				} = this.popupInfo
+				if (loca_lat && loca_lng && loca_addr) return
+				// #ifdef H5
+				if (this.$jweixin.isWechat()) {
+					this.$util.showLoading()
+					await this.$jweixin.wxReady2();
+					let {
+						latitude: lat = 0,
+						longitude: lng = 0
+					} = await this.$jweixin.getWxLocation()
+					if (!lat) {
+						this.$util.hideAll()
+						this.$util.showToast({
+							title: `请授权定位当前地址`
+						})
+						return
+					}
+					if (lat && lng) {
+						let key = `${lat},${lng}`
+						let data = await this.$api.base.getMapInfo({
+							location: key
+						})
+						let {
+							status,
+							result
+						} = JSON.parse(data)
+						if (status == 0) {
+							this.$util.hideAll()
+							let {
+								address
+							} = result
+							this.popupInfo.location = {
+								lat,
+								lng,
+								address
+							}
+						}
+					}
+				}
+				// #endif
+				// #ifndef H5
+				this.$util.showLoading()
+				let {
+					lat = '',
+						lng = '',
+						address = ''
+				} = await this.$util.getBmapLocation()
+				if (!lat) {
+					this.$util.hideAll()
+					this.$util.showToast({
+						title: `请授权定位当前地址`
+					})
+					return
+				}
+				this.popupInfo.location = {
+					lat,
+					lng,
+					address
+				}
+				this.$util.hideAll()
+				// #endif
+			},
+			imgUpload(e) {
+				let {
+					imagelist,
+					imgtype
+				} = e;
+				this.popupInfo[imgtype] = imagelist;
+			},
+			// 确认： 4已出发/5已到达/7服务完成
+			confirmOper() {
+				let popupInfo = this.$util.deepCopy(this.popupInfo)
+				let {
+					index,
+					type,
+					param,
+					imgs,
+					location
+				} = popupInfo
+
+				let {
+					lat = 0, lng = 0, address = ''
+				} = location
+				if ([5, 7].includes(type) && imgs.length === 0) {
+					this.$util.showToast({
+						title: `请先拍照`
+					})
+					return
+				}
+				if (!lat && !lng && !address) {
+					this.$util.showToast({
+						title: `请先获取当前定位地址`
+					})
+					return
+				}
+				if ([5, 7].includes(type)) {
+					let {
+						path
+					} = imgs[0]
+					location.path = path
+				}
+				this.toConfirmUpdate(index, type, param, location)
+			},
+			// type: -1拒绝接单，3确定接单，4已出发，5已到达，6开始服务，7服务完成
+			async toConfirm(index, type) {
+				let {
+					id: order_id,
+				} = this.list.data[index]
+				let param = {
+					order_id,
+					type,
+				}
+				if (type == -1) {
+					param.coach_refund_text = this.coach_refund_text
+				}
+				if ([4, 5, 7].includes(type)) {
+					let arr = {
+						4: '确认出发',
+						5: '确认到达',
+						7: '确认完成',
+					}
+					let title = arr[type]
+					this.popupInfo = Object.assign({}, this.popupInfo, {
+						title,
+						index,
+						type,
+						param,
+						imgs: [],
+						location: {
+							lat: 0,
+							lng: 0,
+							address: ''
+						}
+					})
+					// #ifndef MP-WEIXIN
+					await this.toGetLocation()
+					// #endif
+					this.$refs.oper_item.open()
+				} else {
+					this.toConfirmUpdate(index, type, param)
+				}
+			},
+			async toConfirmUpdate(index, type, param, location = {}) {
+				if ([4, 5, 7].includes(type)) {
+					let {
+						lat,
+						lng,
+						address,
+						path
+					} = location
+					if (type === 4) {
+						param.serout_lat = lat
+						param.serout_lng = lng
+						param.serout_address = address
+					}
+					if (type == 5) {
+						param.arrive_img = path
+						param.arr_lat = lat
+						param.arr_lng = lng
+						param.arr_address = address
+					}
+					if (type == 7) {
+						param.end_img = path
+						param.end_lat = lat
+						param.end_lng = lng
+						param.end_address = address
+					}
+				}
+				let msg = {
+					'-1': '已拒绝接单',
+					3: '接单成功',
+					4: '已成功出发',
+					5: '已成功到达',
+					6: '已开始服务',
+					7: '服务已完成'
+				}
+				if (this.lockTap) return;
+				// this.lockTap = true;
+				this.$util.showLoading()
+
+				let {
+					plugAuth,
+					service_recording_show
+				} = this.configInfo
+				let {
+					recording
+				} = plugAuth
+
+				let {
+					recorder_order_id,
+					recorder_status
+				} = this
+
+				let flag = true
+
+				// if (type === 6 && recorder_order_id && recorder_status) {
+				// 	let [res_del, {
+				// 		confirm
+				// 	}] = await uni.showModal({
+				// 		title: '提示',
+				// 		content: "已有开始的服务还未结束录音，请确认是否完成录音并开始新的服务？"
+				// 	})
+				// 	if (confirm) {
+				// 		this.handlerOnEnd()
+				// 	} else {
+				// 		flag = false
+				// 	}
+				// }
+
+				// if (!flag) {
+				// 	this.lockTap = false
+				// 	this.$util.hideAll()
+				// 	return
+				// }
+
+				let {
+					order_id
+				} = param
+
+				try {
+					await this.$api.technician.updateOrder(param)
+					if (type == -1) {
+						this.$refs.refuse_item.close()
+					}
+					if ([4, 5, 7].includes(type)) {
+						this.$refs.oper_item.close()
+					}
+					this.$util.showToast({
+						title: msg[type]
+					})
+					if (type == 4 || type == 5) {
+						this.list.data[index].pay_type = type
+					} else {
+						this.list.data.splice(index, 1)
+						if (type == 7) {
+							await this.getCoachInfo()
+						}
+					}
+					this.lockTap = false;
+					this.$util.hideAll()
+					if (type == 6) {
+						// this.toPlayAudio({
+						// 	key: 'service_start_recording'
+						// })
+						// if (recording && service_recording_show) {
+						// 	let [res_del, {
+						// 		confirm
+						// 	}] = await uni.showModal({
+						// 		title: '提示',
+						// 		content: "服务过程将自动录音，直至服务结束！",
+						// 		showCancel: false,
+						// 		confirmText: '知道了'
+						// 	})
+						// 	if (confirm) {
+						// 		this.handlerOnChanger()
+						// 		this.updateOrderItem({
+						// 			key: 'recorder_order_id',
+						// 			val: order_id
+						// 		})
+						// 	}
+						// }
+						let {
+							time_long,
+							start_service_time
+						} = await this.$api.technician.orderInfo({
+							id: order_id
+						})
+						let start_service_time_unix = this.$util.DateToUnix(start_service_time) +
+							time_long * 60
+						this.unix_list.push({
+							id: order_id,
+							time_long,
+							start_service_time,
+							start_service_time_unix
+						})
+					}
+					if (type == 7) {
+						if (recorder_order_id == order_id && recorder_status) {
+							// this.handlerOnEnd()
+						}
+						let ind = this.unix_list.findIndex(item => {
+							return item.id == order_id
+						})
+						if (ind !== -1) {
+							this.unix_list.splice(ind, 1)
+						}
+					}
+					await this.getList(true)
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+					return
+				}
+			},
+			// 屏蔽用户
+			toShield(index) {
+				this.index = index
+				this.$refs.shield_item.open()
+			},
+			// 确认：屏蔽用户
+			async confirmShield() {
+				let {
+					index
+				} = this
+				if (this.lockTap) return;
+				this.lockTap = true;
+				this.$util.showLoading()
+				let {
+					user_id
+				} = this.list.data[index]
+				try {
+					await this.$api.technician.shieldUserAdd({
+						user_id
+					})
+					this.lockTap = false
+					this.$util.hideAll()
+					this.$refs.shield_item.close()
+					this.$util.showToast({
+						title: `屏蔽成功`
+					})
+					this.initRefresh()
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+			},
+			// 联系客户
+			async toTel(index) {
+				let {
+					id
+				} = this.list.data[index]
+				let url = await this.$api.technician.getVirtualPhone({
+					order_id: id
+				})
+				this.$util.goUrl({
+					url,
+					openType: `call`
+				})
+			},
+			// 订单详情
+			goDetail(index) {
+				let {
+					id
+				} = this.list.data[index]
+				let url = `/technician/pages/order/detail?id=${id}`
+				this.$util.goUrl({
+					url
+				})
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+</style>
\ No newline at end of file
diff --git a/technician/pages/order/recorder.vue b/technician/pages/order/recorder.vue
new file mode 100644
index 0000000..565b190
--- /dev/null
+++ b/technician/pages/order/recorder.vue
@@ -0,0 +1,184 @@
+<template>
+	<view class="order-pages">
+
+		<view @tap.stop="handlerOnCahnger" class="pd-lg">H5 录音</view>
+		<view @tap.stop="handlerOnSave" class="pd-lg">保存录音文件</view>
+		<view>{{recorder}}</view>
+		---------------------------------------------------------------------------------------------------
+		<view v-if="recorder && recorder.data">
+			<view>data.data ---- {{recorder.data}}</view>
+			<view>data.type---------{{recorder.data.type || '------'}}</view>
+		</view>
+
+		<mumu-recorder ref='recorder' @success='handlerSuccess' @error='handlerError'></mumu-recorder>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	import MumuRecorder from '@/uni_modules/mumu-recorder/components/mumu-recorder/mumu-recorder.vue'
+	export default {
+		components: {
+			MumuRecorder
+		},
+		data() {
+			return {
+				options: {},
+				recorder: null,
+				recorder_status: false
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad(options) {
+			this.options = options
+			let {
+				tab = 0
+			} = options
+			this.activeIndex = tab
+			this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getCoachInfo', 'toPlayAudio']),
+			...mapMutations(['updateUserItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+
+				let data = {
+					"id": 824,
+					"uniacid": 666,
+					"openid": "oDG4342lxj6wUH73W7pKLzTTvL6w",
+					"nickName": "蕭萧",
+					"avatarUrl": "https:\/\/lbqnyv3.migugu.com\/image\/666\/23\/04\/ef3f58f161d24baca189988d6a874dff.jpeg",
+					"create_time": 1673263802,
+					"status": 1,
+					"cap_id": 0,
+					"city": "",
+					"country": "",
+					"gender": 0,
+					"language": "",
+					"province": "",
+					"balance": 94820.65,
+					"phone": "18284514093",
+					"session_key": "1Q5sSHtzYlhUFD1Y9eFDWw==",
+					"pid": 824,
+					"cash": 265.9,
+					"unionid": "o3fbU0SmMbQLD4BKPyxcoD1KhAko",
+					"app_openid": "oOxoV6NEt8Zl3P6lA7JWLH7NxMNc",
+					"web_openid": "oFcA90U0Dy1YtuX91vppB5_LYgio",
+					"wechat_openid": "oDG4342lxj6wUH73W7pKLzTTvL6w",
+					"last_login_type": 0,
+					"new_cash": "230.65",
+					"lock": 153,
+					"is_fx": 1,
+					"ios_openid": "0",
+					"push_id": "",
+					"alipay_number": "18284514093",
+					"alipay_name": "",
+					"ip": "222.211.238.65"
+				}
+				let autograph = "f99e8e0daa9fb6d3575e1a32a4b27c57"
+
+				this.updateUserItem({
+					key: 'isShowLogin',
+					val: false
+				})
+				this.updateUserItem({
+					key: 'userInfo',
+					val: data
+				})
+				this.updateUserItem({
+					key: 'autograph',
+					val: autograph
+				})
+			},
+			handlerOnCahnger() {
+				if (this.recorder_status) {
+					this.$refs.recorder.stop()
+				} else {
+					this.$refs.recorder.start()
+				}
+				this.recorder_status = !this.recorder_status
+			},
+			async handlerOnSave() {
+				console.log("======handlerOnSave")
+				let {
+					localUrl = ''
+				} = this.recorder
+				let unix = parseInt(new Date().getTime() / 1000)
+				let name = `服务过程录音-${unix}.mp3`
+
+				alert(unix)
+				alert(name)
+				
+				let {
+					attachment_path: link
+				} = await this.$api.base.uploadFile({
+					filePath: localUrl,
+					formData: {
+						type: 'audio',
+						name
+					}
+				})
+				alert(link)
+				this.recorder.url = link
+			},
+			handlerSuccess(res) {
+				console.log(res, "======handlerSuccess")
+				this.recorder = res
+			},
+			handlerError(code) {
+				switch (code) {
+					case '101':
+						uni.showModal({
+							content: '当前浏览器版本较低，请更换浏览器使用，推荐在微信中打开。'
+						})
+						break;
+					case '201':
+						uni.showModal({
+							content: '麦克风权限被拒绝，请刷新页面后授权麦克风权限。'
+						})
+						break
+					default:
+						uni.showModal({
+							content: '未知错误，请刷新页面重试'
+						})
+						break
+				}
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+</style>
\ No newline at end of file
diff --git a/technician/pages/shield.vue b/technician/pages/shield.vue
new file mode 100644
index 0000000..2b3b7b0
--- /dev/null
+++ b/technician/pages/shield.vue
@@ -0,0 +1,162 @@
+<template>
+	<view class="technician-shield" v-if="isLoad">
+		<view class="list-item flex-center fill-base mt-md ml-md mr-md pd-lg radius-16"
+			v-for="(item,index) in list.data" :key="index">
+			<view class="flex-1 mr-md">
+				<view class="f-title c-black text-bold max-380 ellipsis">{{item.nickName}}</view>
+				<view class="flex-y-center f-caption mt-md" style="color:#4D4D4D;margin-top:14rpx">拉黑时间：<view
+						class="c-caption">
+						{{item.create_time}}
+					</view>
+				</view>
+			</view>
+			<view @tap.stop="toRemove(index)" class="remove-btn flex-center f-desc"
+				:style="{color:primaryColor,border:`1rpx solid ${primaryColor}`}">移除列表</view>
+		</view>
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+		<view class="space-footer"></view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		data() {
+			return {
+				isLoad: false,
+				loading: true,
+				param: {
+					page: 1
+				},
+				list: {
+					data: []
+				},
+				lockTap: false
+
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad() {
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+			this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			...mapActions(['getConfigInfo']),
+			...mapMutations(['updateUserItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				await this.getList()
+				this.isLoad = true
+			},
+			handerTabChange(index) {
+				this.activeIndex = index
+				this.param.status = index
+				this.getList();
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			async getList() {
+				this.$util.showLoading()
+				let {
+					list: oldList,
+					param, 
+				} = this
+				let newList = await this.$api.technician.shieldCoachList(param)
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+			},
+			async toRemove(index) {
+				let {
+					id
+				} = this.list.data[index]
+				if (this.lockTap) return
+				this.lockTap = true
+				this.$util.showLoading()
+				try {
+					await this.$api.technician.shieldUserDel({
+						id
+					})
+					this.lockTap = false
+					this.$util.hideAll()
+					this.$util.showToast({
+						title: `移除成功`
+					})
+					this.list.data.splice(index, 1)
+					this.updateUserItem({
+						key: 'haveShieldOper',
+						val
+					})
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.technician-shield {
+		.list-item {
+			.avatar {
+				width: 124rpx;
+				height: 124rpx;
+			}
+
+			.text {
+				color: #4D4D4D;
+				margin-top: 6rpx;
+			}
+
+			.remove-btn {
+				width: 140rpx;
+				height: 52rpx;
+				border-radius: 8rpx;
+				transform: rotateZ(360deg);
+			}
+		}
+	}
+</style>
diff --git a/technician/pages/shop/detail.vue b/technician/pages/shop/detail.vue
new file mode 100644
index 0000000..2681297
--- /dev/null
+++ b/technician/pages/shop/detail.vue
@@ -0,0 +1,239 @@
+<template>
+	<view class="shop" v-if="isLoad">
+		<view class="shop-swiper">
+			<shopBanner :detail="shopInfo" :isShare="isShare" />
+		</view>
+		<view>
+			<view class="pd-lg fill-base flex-between rel" style="align-items: flex-end;">
+				<view>
+					<view class="f-sm-title text-bold c-black">{{shopInfo.name}}</view>
+					<view class="pt-md c-warning" style="line-height: 1;">
+						<text class="f-icontext">￥</text>
+						<text class="f-sm-title text-bold">{{shopInfo.price}}</text>
+					</view>
+				</view>
+				<!-- #ifdef MP-WEIXIN -->
+				<button class="flex-center share-btn abs" open-type="share">
+					<view class="iconfenxiang iconfont" style="font-size: 42rpx;" :style="{color:primaryColor}"></view>
+					<text class="f-icontext c-caption" style="padding-left: 6rpx;">分享</text>
+				</button>
+				<!-- #endif -->
+				<!-- #ifdef APP-PLUS -->
+				<view class="flex-center share-btn abs" @tap.stop="toAppShare">
+					<view class="iconfenxiang iconfont" style="font-size: 42rpx;" :style="{color:primaryColor}"></view>
+					<text class="f-icontext c-caption" style="padding-left: 6rpx;">分享</text>
+				</view>
+				<!-- #endif -->
+			</view>
+			<view class="mt-md fill-base pl-lg pr-lg">
+				<view class="f-mini-title c-black shop-box-title">商品详情</view>
+				<view class="fill-base pt-lg pb-lg">
+					<parser :html="shopInfo.desc" @linkpress="linkpress" show-with-animation lazy-load>加载中...</parser>
+				</view>
+				<!-- <rich-text :nodes="shopInfo.desc"></rich-text> -->
+			</view>
+		</view>
+		<view class="space-max-footer"></view>
+		<fix-bottom-button @confirm="$util.goUrl({url:shopInfo.phone ,openType:`call`})"
+			:text="[{type:'confirm',text:'联系平台'}]" bgColor="#fff">
+		</fix-bottom-button>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	import parser from "@/components/jyf-Parser/index"
+	import shopBanner from "@/components/shop-banner"
+	import siteInfo from '@/siteinfo.js';
+	export default {
+		components: {
+			parser,
+			shopBanner
+		},
+		data() {
+			return {
+				isLoad: false,
+				options: {},
+				shopInfo: {},
+				isShare: false
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+			isGzhLogin: state => state.user.isGzhLogin,
+		}),
+		onLoad(options) {
+			if (options.pid) {
+				this.isShare = true
+			}
+			this.options = options
+			this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh()
+			uni.stopPullDownRefresh()
+		},
+		onShareAppMessage() {
+			let {
+				id: pid = 0
+			} = this.userInfo
+			let {
+				id,
+				name: title,
+				cover: imageUrl
+			} = this.shopInfo
+			let path = `/technician/pages/shop/detail?id=${id}&pid=${pid}`
+			return {
+				title,
+				imageUrl,
+				path
+			}
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getUserInfo']),
+			initRefresh() {
+				this.initIndex(true)
+			},
+			async initIndex(refresh = false) {
+				let {
+					pid = 0
+				} = this.options
+				let {
+					isGzhLogin
+				} = this
+				let {
+					id: uid = 0
+				} = this.userInfo
+				if (pid && !uid) {
+					// #ifdef H5
+					if (isGzhLogin) {
+						setTimeout(() => {
+							this.getUserInfo()
+						}, 1000)
+					} else {
+						this.getUserInfo()
+					}
+					// #endif
+					// #ifndef H5
+					await this.getUserInfo()
+					// #endif 
+				}
+
+				if (!this.configInfo.id || refresh) {
+					await this.getConfigInfo()
+				}
+				await this.goodsInfoCall()
+				// #ifdef H5
+				if (this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					setTimeout(() => {
+						this.toAppShare()
+					}, 1200)
+				}
+				// #endif
+			},
+			async goodsInfoCall() {
+				this.$util.showLoading()
+				let {
+					id
+				} = this.options
+				this.shopInfo = await this.$api.technician.goodsInfo({
+					id
+				})
+				this.isLoad = true
+				this.$util.hideAll()
+			},
+			swiperChange(e) {},
+			linkpress(res) {
+				// #ifdef APP-PLUS
+				if (/http/.test(res.href))
+					this.$util.goUrl({
+						url: res.href,
+						openType: 'web'
+					})
+				// #endif
+			},
+			toAppShare() {
+				let {
+					id: pid = 0
+				} = this.userInfo
+				let {
+					id,
+					name: title,
+					cover: imageUrl
+				} = this.shopInfo
+				let summary = ''
+				let {
+					siteroot
+				} = siteInfo
+				let url = siteroot.split('/index.php')[0]
+				let href = `${url}/h5/#/technician/pages/shop/detail?id=${id}&pid=${pid}`
+
+				// #ifdef H5
+				this.$jweixin.wxReady(() => {
+					this.$jweixin.showOptionMenu()
+					this.$jweixin.shareAppMessage(title, summary, href, imageUrl)
+					this.$jweixin.shareTimelineMessage(title, href, imageUrl)
+				})
+				// #endif
+				// #ifdef APP-PLUS
+				uni.share({
+					provider: "weixin",
+					scene: 'WXSceneSession',
+					type: 0,
+					href,
+					title,
+					summary,
+					imageUrl,
+					success: function(res) {
+						console.log("success:" + JSON.stringify(res));
+					},
+					fail: function(err) {
+						console.log("fail:" + JSON.stringify(err));
+					}
+				});
+				// #endif
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.shop {
+		.shop-swiper {
+			height: 564rpx;
+		}
+
+		.shop-box-title {
+			line-height: 110rpx;
+			height: 110rpx;
+		}
+
+		.shop-box-item {
+			width: 100%;
+			height: 388rpx;
+
+			image {
+				vertical-align: bottom;
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.share-btn {
+			right: 30rpx;
+			bottom: 30rpx;
+			height: 42rpx;
+		}
+	}
+</style>
diff --git a/technician/pages/shop/list.vue b/technician/pages/shop/list.vue
new file mode 100644
index 0000000..cd796d1
--- /dev/null
+++ b/technician/pages/shop/list.vue
@@ -0,0 +1,357 @@
+<template>
+	<view class="shop" v-if="isLoad">
+		<fixed :zIndex="998">
+			<view class="shop-top rel">
+				<view class="abs shop-top-bgcolor" :style="{backgroundColor:primaryColor}"></view>
+				<view class="pl-md pr-md fill-base shop-search box-shadow pt-lg">
+					<search class="flex-1" @input="toSearch" type="input" :confirmSearch="false" :padding="0"
+						:keyword="param.name" :radius="30" placeholder="输入产品名称查询"></search>
+					<view class="shop-nav flex-y-center flex-between mt-lg">
+						<scroll-view scroll-x="true" class="flex-1 flex scroll-box" 
+							:scroll-left="scrollLeft" :scroll-with-animation="true">
+							<view @tap="toTabItemChange(index,item.id)" v-for="(item,index) in navList" :key="index"
+								class="scroll-item" 
+								:style="{ color: param.carte == item.id ? primaryColor : '#000'}">{{item.name}}</view>
+						</scroll-view>
+						<view class="flex-between shop-top-more" @tap="navMore">
+							<view class="ml-sm c-paragraph f-caption">更多</view>
+							<view class="icongengduo1 iconfont c-paragraph"></view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</fixed>
+		<view class="shop-list pl-sm pr-sm flex">
+			<block v-for="(item,index) in list.data" :key="index">
+				<view class="shop-item ml-sm mr-sm fill-base radius-16"
+					@tap.stop="$util.goUrl({url:`/technician/pages/shop/detail?id=${item.id}`})">
+					<view class="shop-item-image">
+						<image :src="item.cover" mode="aspectFill"></image>
+					</view>
+					<view class="pt-md pl-md pr-md">
+						<view class="shop-item-title f-desc ellipsis">{{item.name}}</view>
+						<view class="pt-sm c-warning">
+							<text class="f-caption">¥</text>
+							<text class="f-title text-bold">{{item.price}}</text>
+						</view>
+					</view>
+				</view>
+			</block>
+		</view>
+		<uni-popup ref="nav_more" type="top" :custom="true" :maskClick="false" top="124rpx">
+			<view class="fill-base more-box pl-lg pr-lg pt-lg">
+				<view class="more-box-title f-mini-title c-black text-bold">类别</view>
+				<scroll-view class="more-list flex flex-warp" :scroll-y="true">
+					<block v-for="(item,index) in navList" :key="index">
+						<view class="more-item mb-md rel ellipsis" :class="index % 3 > 0 ? 'ml-md' : ''"
+							@tap="toItemChange(index,item.id)">
+							<view class="more-item-bg abs"
+								:style="{backgroundColor: current.id == item.id ? primaryColor : '#F5F5F5'}">
+							</view>
+							<text class="text-center pl-sm pr-sm"
+								:style="{color: current.id == item.id ? primaryColor : '#000'}">{{item.name}}</text>
+						</view>
+					</block>
+				</scroll-view>
+				<view class="more-footer flex-center">
+					<view class="more-btn flex-center radius-16 c-black more-btn-reset f-paragraph mr-lg"
+						@tap="setNav(1)">重置</view>
+					<view class="more-btn flex-center radius-16 c-base f-paragraph"
+						:style="{backgroundColor: primaryColor}" @tap="setNav(2)">确定</view>
+				</view>
+			</view>
+		</uni-popup>
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+		<view class="space-footer"></view>
+	</view>
+</template>
+
+<script>
+	let play = null
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		data() {
+			return {
+				loading: true,
+				isLoad: false,
+				activeIndex: 0,
+				param: {
+					page: 1,
+					limit: 10,
+					name: '',
+					carte: 0
+				},
+				list: {
+					data: []
+				},
+				navList: [],
+				current: {
+					index: 0,
+					id: 0
+				},
+				scrollLeft: 0,
+				contentScrollW:0
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		async onLoad() {
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+			await this.carteListCall()
+			this.initIndex()
+		},
+		methods: {
+			async initIndex(refresh = false){
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				this.getList()
+			},
+			getScrollW() {
+				let query = uni.createSelectorQuery().in(this);
+				query.select('.scroll-box').boundingClientRect(data => {
+					// 拿到 scroll-view 组件宽度
+					this.contentScrollW = data.width
+				}).exec();
+
+				query.selectAll('.scroll-item').boundingClientRect(data => {
+					let dataLen = data.length;
+					for (let i = 0; i < dataLen; i++) {
+						//  scroll-view 子元素组件距离左边栏的距离
+						this.navList[i].left = data[i].left;
+						//  scroll-view 子元素组件宽度
+						this.navList[i].width = data[i].width
+					}
+				}).exec()
+			},
+			
+			toSearch(val) {
+				clearTimeout(play)
+				play = setTimeout(() => {
+					this.param.name = val
+					this.initRefresh()
+				}, 1000)
+			},
+			toTabItemChange(index, id) {
+				this.scrollLeft = this.navList[index].left - this.contentScrollW / 2 + this.navList[index].width / 2 - 20;
+				this.param.carte = id;
+				this.toItemChange(index, id)
+				this.initRefresh()
+			},
+			toItemChange(index, id) {
+				this.current = {
+					index,
+					id
+				}
+			},
+			navMore() {
+				this.$refs.nav_more.open()
+			},
+			setNav(index) {
+				if (index == 1) { //重置
+					this.param.name = ''
+					this.toTabItemChange(0, 0)
+				} else {
+					this.toTabItemChange(this.current.index, this.current.id)
+				}
+
+				this.$refs.nav_more.close()
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			async getList() {
+				this.$util.showLoading()
+				let {
+					list: oldList,
+					param,
+					activeIndex
+				} = this
+				let newList = await this.$api.technician.goodsList(param)
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.isLoad = true
+				this.$util.hideAll()
+			},
+			async carteListCall(type) {
+				this.navList = await this.$api.technician.carteList()
+				this.navList.unshift({
+					id: 0,
+					name: '全部'
+				})
+				if(type){
+					let flag = false
+					this.navList.forEach(item => {
+						if(item.id == this.param.carte){
+							flag = true
+						}
+					})
+					if(!flag){
+						this.toTabItemChange(0, 0)
+					}
+				}
+				setTimeout(()=>{this.getScrollW()},1000)
+			}
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			this.carteListCall(true)
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+	}
+</script>
+
+<style lang="scss">
+	.shop {
+		.shop-top {
+			padding-top: 10rpx;
+
+			.shop-top-bgcolor {
+				height: 60rpx;
+				top: 0;
+				left: 0;
+				width: 100%;
+				z-index: -1;
+			}
+
+			.scroll-box {
+				width: 100%;
+				overflow-x: auto;
+				white-space: nowrap;
+
+				.scroll-item {
+					padding-right: 40rpx;
+					position: relative;
+					display: inline-block;
+					vertical-align: top;
+				}
+			}
+
+			.shop-top-more {
+				width: 112rpx;
+				box-shadow: 0px 0px 5px #eee;
+				height: 94rpx;
+			}
+		}
+
+		.shop-search {
+			border-top-left-radius: 40rpx;
+			border-top-right-radius: 40rpx;
+			overflow: hidden;
+			margin-bottom: -2rpx;
+
+			.shop-top-time {
+				width: 70rpx;
+				height: 70rpx;
+
+				.shop-top-bg {
+					width: 70rpx;
+					height: 70rpx;
+					border-radius: 70rpx;
+					opacity: 0.1;
+				}
+			}
+		}
+
+		.shop-nav {
+			height: 94rpx;
+			overflow: hidden;
+		}
+
+		.shop-list {
+			flex-flow: wrap;
+
+			.shop-item {
+				width: calc(50% - 20rpx);
+				height: 483rpx;
+				overflow: hidden;
+				margin-top: 25rpx;
+
+				.shop-item-image {
+					height: 350rpx;
+					width: 100%;
+
+					image {
+						width: 100%;
+						height: 100%;
+					}
+				}
+			}
+		}
+
+		.more-box {
+			.more-list {
+				padding-top: 40rpx;
+				max-height: 290rpx;
+			}
+
+			.more-item {
+				width: calc((100% - 40rpx) / 3);
+				height: 78rpx;
+				background-color: #F5F5F5;
+				border-radius: 8rpx;
+				display: inline-block;
+				vertical-align: top;
+				text-align: center;
+				line-height: 78rpx;
+				overflow: hidden;
+
+				.more-item-bg {
+					width: 100%;
+					height: 100%;
+					opacity: 0.1;
+				}
+
+				text {
+					width: 100%;
+				}
+			}
+
+			.more-footer {
+				padding-top: 140rpx;
+				padding-bottom: 40rpx;
+
+				.more-btn {
+					width: 260rpx;
+					height: 72rpx;
+				}
+
+				.more-btn-reset {
+					background-color: #f2f2f2;
+				}
+			}
+		}
+	}
+</style>
diff --git a/technician/pages/time-manage.vue b/technician/pages/time-manage.vue
new file mode 100644
index 0000000..bbd4f40
--- /dev/null
+++ b/technician/pages/time-manage.vue
@@ -0,0 +1,294 @@
+<template>
+	<view class="technician-time-manage">
+
+		<view class="fill-base pd-lg flex-between">
+			<view class="flex-1 flex-y-baseline f-title c-title">是否接单<view class="f-paragraph ml-sm"
+					:style="{color:form.is_work==1?primaryColor:'#999'}">
+					{{form.is_work==1?'接单':'休息'}}
+				</view>
+			</view>
+			<view @tap.stop="toChangeItem">
+				<i class="iconfont icon-switch c-caption ml-sm" :class="[{'icon-switch-on':form.is_work==1}]"
+					:style="{ color: form.is_work==1 ? primaryColor : ''}"></i>
+			</view>
+		</view>
+
+		<view class="fill-base mt-md b-1px-b">
+			<view class="f-title c-title pd-lg">选择接单时间</view>
+		</view>
+		<view class="flex-center fill-base f-paragraph c-desc pt-lg pb-lg b-1px-b">
+			<view @tap.stop="toShowTime('start_time')" class="item-time flex-center flex-column">
+				<view>开始时间</view>
+				<view class="mt-sm" :style="{color:form.start_time ? primaryColor : '#999'}">
+					{{form.start_time || '选择时间'}}
+				</view>
+			</view>
+			<view @tap.stop="toShowTime('end_time')" class="item-time flex-center flex-column  b-1px-l">
+				<view>结束时间</view>
+				<view class="mt-sm" :style="{color:form.end_time ? primaryColor : '#999'}">
+					{{form | handleStartEndTime(toDay)}}{{form.end_time || '选择时间'}}
+				</view>
+			</view>
+		</view>
+		<view class="fill-base pb-lg" style="border-bottom-left-radius: 32rpx;border-bottom-right-radius: 32rpx;">
+			<view class="flex pl-md pr-md pt-lg pb-lg">
+				<view class="f-mini-title">设置不可接单时间</view>
+				<view class="f-paragraph c-disable">（只能设置近{{dayList.length}}天的时间）</view>
+			</view>
+			<tab @change="handerTabChange" :list="dayList" :activeIndex="dayCurrent*1" :activeColor="primaryColor"
+				width="150rpx" height="80rpx"></tab>
+		</view>
+		<view class="date-list flex pt-md" v-if="dayList.length > 0">
+			<view class="date-item radius-16 flex-center ml-md mt-md" @tap="getDateTime(index)"
+				:style="{ background : form.coach_status != 3 && item.status == 0 && item.is_order==0 && !isTimes(item.time_str) ? primaryColor : '' , color:item.status == 0 && item.is_order==0 && !isTimes(item.time_str) ? '#fff' : ''}"
+				:class="isTimes(item.time_str) || item.is_order==1 || form.coach_status == 3 ? 'date-item-prohibit c-disable' : 'fill-base c-5A677E'"
+				v-for="(item,index) in dayList[dayCurrent].sub" :key="index">
+				<view class="text-center">
+					<view class="f-mini-title">{{item.time_text}}</view>
+					<view class="f-caption">{{isTimes(item.time_str) || item.status == 0 ? '不可预约' : '可预约'}}</view>
+				</view>
+			</view>
+		</view>
+		<view class="space-max-footer"></view>
+		<w-picker :visible.sync="showTime" mode="time" :value="toDayTime" :current="false" :second="false"
+			:themeColor="primaryColor" @confirm="onConfirm" ref="time"></w-picker>
+
+		<fix-bottom-button @confirm="submit" :text="[{text:'保存',type:'confirm',isAuth:true}]" bgColor="#fff"
+			v-if="form.coach_status !=3 "></fix-bottom-button>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	import $util from "@/utils/index.js"
+	import wPicker from "@/components/w-picker/w-picker.vue";
+	import tab from "@/components/tab.vue"
+	export default {
+		components: {
+			wPicker,
+			tab
+		},
+		data() {
+			return {
+				toDay: '',
+				toDayTime: '',
+				showKey: '',
+				showTime: false,
+				form: {
+					id: 0,
+					is_work: 0,
+					start_time: '',
+					end_time: '',
+					coach_status: 0,
+					time_unit: ''
+				}, 
+				dayList: [],
+				dayCurrent: 0,
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad() {
+			this.initIndex()
+		},
+		methods: {
+			...mapMutations(['updateTechnicianItem']),
+			async initIndex() {
+				// #ifdef H5
+				if (this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				let cur_time = new Date(Math.ceil(new Date().getTime()))
+				this.toDay = this.$util.formatTime(cur_time, 'YY-M-D')
+				this.toDayTime = this.$util.formatTime(cur_time, 'h:m')
+				let data = await this.$api.technician.timeConfig()
+				for (let key in this.form) {
+					this.form[key] = data[key]
+				}
+				data.day_list.forEach((item, index) => {
+					item.title = index == 0 ? '今天' : item.dat_text
+					item.sub = []
+				})
+				this.form.time_unit = data.time_unit
+				this.dayList = data.day_list
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				this.toCount()
+			},
+			toChangeItem() {
+				if (this.form.coach_status == 3) return
+				this.form.is_work = this.form.is_work == 1 ? 0 : 1
+			},
+			toShowTime(key) {
+				if (this.form.coach_status == 3) return
+				this.showKey = key
+				this.showTime = true
+			},
+			onConfirm(val) {
+				this.form[this.showKey] = val.result;
+				this.toCount()
+			},
+			toCount() {
+				let {
+					toDay = ''
+				} = this
+				let {
+					start_time = '',
+						end_time = ''
+				} = this.form
+				if (toDay && start_time && end_time) {
+					this.dayList.forEach(item => {
+						item.sub = []
+					})
+					this.getTimeCall()
+				}
+			},
+			async getTimeCall() {
+				this.$util.showLoading()
+				let {
+					start_time = '',
+						end_time = ''
+				} = this.form
+				let {
+					dayCurrent,
+					dayList
+				} = this
+				let data = await this.$api.technician.getTime({
+					start_time,
+					end_time,
+					dat_str: dayList[dayCurrent].dat_str
+				})
+				this.dayList[dayCurrent].sub = data
+				this.$util.hideAll()
+			},
+			setDate(index) {
+				this.dayCurrent = index
+			},
+			getDateTime(index) {
+				if (this.form.coach_status == 3) return
+				let {
+					dayCurrent
+				} = this
+				let {
+					sub = []
+				} = this.dayList[dayCurrent]
+				let {
+					is_click,
+					is_order,
+					status
+				} = sub[index]
+				if (sub && is_order == 1) return
+				this.dayList[dayCurrent].sub[index].is_click = is_click == 0 ? 1 : 0
+				this.dayList[dayCurrent].sub[index].status = status == 0 ? 1 : 0
+			},
+			handerTabChange(index) {
+				if (this.form.coach_status == 3) return
+				this.dayCurrent = index
+				if (this.dayList[index].sub && this.dayList[index].sub.length) return
+				this.getTimeCall()
+			},
+			isTimes(value) {
+				let date = new Date()
+				return date.getTime() / 1000 > value
+			},
+			async submit() {
+				let param = this.$util.deepCopy(this.form)
+				if (!param.start_time || !param.end_time) {
+					this.$util.showToast({
+						title: !param.start_time ? `请选择开始时间` : `请选择结束时间`
+					})
+					return
+				}
+				delete param.coach_status
+				let dayList = this.$util.deepCopy(this.dayList)
+				param.time_text = dayList
+				this.$util.showLoading()
+				await this.$api.technician.setTimeConfig(param)
+				this.$util.hideAll()
+				this.$util.showToast({
+					title: `保存成功`
+				});
+				this.updateTechnicianItem({
+					key: 'haveOperItem',
+					val: true
+				})
+				setTimeout(() => {
+					this.$util.back()
+					this.$util.goUrl({
+						url: 1,
+						openType: `navigateBack`
+					})
+				}, 1000)
+
+			}
+		},
+		filters: {
+			handleStartEndTime(val, toDay) {
+				let text = ''
+				let {
+					start_time,
+					end_time
+				} = val
+				let start = `${toDay} ${start_time}`
+				let end = `${toDay} ${end_time}`
+				if (start_time && end_time && $util.DateToUnix(start) >= $util.DateToUnix(end)) {
+					text = '次日'
+				}
+				return text
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.technician-time-manage {
+		.iconfont {
+			font-size: 80rpx;
+			line-height: 34rpx;
+		}
+
+		.item-time {
+			width: 50%;
+		}
+
+		.date-title {
+			padding-bottom: 60rpx;
+
+			text {
+				border-bottom: 3px solid transparent;
+			}
+		}
+
+		.date-list {
+			word-break: break-all;
+			flex-flow: wrap;
+
+			.date-item {
+				width: 163rpx;
+				height: 110rpx;
+				border: 1px solid #E5E5E5;
+			}
+
+			.date-item-prohibit {
+				background: #F6F7F7;
+			}
+
+			.c-5A677E {
+				color: #5A677E;
+			}
+		}
+	}
+</style>
diff --git a/technician/pages/time-set.vue b/technician/pages/time-set.vue
new file mode 100644
index 0000000..12536e3
--- /dev/null
+++ b/technician/pages/time-set.vue
@@ -0,0 +1,437 @@
+<template>
+	<view class="technician-time-manage">
+		<view class="fill-base pd-lg flex-between">
+			<view class="flex-1 flex-y-baseline f-title c-title">白天出租出行免车费设置
+				({{timeFrom.day_time ? timeFrom.day_time : '00:00~00:00'}} )
+				<!-- <view class="f-paragraph ml-sm"
+					:style="{color:form.is_work==1?primaryColor:'#999'}">
+					{{form.is_work==1?'接单':'休息'}}
+				</view> -->
+			</view>
+			<view @tap.stop="toShowTime('day')">
+				<!-- <i class="iconfont icon-time c-caption ml-sm" 
+					:style="{ color: form.is_work==1 ? primaryColor : ''}"></i> -->
+				<view class="f-paragraph ml-sm" :style="{color:primaryColor}">
+					设置时间
+				</view>
+			</view>
+		</view>
+		<view class="b-1px-b item1">
+			<view class="pd-lg" @click="selectDistanceOptions('dayVal',item)" v-for="(item,index) in distance_options"
+				:key="index"
+				:style="{ background: dayVal.distance == item ? '#25c376' : '#ffffff',color:dayVal.distance == item ? 'white' : '#999'}">
+				{{item}}公里
+			</view>
+		</view>
+
+		<view class="fill-base pd-lg flex-between">
+			<view class="flex-1 flex-y-baseline f-title c-title">夜晚出租出行免车费设置
+				({{timeFrom.night_time ? timeFrom.night_time : '00:00~00:00'}})
+				<!-- <view class="f-paragraph ml-sm"
+					:style="{color:form.is_work==1?primaryColor:'#999'}">
+					{{form.is_work==1?'接单':'休息'}}
+				</view> -->
+			</view>
+			<view @tap.stop="toShowTime('night')">
+				<!-- <i class="iconfont icon-time c-caption ml-sm" 
+					:style="{ color: form.is_work==1 ? primaryColor : ''}"></i> -->
+				<view class="f-paragraph ml-sm" :style="{color:primaryColor}">
+					设置时间
+				</view>
+			</view>
+			<!-- <view @tap.stop="toChangeItem">
+				<i class="iconfont icon-switch c-caption ml-sm" :class="[{'icon-switch-on':form.is_work==1}]"
+					:style="{ color: form.is_work==1 ? primaryColor : ''}"></i>
+			</view> -->
+		</view>
+		<view class="b-1px-b item1">
+			<view class="pd-lg" @click="selectDistanceOptions('nightVal',item)" v-for="(item,index) in distance_options"
+				:key="index"
+				:style="{ background: nightVal.distance == item ? '#25c376' : '#ffffff',color:nightVal.distance == item ? 'white' : '#999'}">
+				{{item}}公里
+			</view>
+		</view>
+
+
+		<view class="fill-base mt-md b-1px-b">
+			<view class="f-title c-title pd-lg">温馨提示</view>
+		</view>
+		<view class="fill-base pb-lg ">
+			<view class="pd-lg">
+				1.此处设置的免车费公里数是客户距离你的直线距离，直线距离
+				和车行距离在地理位置特殊性上可能有一定误差，望大家设置
+				距离时知晓。
+				2.设置的免出行费只针对出租车
+				3.设置后请点击下方[确定] 按钮生效
+				4、全国默认1公里免车费，可自行调整公里数
+			</view>
+			<!-- <view @tap.stop="toShowTime('start_time')" class="item-time flex-center flex-column">
+				<view>开始时间</view>
+				<view class="mt-sm" :style="{color:form.start_time ? primaryColor : '#999'}">
+					{{form.start_time || '选择时间'}}
+				</view>
+			</view>
+			<view @tap.stop="toShowTime('end_time')" class="item-time flex-center flex-column  b-1px-l">
+				<view>结束时间</view>
+				<view class="mt-sm" :style="{color:form.end_time ? primaryColor : '#999'}">
+					{{form | handleStartEndTime(toDay)}}{{form.end_time || '选择时间'}}
+				</view>
+			</view> -->
+		</view>
+		<!-- <view class="fill-base pb-lg" style="border-bottom-left-radius: 32rpx;border-bottom-right-radius: 32rpx;">
+			<view class="flex pl-md pr-md pt-lg pb-lg">
+				<view class="f-mini-title">设置不可接单时间</view>
+				<view class="f-paragraph c-disable">（只能设置近{{dayList.length}}天的时间）</view>
+			</view>
+			<tab @change="handerTabChange" :list="dayList" :activeIndex="dayCurrent*1" :activeColor="primaryColor"
+				width="150rpx" height="80rpx"></tab>
+		</view>
+		<view class="date-list flex pt-md" v-if="dayList.length > 0">
+			<view class="date-item radius-16 flex-center ml-md mt-md" @tap="getDateTime(index)"
+				:style="{ background : form.coach_status != 3 && item.status == 0 && item.is_order==0 && !isTimes(item.time_str) ? primaryColor : '' , color:item.status == 0 && item.is_order==0 && !isTimes(item.time_str) ? '#fff' : ''}"
+				:class="isTimes(item.time_str) || item.is_order==1 || form.coach_status == 3 ? 'date-item-prohibit c-disable' : 'fill-base c-5A677E'"
+				v-for="(item,index) in dayList[dayCurrent].sub" :key="index">
+				<view class="text-center">
+					<view class="f-mini-title">{{item.time_text}}</view>
+					<view class="f-caption">{{isTimes(item.time_str) || item.status == 0 ? '不可预约' : '可预约'}}</view>
+				</view>
+			</view>
+		</view> -->
+		<view class="space-max-footer"></view>
+		<!-- <w-picker :visible.sync="showTime" mode="time" :value="toDayTime" :current="false" :second="false"
+			:themeColor="primaryColor" @confirm="onConfirm" ref="time"></w-picker> -->
+			
+		<time-picker-popup ref="time" :value="toDayTime" @confirm="onConfirm"
+			:title="showKey=='day'?dayVal.title:nightVal.title" segmentation='--'></time-picker-popup>
+
+		<fix-bottom-button @confirm="submit" :text="[{text:'保存',type:'confirm',isAuth:true}]" bgColor="#fff"
+			v-if="form.coach_status !=3 "></fix-bottom-button>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations,
+		mapActions
+	} from "vuex"
+	import $util from "@/utils/index.js"
+	import wPicker from "@/components/w-picker/w-picker.vue";
+	import tab from "@/components/tab.vue"
+	import TimePickerPopup from '@/components/time-picker-popup/time-picker-popup.vue'
+	export default {
+		components: {
+			wPicker,
+			tab,
+			TimePickerPopup
+		},
+		data() {
+			return {
+				distance_options: ['0.5', '1', '3', '5', '7'],
+				dayVal: {
+					distance: '0.5',
+					toDayTime: ['00', '00', '00', '00'],
+					title: '白天设置'
+
+				},
+				nightVal: {
+					distance: '0.5',
+					toDayTime: ['00', '00', '00', '00'],
+					title: '晚间设置'
+				},
+				toDay: '',
+				toDayTime: ['00', '00', '00', '00'],
+				showKey: '',
+				showTime: false,
+				form: {
+					id: 0,
+					is_work: 0,
+					start_time: '',
+					end_time: '',
+					coach_status: 0,
+					time_unit: '',
+				},
+				timeFrom: {
+					day_time: '',
+					day_free_distance: '',
+					night_time: '',
+					night_free_distance: '',
+				},
+				dayList: [],
+				dayCurrent: 0,
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			userInfo: state => state.user.userInfo,
+			coachInfo: state => state.user.coachInfo,
+		}),
+		onLoad() {
+			this.initIndex();
+		},
+		methods: {
+			...mapActions(['getCoachInfo']),
+			...mapMutations(['updateTechnicianItem']	),
+			async initIndex() {
+				// #ifdef H5
+				if (this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				let cur_time = new Date(Math.ceil(new Date().getTime()))
+				this.toDay = this.$util.formatTime(cur_time, 'YY-M-D')
+				// this.toDayTime = this.$util.formatTime(cur_time, 'h:m');
+				let data = await this.$api.technician.timeConfig()
+				for (let key in this.form) {
+					this.form[key] = data[key]
+				}
+				data.day_list.forEach((item, index) => {
+					item.title = index == 0 ? '今天' : item.dat_text
+					item.sub = []
+				})
+				this.form.time_unit = data.time_unit
+				this.dayList = data.day_list
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				this.toCount();
+
+				// 技师白天夜间免费出行距离
+				for (let timeFromKey in this.timeFrom) {
+					this.timeFrom[timeFromKey] = this.coachInfo[timeFromKey];
+					if (timeFromKey == 'day_free_distance') {
+						this.dayVal.distance = Number(this.coachInfo[timeFromKey]);
+					}
+					if (timeFromKey == 'night_free_distance') {
+						this.nightVal.distance = Number(this.coachInfo[timeFromKey]);
+					}
+				}
+			},
+			toChangeItem() {
+				if (this.form.coach_status == 3) return
+				this.form.is_work = this.form.is_work == 1 ? 0 : 1
+			},
+			toShowTime(key) {
+				this.showKey = key
+				this.$refs.time.open()
+				// if (this.form.coach_status == 3) return
+				// this.showKey = key
+				// this.showTime = true
+			},
+			onConfirm(val) {
+				// console.log(val)
+				this.timeFrom[this.showKey == 'day' ? 'day_time' : 'night_time'] =
+					`${val[0]}:${val[1]}~${val[2]}:${val[3]}`;
+				this.toCount()
+			},
+			selectDistanceOptions(key, item) {
+				this[key].distance = item;
+				this.timeFrom[key == 'dayVal' ? 'day_free_distance' : 'night_free_distance'] = item;
+			},
+			toCount() {
+				let {
+					toDay = ''
+				} = this
+				let {
+					start_time = '',
+						end_time = ''
+				} = this.form
+				if (toDay && start_time && end_time) {
+					this.dayList.forEach(item => {
+						item.sub = []
+					})
+					this.getTimeCall()
+				}
+			},
+			async getTimeCall() {
+				this.$util.showLoading()
+				let {
+					start_time = '',
+						end_time = ''
+				} = this.form
+				let {
+					dayCurrent,
+					dayList
+				} = this
+				let data = await this.$api.technician.getTime({
+					start_time,
+					end_time,
+					dat_str: dayList[dayCurrent].dat_str
+				})
+				this.dayList[dayCurrent].sub = data
+				this.$util.hideAll()
+			},
+			setDate(index) {
+				this.dayCurrent = index
+			},
+			getDateTime(index) {
+				if (this.form.coach_status == 3) return
+				let {
+					dayCurrent
+				} = this
+				let {
+					sub = []
+				} = this.dayList[dayCurrent]
+				let {
+					is_click,
+					is_order,
+					status
+				} = sub[index]
+				if (sub && is_order == 1) return
+				this.dayList[dayCurrent].sub[index].is_click = is_click == 0 ? 1 : 0
+				this.dayList[dayCurrent].sub[index].status = status == 0 ? 1 : 0
+			},
+			handerTabChange(index) {
+				if (this.form.coach_status == 3) return
+				this.dayCurrent = index
+				if (this.dayList[index].sub && this.dayList[index].sub.length) return
+				this.getTimeCall()
+			},
+			isTimes(value) {
+				let date = new Date()
+				return date.getTime() / 1000 > value
+			},
+			async submit() {
+				let timeParam = this.$util.deepCopy(this.timeFrom);
+				if (!timeParam.day_time || !timeParam.night_time) {
+					this.$util.showToast({
+						title: !timeParam.day_time ? `请选择白天免车费时间` : `请选择夜间免车费时间`
+					})
+					return
+				}
+				this.$util.showLoading()
+				await this.updateCoachRidingForfree();
+				await this.getCoachInfo();
+				this.$util.hideAll()
+				this.$util.showToast({
+					title: `保存成功`
+				});
+				setTimeout(() => {
+					this.$util.back()
+					this.$util.goUrl({
+						url: 1,
+						openType: `navigateBack`
+					})
+				}, 1000)
+				return
+				let param = this.$util.deepCopy(this.form);
+				if (!param.start_time || !param.end_time) {
+					this.$util.showToast({
+						title: !param.start_time ? `请选择开始时间` : `请选择结束时间`
+					})
+					return
+				}
+				delete param.coach_status
+				let dayList = this.$util.deepCopy(this.dayList)
+				param.time_text = dayList
+				this.$util.showLoading()
+				await this.$api.technician.setTimeConfig(param)
+				this.$util.hideAll()
+				this.$util.showToast({
+					title: `保存成功`
+				});
+				this.updateTechnicianItem({
+					key: 'haveOperItem',
+					val: true
+				})
+				setTimeout(() => {
+					this.$util.back()
+					this.$util.goUrl({
+						url: 1,
+						openType: `navigateBack`
+					})
+				}, 1000)
+
+			},
+			// 修改技师白天夜间免费出行距离
+			async updateCoachRidingForfree() {
+				await this.$api.technician.updateCoachRidingForfree(this.timeFrom);
+			}
+		},
+		filters: {
+			handleStartEndTime(val, toDay) {
+				let text = ''
+				let {
+					start_time,
+					end_time
+				} = val
+				let start = `${toDay} ${start_time}`
+				let end = `${toDay} ${end_time}`
+				if (start_time && end_time && $util.DateToUnix(start) >= $util.DateToUnix(end)) {
+					text = '次日'
+				}
+				return text
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.technician-time-manage {
+		/deep/ .uni-popup {
+			z-index: 999;
+		}
+
+		.iconfont {
+			font-size: 80rpx;
+			line-height: 34rpx;
+		}
+
+		.c-title {
+			font-weight: 700;
+		}
+
+		.item1 {
+			display: grid;
+			flex-wrap: wrap;
+			grid-template-columns: repeat(3, auto);
+			gap: 10px 10px;
+			padding: 30rpx 30rpx;
+			font-size: 32rpx;
+			color: white;
+
+			.pd-lg {
+				text-align: center;
+				background: #25c376;
+				border-radius: 8px;
+			}
+		}
+
+		.item-time {
+			width: 50%;
+		}
+
+		.date-title {
+			padding-bottom: 60rpx;
+
+			text {
+				border-bottom: 3px solid transparent;
+			}
+		}
+
+		.date-list {
+			word-break: break-all;
+			flex-flow: wrap;
+
+			.date-item {
+				width: 163rpx;
+				height: 110rpx;
+				border: 1px solid #E5E5E5;
+			}
+
+			.date-item-prohibit {
+				background: #F6F7F7;
+			}
+
+			.c-5A677E {
+				color: #5A677E;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/uni.scss b/uni.scss
new file mode 100644
index 0000000..b04ded9
--- /dev/null
+++ b/uni.scss
@@ -0,0 +1,103 @@
+/**
+ * 这里是uni-app内置的常用样式变量
+ *
+ * uni-app 官方扩展插件及插件市场（https://ext.dcloud.net.cn）上很多三方插件均使用了这些样式变量
+ * 如果你是插件开发者，建议你使用scss预处理，并在插件代码中直接使用这些变量（无需 import 这个文件），方便用户通过搭积木的方式开发整体风格一致的App
+ *
+ */
+
+/**
+ * 如果你是App开发者（插件使用者），你可以通过修改这些变量来定制自己的插件主题，实现自定义主题功能
+ *
+ * 如果你的项目同样使用了scss预处理，你也可以直接在你的 scss 代码中使用如下变量，同时无需 import 这个文件
+ */
+
+/* 颜色变量 */
+@mixin bg_color($color) {
+	background-color: $color;
+	[data-theme="theme1"] & {
+	background-color:#F3C149;
+	}
+} 
+
+// 背景
+$-background-main-color:#F8F8F8;//主色
+$-background-deputy-color:#FFFFFF;//副色
+$-background-secondary-color:#373A3F;//次色
+$-background-select-vehicle-color:#1258E6;//车辆
+$-background-select-make-color:linear-gradient(-90deg, #F7B433, #F3C149);//挂号人默认背景
+
+// 文本
+$-text-main-color:#3175FE;//主色
+$-text-deputy-color:#999999;//副色
+$-text-secondary-color:#333333;//副色
+
+//按钮
+$-button-main-color:#373A3F;//主色
+$-button-deputy-color:#C9CDD4;//副色
+
+
+
+
+
+
+/* 行为相关颜色 */
+$uni-color-primary: #007aff;
+$uni-color-success: #4cd964;
+$uni-color-warning: #f0ad4e;
+$uni-color-error: #dd524d;
+
+/* 文字基本颜色 */
+$uni-text-color:#333;//基本色
+$uni-text-color-inverse:#fff;//反色
+$uni-text-color-grey:#999;//辅助灰色，如加载更多的提示信息
+$uni-text-color-placeholder: #808080;
+$uni-text-color-disable:#c0c0c0;
+
+/* 背景颜色 */
+$uni-bg-color:#ffffff;
+$uni-bg-color-grey:#f8f8f8;
+$uni-bg-color-hover:#f1f1f1;//点击状态颜色
+$uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色
+
+/* 边框颜色 */
+$uni-border-color:#c8c7cc;
+
+/* 尺寸变量 */
+
+/* 文字尺寸 */
+$uni-font-size-sm:24rpx;
+$uni-font-size-base:28rpx;
+$uni-font-size-lg:32rpx;
+
+/* 图片尺寸 */
+$uni-img-size-sm:40rpx;
+$uni-img-size-base:52rpx;
+$uni-img-size-lg:80rpx;
+
+/* Border Radius */
+$uni-border-radius-sm: 4rpx;
+$uni-border-radius-base: 6rpx;
+$uni-border-radius-lg: 12rpx;
+$uni-border-radius-circle: 50%;
+
+/* 水平间距 */
+$uni-spacing-row-sm: 10px;
+$uni-spacing-row-base: 20rpx;
+$uni-spacing-row-lg: 30rpx;
+
+/* 垂直间距 */
+$uni-spacing-col-sm: 8rpx;
+$uni-spacing-col-base: 16rpx;
+$uni-spacing-col-lg: 24rpx;
+
+/* 透明度 */
+$uni-opacity-disabled: 0.3; // 组件禁用态的透明度
+
+/* 文章场景相关 */
+$uni-color-title: #2C405A; // 文章标题颜色
+$uni-font-size-title:40rpx;
+$uni-color-subtitle: #555555; // 二级标题颜色
+$uni-font-size-subtitle:36rpx;
+$uni-color-paragraph: #3F536E; // 文章段落颜色
+$uni-font-size-paragraph:30rpx;
\ No newline at end of file
diff --git a/uni_modules/lime-painter/changelog.md b/uni_modules/lime-painter/changelog.md
new file mode 100644
index 0000000..84871a5
--- /dev/null
+++ b/uni_modules/lime-painter/changelog.md
@@ -0,0 +1,153 @@
+## 1.9.3.4（2022-06-20）
+- fix: 修复 因创建节点速度问题导致顺序出错。 
+- fix: 修复 微信小程序 PC 无法显示本地图片 
+- fix: 修复 flex-box 对齐问题 
+- feat: 增加 `text-shadow`
+- feat: 重写 `text` 对齐方式
+- chore: 更新文档
+## 1.9.3.3（2022-06-17）
+- fix: 修复 支付宝小程序 canvas 2d 存在ctx.draw问题导致报错
+- fix: 修复 支付宝小程序 toDataURL 存在权限问题改用 `toTempFilePath`
+- fix: 修复 支付宝小程序 image size 问题导致 `objectFit` 无效
+## 1.9.3.2（2022-06-14）
+- fix: 修复 image 设置背景色不生效问题
+- fix: 修复 nvue 环境判断缺少参数问题
+## 1.9.3.1（2022-06-14）
+- fix: 修复 bottom 定位不对问题
+- fix: 修复 因小数导致计算出错换行问题
+- feat: 增加 `useCORS` h5端图片跨域 在设置请求头无效果后试一下设置这个值
+- chore: 更新文档
+## 1.9.3（2022-06-13）
+- feat: 增加 `zIndex`
+- feat: 增加 `flex-box` 该功能处于原始阶段，非常简陋。
+- tips: QQ小程序 vue3 不支持, 为 uni 官方BUG
+## 1.9.2.9（2022-06-10）
+- fix: 修复`text-align`及`margin`居中问题
+## 1.9.2.8（2022-06-10）
+- fix: 修复 Nvue `canvasToTempFilePathSync` 不生效问题
+## 1.9.2.7（2022-06-10）
+- fix: 修复 margin及padding的bug
+- fix: 修复 Nvue `isCanvasToTempFilePath` 不生效问题
+## 1.9.2.6（2022-06-09）
+- fix: 修复 Nvue 不显示
+- feat: 增加支持字体渐变
+```html
+<l-painter-text 
+	text="水调歌头\n明月几时有？把酒问青天。不知天上宫阙，今夕是何年。我欲乘风归去，又恐琼楼玉宇，高处不胜寒。起舞弄清影，何似在人间。"
+	css="background: linear-gradient(,#ff971b 0%, #1989fa 100%); background-clip: text" />
+```
+## 1.9.2.5（2022-06-09）
+- chore: 更变获取父级宽度的设定
+- chore: `pathType` 在canvas 2d 默认为 `url`
+## 1.9.2.4（2022-06-08）
+- fix: 修复 `pathType` 不生效问题
+## 1.9.2.3（2022-06-08）
+- fix: 修复 `canvasToTempFilePath` 漏写 `success` 参数
+## 1.9.2.2（2022-06-07）
+- chore: 更新文档
+## 1.9.2.1（2022-06-07）
+- fix: 修复 vue3 赋值给this再传入导致image无法绘制
+- fix: 修复 `canvasToTempFilePathSync` 时机问题
+- feat: canvas 2d 更改图片生成方式 `toDataURL` 
+## 1.9.2（2022-05-30）
+- fix: 修复 `canvasToTempFilePathSync` 在 vue3 下只生成一次
+## 1.9.1.7（2022-05-28）
+- fix: 修复 `qrcode`显示不全问题
+## 1.9.1.6（2022-05-28）
+- fix: 修复 `canvasToTempFilePathSync` 会重复多次问题
+- fix: 修复 `view` css `backgroundImage` 图片下载失败导致 子节点不渲染
+## 1.9.1.5（2022-05-27）
+- fix: 修正支付宝小程序 canvas 2d版本号 2.7.15
+## 1.9.1.4（2022-05-22）
+- fix: 修复字节小程序无法使用xml方式
+- fix: 修复字节小程序无法使用base64(非2D情况下工具上无法显示)
+- fix: 修复支付宝小程序 `canvasToTempFilePath` 报错
+## 1.9.1.3（2022-04-29）
+- fix: 修复vue3打包后uni对象为空后的报错
+## 1.9.1.2（2022-04-25）
+- fix: 删除多余文件
+## 1.9.1.1（2022-04-25）
+- fix: 修复图片不显示问题
+## 1.9.1（2022-04-12）
+- fix: 因四舍五入导致有些机型错位
+- fix: 修复无views报错 
+- chore: nvue下因ios无法读取插件内static文件，改由下载方式
+## 1.9.0（2022-03-20）
+- fix: 因无法固定尺寸导致生成图片不全
+- fix: 特定情况下text判断无效
+- chore: 本地化APP Nvue webview
+## 1.8.9（2022-02-20）
+- fix: 修复 小程序下载最多10次并发的问题
+- fix: 修复 APP端无法获取本地图片
+- fix: 修复 APP Nvue端不执行问题
+- chore: 增加图片缓存机制
+## 1.8.8.8（2022-01-27）
+- fix: 修复 主动调用尺寸问题
+## 1.8.8.6（2022-01-26）
+- fix: 修复 nvue 下无宽度时获取父级宽度 
+- fix: 修复 ios app 无法渲染问题
+## 1.8.8（2022-01-23）
+- fix: 修复 主动调用时无节点问题
+- fix: 修复 `box-shadow` 颜色问题
+- fix: 修复 `transform:rotate` 角度位置问题
+- feat: 增加 `overflow:hidden`
+## 1.8.7（2022-01-07）
+- fix: 修复 image 方向为 `right` 时原始宽高问题
+- feat: 支持 view 设置背景图 `background-image: url(xxx)`
+- chore: 去掉可选链
+## 1.8.6（2021-11-28）
+- feat: 支持`view`对`inline-block`的子集使用`text-align`
+## 1.8.5.5（2021-08-17）
+- chore: 更新文档，删除 replace
+- fix: 修复 text 值为 number时报错
+## 1.8.5.4（2021-08-16）
+- fix: 字节小程序兼容
+## 1.8.5.3（2021-08-15）
+- fix: 修复线性渐变与css现实效果不一致的问题
+- chore: 更新文档
+## 1.8.5.2（2021-08-13）
+- chore: 增加`background-image`、`background-repeat` 能力，主要用于背景纹理的绘制，并不是代替`image`。例如：大面积的重复平铺的水印
+- 注意：这个功能H5暂时无法使用，因为[官方的API有BUG](https://ask.dcloud.net.cn/question/128793)，待官方修复！！！
+## 1.8.5.1（2021-08-10）
+- fix: 修复因`margin`报错问题
+## 1.8.5（2021-08-09）
+- chore: 增加margin支持`auto`,以达到居中效果
+## 1.8.4（2021-08-06）
+- chore: 增加判断缓存文件条件
+- fix: 修复css 多余空格报错问题
+## 1.8.3（2021-08-04）
+- tips: 1.6.x 以下的版本升级到1.8.x后要为每个元素都加上定位：position: 'absolute'
+- fix: 修复只有一个view子元素时不计算高度的问题
+## 1.8.2（2021-08-03）
+- fix: 修复 path-type 为 `url` 无效问题
+- fix: 修复 qrcode `text` 为空时报错问题
+- fix: 修复 image `src` 动态设置时不生效问题
+- feat: 增加 css 属性 `min-width` `max-width`
+## 1.8.1（2021-08-02）
+- fix: 修复无法加载本地图片
+## 1.8.0（2021-08-02）
+- chore 文档更新
+- 使用旧版的同学不要升级！
+## 1.8.0-beta（2021-07-30）
+- ## 全新布局方式 不兼容旧版！
+- chore: 布局方式变更
+- tips: 微信canvas 2d 不支持真机调试
+## 1.6.6（2021-07-09）
+- chore: 统一命名规范，无须主动引入组件
+## 1.6.5（2021-06-08）
+- chore: 去掉console
+## 1.6.4（2021-06-07）
+- fix: 修复 数字 为纯字符串时不转换的BUG
+## 1.6.3（2021-06-06）
+- fix: 修复 PC 端放大的BUG
+## 1.6.2（2021-05-31）
+- fix: 修复 报`adaptor is not a function`错误
+- fix: 修复 text 多行高度
+- fix: 优化 默认文字的基准线
+- feat: `@progress`事件，监听绘制进度
+## 1.6.1（2021-02-28）
+- 删除多余节点
+## 1.6.0（2021-02-26）
+- 调整为uni_modules目录规范
+- 修复：transform的rotate不能为负数问题
+- 新增：`pathType` 指定生成图片返回的路径类型,可选值有 `base64`、`url`
diff --git a/uni_modules/lime-painter/components/common/relation.js b/uni_modules/lime-painter/components/common/relation.js
new file mode 100644
index 0000000..c68661c
--- /dev/null
+++ b/uni_modules/lime-painter/components/common/relation.js
@@ -0,0 +1,147 @@
+const styles = (v ='') =>  v.split(';').filter(v => v && !/^[\n\s]+$/.test(v)).map(v => {
+						const key = v.slice(0, v.indexOf(':'))
+						const value = v.slice(v.indexOf(':')+1)
+						return {
+							[key
+								.replace(/-([a-z])/g, function() { return arguments[1].toUpperCase()})
+								.replace(/\s+/g, '')
+							]: value.replace(/^\s+/, '').replace(/\s+$/, '') || ''
+						}
+					})
+export function parent(parent) {
+	return {
+		provide() {
+			return {
+				[parent]: this
+			}
+		},
+		data() {
+			return {
+				el: {
+					css: {},
+					views: []
+				},
+			}
+		},
+		watch: {
+			css: { 
+				handler(v) {
+					if(this.canvasId) {
+						this.el.css = (typeof v == 'object' ? v : v && Object.assign(...styles(v))) || {}
+						this.canvasWidth = this.el.css && this.el.css.width || this.canvasWidth
+						this.canvasHeight = this.el.css && this.el.css.height || this.canvasHeight
+					}
+				},
+				immediate: true
+			}
+		}
+	}
+}
+export function children(parent, options = {}) {
+	const indexKey = options.indexKey || 'index'
+	return {
+		inject: {
+			[parent]: {
+				default: null
+			}
+		},
+		watch: {
+			el: {
+				handler(v, o) {
+					if(JSON.stringify(v) != JSON.stringify(o))
+						this.bindRelation()
+				},
+				deep: true,
+				immediate: true
+			},
+			src: {
+				handler(v, o) {
+					if(v != o)
+						this.bindRelation()
+				},
+				immediate: true
+			},
+			text: {
+				handler(v, o) {
+					if(v != o) this.bindRelation()
+				},
+				immediate: true
+			},
+			css: {
+				handler(v, o) {
+					if(v != o)
+						this.el.css = (typeof v == 'object' ? v : v && Object.assign(...styles(v))) || {}
+				},
+				immediate: true
+			},
+			replace: {
+				handler(v, o) {
+					if(JSON.stringify(v) != JSON.stringify(o))
+						this.bindRelation()
+				},
+				deep: true,
+				immediate: true
+			}
+		},
+		created() {
+			if(!this._uid) {
+				this._uid = this._.uid
+			}
+			Object.defineProperty(this, 'parent', {
+				get: () => this[parent] || [],
+			})
+			Object.defineProperty(this, 'index', {
+				get: () =>  {
+					this.bindRelation();
+					const {parent: {el: {views=[]}={}}={}} = this
+					return views.indexOf(this.el)
+				},
+			});
+			this.el.type = this.type
+			
+			this.bindRelation()
+		},
+		// #ifdef VUE3
+		beforeUnmount() {
+			this.removeEl()
+		},
+		// #endif
+		// #ifdef VUE2
+		beforeDestroy() {
+			this.removeEl()
+		},
+		// #endif
+		methods: {
+			removeEl() {
+				if (this.parent) {
+					this.parent.el.views = this.parent.el.views.filter(
+						(item) => item._uid !== this._uid
+					);
+				}
+			},
+			bindRelation() {
+				if(!this.el._uid) {
+					this.el._uid = this._uid 
+				}
+				if(['text','qrcode'].includes(this.type)) {
+					this.el.text = this.$slots && this.$slots.default && this.$slots.default[0].text || `${this.text || ''}`.replace(/\\n/g, '\n')
+				}
+				if(this.type == 'image') {
+					this.el.src = this.src
+				}
+				if (!this.parent) {
+					return;
+				}
+				let views = this.parent.el.views || [];
+				if(views.indexOf(this.el) !== -1) {
+					this.parent.el.views = views.map(v => v._uid == this._uid ? this.el : v)
+				} else {
+					this.parent.el.views = [...views, this.el];
+				}
+			}
+		},
+		mounted() {
+			// this.bindRelation()
+		},
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/lime-painter/components/l-painter-image/l-painter-image.vue b/uni_modules/lime-painter/components/l-painter-image/l-painter-image.vue
new file mode 100644
index 0000000..f1ce13e
--- /dev/null
+++ b/uni_modules/lime-painter/components/l-painter-image/l-painter-image.vue
@@ -0,0 +1,27 @@
+<template>
+	
+</template>
+
+<script>
+	import {parent, children} from '../common/relation';
+	export default {
+		name: 'lime-painter-image',
+		mixins:[children('painter')],
+		props: {
+			css: [String, Object],
+			src: String
+		},
+		data() {
+			return {
+				type: 'image',
+				el: {
+					css: {},
+					src: null
+				},
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode.vue b/uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode.vue
new file mode 100644
index 0000000..4620d3f
--- /dev/null
+++ b/uni_modules/lime-painter/components/l-painter-qrcode/l-painter-qrcode.vue
@@ -0,0 +1,26 @@
+<template>
+</template>
+
+<script>
+	import {parent, children} from '../common/relation';
+	export default {
+		name: 'lime-painter-qrcode',
+		mixins:[children('painter')],
+		props: {
+			css: [String, Object],
+			text: String
+		},
+		data() {
+			return {
+				type: 'qrcode',
+				el: {
+					css: {},
+					text: null
+				},
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/uni_modules/lime-painter/components/l-painter-text/l-painter-text.vue b/uni_modules/lime-painter/components/l-painter-text/l-painter-text.vue
new file mode 100644
index 0000000..1af0484
--- /dev/null
+++ b/uni_modules/lime-painter/components/l-painter-text/l-painter-text.vue
@@ -0,0 +1,28 @@
+<template>
+	<text style="opacity: 0;height: 0;"><slot/></text>
+</template>
+
+<script>
+	import {parent, children} from '../common/relation';
+	export default {
+		name: 'lime-painter-text',
+		mixins:[children('painter')],
+		props: {
+			css: [String, Object],
+			text: [String, Number],
+			replace: Object,
+		},
+		data() {
+			return {
+				type: 'text',
+				el: {
+					css: {},
+					text: null
+				},
+			}
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/uni_modules/lime-painter/components/l-painter-view/l-painter-view.vue b/uni_modules/lime-painter/components/l-painter-view/l-painter-view.vue
new file mode 100644
index 0000000..4451e23
--- /dev/null
+++ b/uni_modules/lime-painter/components/l-painter-view/l-painter-view.vue
@@ -0,0 +1,29 @@
+<template>
+	<view><slot/></view>
+</template>
+
+<script>
+	import {parent, children} from '../common/relation';
+	export default {
+		name: 'lime-painter-view',
+		mixins:[children('painter'), parent('painter')],
+		props: {
+			css: [String, Object],
+		},
+		data() {
+			return {
+				type: 'view',
+				el: {
+					css: {},
+					views:[]
+				},
+			}
+		},
+		mounted() {
+			
+		}
+	}
+</script>
+
+<style>
+</style>
diff --git a/uni_modules/lime-painter/components/l-painter/l-painter.vue b/uni_modules/lime-painter/components/l-painter/l-painter.vue
new file mode 100644
index 0000000..9406fd0
--- /dev/null
+++ b/uni_modules/lime-painter/components/l-painter/l-painter.vue
@@ -0,0 +1,409 @@
+<template>
+	<view class="lime-painter" ref="limepainter">
+		<view v-if="canvasId && size" :style="styles">
+			<!-- #ifndef APP-NVUE -->
+			<canvas class="lime-painter__canvas" v-if="use2dCanvas" :id="canvasId" type="2d" :style="size"></canvas>
+			<canvas class="lime-painter__canvas" v-else :canvas-id="canvasId" :style="size" :id="canvasId"
+				:width="boardWidth * dpr" :height="boardHeight * dpr"></canvas>
+
+			<!-- #endif -->
+			<!-- #ifdef APP-NVUE -->
+			<web-view :style="size" ref="webview"
+				src="/uni_modules/lime-painter/static/index.html"
+				class="lime-painter__canvas" @pagefinish="onPageFinish" @error="onError" @onPostMessage="onMessage">
+			</web-view>
+			<!-- #endif -->
+		</view>
+		<slot />
+	</view>
+</template>
+
+
+<script>
+	import { parent } from '../common/relation'
+	import props from './props'
+	import {toPx, base64ToPath, pathToBase64, isBase64, sleep, getImageInfo}from './utils';
+	//  #ifndef APP-NVUE
+	import { compareVersion } from './utils';
+	import Painter from './painter'
+	const nvue = {}
+	//  #endif
+	//  #ifdef APP-NVUE
+	import nvue from './nvue'
+	//  #endif
+	export default {
+		name: 'lime-painter',
+		mixins: [props, parent('painter'), nvue],
+		data() {
+			return {
+				// #ifdef MP-WEIXIN || MP-TOUTIAO || MP-ALIPAY
+				use2dCanvas: true,
+				// #endif
+				// #ifndef MP-WEIXIN || MP-TOUTIAO || MP-ALIPAY
+				use2dCanvas: false,
+				// #endif
+				canvasHeight: 150,
+				canvasWidth: null,
+				parentWidth: 0,
+				inited: false,
+				progress: 0,
+				firstRender: 0,
+				done: false
+			};
+		},
+		computed: {
+			styles() {
+				return `${this.size}${this.customStyle||''};`
+			},
+			canvasId() {
+				return `l-painter${this._uid || this._.uid}`
+			},
+			size() {
+				if (this.boardWidth && this.boardHeight) {
+					return `width:${this.boardWidth}px; height: ${this.boardHeight}px;`;
+				}
+			},
+			dpr() {
+				return this.pixelRatio || uni.getSystemInfoSync().pixelRatio;
+			},
+			boardWidth() {
+				const {width = 0} = (this.elements && this.elements.css) || this.elements || this
+				const w = toPx(width||this.width)
+				return w || Math.max(w, toPx(this.canvasWidth));
+			},
+			boardHeight() {
+				const {height = 0} = (this.elements && this.elements.css) || this.elements || this
+				const h = toPx(height||this.height)
+				return h || Math.max(h, toPx(this.canvasHeight));
+			},
+			hasBoard() {
+				return this.board && Object.keys(this.board).length
+			},
+			elements() {
+				return JSON.parse(JSON.stringify(this.hasBoard ? this.board : this.el))
+			}
+		},
+		watch: {
+			// #ifdef MP-WEIXIN ||  MP-ALIPAY
+			size(v) {
+				// #ifdef MP-WEIXIN
+				if (this.use2dCanvas) {
+					this.inited = false;
+				}
+				// #endif
+				// #ifdef MP-ALIPAY
+				this.inited = false;
+				// #endif
+			},
+			// #endif
+		},
+		created() {
+			const { SDKVersion, version, platform } = uni.getSystemInfoSync();
+			// #ifdef MP-WEIXIN
+			this.use2dCanvas = this.type === '2d' && compareVersion(SDKVersion, '2.9.2') >= 0  && !this.isPC;
+			// #endif
+			// #ifdef MP-TOUTIAO
+			this.use2dCanvas = this.type === '2d' && compareVersion(SDKVersion, '1.78.0') >= 0;
+			// #endif
+			// #ifdef MP-ALIPAY
+			this.use2dCanvas = this.type === '2d' && compareVersion(my.SDKVersion, '2.7.15') >= 0;
+			// #endif
+		},
+		async mounted() {
+			await sleep(30)
+			await this.getParentWeith()
+			this.$nextTick(() => {
+				setTimeout(() => {
+					this.$watch('elements', this.watchRender, {
+						deep: true,
+						immediate: true
+					});
+				}, 30)
+			})
+		},
+		methods: {
+			async watchRender(val, old) {
+				if (!val || !val.views || (!this.firstRender ? !val.views.length : !this.firstRender) || !Object.keys(val).length || val == old) return;
+				this.firstRender = 1
+				clearTimeout(this.rendertimer)
+				this.rendertimer = setTimeout(() => {
+					this.render(val);
+				}, this.beforeDelay)
+			},
+			async setFilePath(path, param) {
+				let filePath = path
+				const {pathType = this.pathType} =  param || this
+				if (pathType == 'base64' && !isBase64(path)) {
+					filePath = await pathToBase64(path)
+				} else if (pathType == 'url' && isBase64(path)) {
+					filePath = await base64ToPath(path)
+				}
+				if (param && param.isEmit) {
+					this.$emit('success', filePath);
+				}
+				return filePath
+			},
+			async getSize(args) {
+				const {width} = args.css || args
+				const {height} = args.css || args
+				if (!this.size) {
+					if (width || height) {
+						this.canvasWidth = width || this.canvasWidth
+						this.canvasHeight = height || this.canvasHeight
+						await sleep(30);
+					} else {
+						await this.getParentWeith()
+					}
+				}
+			},
+			canvasToTempFilePathSync(args) {
+				this.stopWatch = this.$watch('done', (v) => {
+					if (v) {
+						this.canvasToTempFilePath(args)
+						this.stopWatch && this.stopWatch()
+					}
+				}, {
+					immediate: true
+				})
+				
+			},
+			// #ifndef APP-NVUE
+			getParentWeith() {
+				return new Promise(resolve => {
+					uni.createSelectorQuery()
+						.in(this)
+						.select(`.lime-painter`)
+						.boundingClientRect()
+						.exec(res => {
+							const {width, height} = res[0]||{}
+							this.parentWidth = Math.ceil(width||0)
+							this.canvasWidth = this.parentWidth || 300
+							this.canvasHeight = height || this.canvasHeight||150
+							resolve(res[0])
+						})
+				})
+			},
+			async render(args = {}) {
+				if(!Object.keys(args).length) {
+					return console.error('空对象')
+				}
+				this.progress = 0
+				this.done = false
+				await this.getSize(args)
+				const ctx = await this.getContext();
+				let {
+					use2dCanvas,
+					boardWidth,
+					boardHeight,
+					canvas,
+					afterDelay
+				} = this;
+				if (use2dCanvas && !canvas) {
+					return Promise.reject(new Error('render: fail canvas has not been created'));
+				}
+				this.boundary = {
+					top: 0,
+					left: 0,
+					width: boardWidth,
+					height: boardHeight
+				};
+				this.painter = null
+				if (!this.painter) {
+					const {width} = args.css || args
+					const {height} = args.css || args
+					if(!width && this.parentWidth) {
+						Object.assign(args, {width: this.parentWidth})
+					}
+					const param = {
+						context: ctx,
+						canvas,
+						width: boardWidth,
+						height: boardHeight,
+						pixelRatio: this.dpr,
+						useCORS: this.useCORS,
+						listen: {
+							onProgress: (v) => {
+								this.progress = v
+								this.$emit('progress', v)
+							},
+							onEffectFail: (err) => {
+								this.$emit('faill', err)
+							}
+						}
+					}
+					if(!use2dCanvas) {
+						param.createImage = getImageInfo
+					}
+					this.painter = new Painter(param, this)
+				} 
+				
+				// vue3 赋值给data会引起图片无法绘制 
+				const { width, height } = await this.painter.source(JSON.parse(JSON.stringify(args)))
+				this.boundary.height = this.canvasHeight = height
+				this.boundary.width = this.canvasWidth = width
+				await sleep(this.sleep);
+				if(!use2dCanvas) {
+					this.painter.init(this.ctx)
+				}
+				await this.painter.render()
+				await new Promise(resolve => this.$nextTick(resolve));
+				if (!use2dCanvas) {
+					await this.canvasDraw();
+				}
+				if (afterDelay && use2dCanvas) {
+					await sleep(afterDelay);
+				}
+				this.$emit('done');
+				this.done = true
+				if (this.isCanvasToTempFilePath) {
+					this.canvasToTempFilePath()
+						.then(res => {
+							this.$emit('success', res.tempFilePath)
+						})
+						.catch(err => {
+							this.$emit('fail', new Error(JSON.stringify(err)));
+						});
+				}
+				return Promise.resolve({
+					ctx,
+					draw: this.painter,
+					node: this.node
+				});
+			},
+			canvasDraw(flag = false) {
+				return new Promise((resolve, reject) => this.ctx.draw(flag, () => setTimeout(() => resolve(), this
+					.afterDelay)));
+			},
+			async getContext() {
+				if (!this.canvasWidth) {
+					this.$emit('fail', 'painter no size')
+					console.error('painter no size: 请给画板或父级设置尺寸')
+					return Promise.reject();
+				}
+				if (this.ctx && this.inited) {
+					return Promise.resolve(this.ctx);
+				}
+				const { type, use2dCanvas, dpr, boardWidth, boardHeight } = this;
+				const _getContext = () => {
+					return new Promise(resolve => {
+						uni.createSelectorQuery()
+							.in(this)
+							.select(`#${this.canvasId}`)
+							.boundingClientRect()
+							.exec(res => {
+								if (res) {
+									const ctx = uni.createCanvasContext(this.canvasId, this);
+									if (!this.inited) {
+										this.inited = true;
+										this.use2dCanvas = false;
+										this.canvas = res;
+									}
+									// #ifdef MP-ALIPAY
+									ctx.scale(dpr, dpr);
+									// #endif
+									this.ctx = ctx
+									resolve(this.ctx);
+								}
+							});
+					});
+				};
+				if (!use2dCanvas) {
+					return _getContext();
+				}
+				return new Promise(resolve => {
+					uni.createSelectorQuery()
+						.in(this)
+						.select(`#${this.canvasId}`)
+						.node()
+						.exec(res => {
+							let {node: canvas} = res[0];
+							if (!canvas) {
+								this.use2dCanvas = false;
+								resolve(this.getContext());
+							}
+							const ctx = canvas.getContext(type);
+							if (!this.inited) {
+								this.inited = true;
+								this.use2dCanvas = true;
+								this.canvas = canvas;
+							}
+							this.ctx = ctx
+							resolve(this.ctx);
+						});
+				});
+			},
+			canvasToTempFilePath(args = {}) {
+				return new Promise(async (resolve, reject) => {
+					const { use2dCanvas, canvasId, dpr, fileType, quality } = this;
+					
+					const success = async (res) => {
+						try {
+							const tempFilePath = await this.setFilePath(res.tempFilePath || res)
+							resolve(Object.assign(res, {tempFilePath}))
+						} catch (e) {
+							this.$emit('fail', e)
+						}
+					}
+					
+					let { top: y = 0, left: x = 0, width, height } = this.boundary || this;
+					let destWidth = width * dpr;
+					let destHeight = height * dpr;
+					// #ifdef MP-ALIPAY
+					width = destWidth;
+					height = destHeight;
+					// #endif
+					
+					const copyArgs = Object.assign({
+						x,
+						y,
+						width,
+						height,
+						destWidth,
+						destHeight,
+						canvasId,
+						fileType,
+						quality,
+						success,
+						fail: reject
+					}, args);
+					
+					if (use2dCanvas) {
+						try{
+							// #ifndef MP-ALIPAY
+							if(!args.pathType && !this.pathType) {args.pathType = 'url'}
+							const tempFilePath = await this.setFilePath(this.canvas.toDataURL(`image/${args.fileType||fileType}`.replace(/pg/, 'peg'), args.quality||quality), args)
+							args.success && args.success({tempFilePath})
+							resolve({tempFilePath})
+							// #endif
+							// #ifdef MP-ALIPAY
+							this.canvas.toTempFilePath(copyArgs)
+							// #endif
+						}catch(e){
+							args.fail && args.fail(e)
+							reject(e)
+						}
+					} else {
+						// #ifdef MP-ALIPAY
+						uni.canvasToTempFilePath(copyArgs);
+						// #endif
+						// #ifndef MP-ALIPAY
+						uni.canvasToTempFilePath(copyArgs, this);
+						// #endif
+					}
+				})
+			}
+			// #endif
+		}
+	};
+</script>
+<style>
+	.lime-painter,
+	.lime-painter__canvas {
+		// #ifndef APP-NVUE
+		width: 100%;
+		// #endif
+		// #ifdef APP-NVUE
+		flex: 1;
+		// #endif
+	}
+</style>
diff --git a/uni_modules/lime-painter/components/l-painter/nvue.js b/uni_modules/lime-painter/components/l-painter/nvue.js
new file mode 100644
index 0000000..9ce594d
--- /dev/null
+++ b/uni_modules/lime-painter/components/l-painter/nvue.js
@@ -0,0 +1,218 @@
+// #ifdef APP-NVUE
+import { sleep, getImageInfo, isBase64, useNvue, networkReg } from './utils';
+const dom = weex.requireModule('dom')
+import {version } from '../../package.json'
+
+export default {
+	data() {
+		return {
+			tempFilePath: [],
+			isInitFile: false,
+			osName: uni.getSystemInfoSync().osName
+		}
+	},
+	created() {
+		// if (this.hybrid) return
+		// useNvue('_doc/uni_modules/lime-painter/', version, this.timeout).then(res => {
+		// 	this.isInitFile = true
+		// })
+	},
+	methods: {
+		getParentWeith() {
+			return new Promise(resolve => {
+				dom.getComponentRect(this.$refs.limepainter, (res) => {
+					this.parentWidth = Math.ceil(res.size.width)
+					this.canvasWidth = this.canvasWidth || this.parentWidth ||300
+					this.canvasHeight = res.size.height || this.canvasHeight||150
+					resolve(res.size)
+				})
+			})
+		},
+		onPageFinish() {
+			this.webview = this.$refs.webview
+			this.webview.evalJS(`init(${this.dpr})`)
+		},
+		onMessage(e) {
+			const res = e.detail.data[0] || null;
+			if (res.event) {
+				if (res.event == 'inited') {
+					this.inited = true
+				}
+				if(res.event == 'fail'){
+					this.$emit('fail', res)
+				}
+				if (res.event == 'layoutChange') {
+					const data = typeof res.data == 'string' ? JSON.parse(res.data) : res.data
+					this.canvasWidth = Math.ceil(data.width);
+					this.canvasHeight = Math.ceil(data.height);
+				}
+				if (res.event == 'progressChange') {
+					this.progress = res.data * 1
+				}
+				if (res.event == 'file') {
+					this.tempFilePath.push(res.data)
+					if (this.tempFilePath.length > 7) {
+						this.tempFilePath.shift()
+					}
+					return
+				}
+				if (res.event == 'success') {
+					if (res.data) {
+						this.tempFilePath.push(res.data)
+						if (this.tempFilePath.length > 8) {
+							this.tempFilePath.shift()
+						}
+						if (this.isCanvasToTempFilePath) {
+							this.setFilePath(this.tempFilePath.join(''), {isEmit:true})
+						}
+					} else {
+						this.$emit('fail', 'canvas no data')
+					}
+					return
+				}
+				this.$emit(res.event, JSON.parse(res.data));
+			} else if (res.file) {
+				this.file = res.data;
+			} else{
+				console.info(res[0])
+			}
+		},
+		getWebViewInited() {
+			if (this.inited) return Promise.resolve(this.inited);
+			return new Promise((resolve) => {
+				this.$watch(
+					'inited',
+					async val => {
+						if (val) {
+							resolve(val)
+						}
+					}, {
+						immediate: true
+					}
+				);
+			})
+		},
+		getTempFilePath() {
+			if (this.tempFilePath.length == 8) return Promise.resolve(this.tempFilePath)
+			return new Promise((resolve) => {
+				this.$watch(
+					'tempFilePath',
+					async val => {
+						if (val.length == 8) {
+							resolve(val.join(''))
+						}
+					}
+				);
+			})
+		},
+		getWebViewDone() {
+			if (this.progress == 1) return Promise.resolve(this.progress);
+			return new Promise((resolve) => {
+				this.$watch(
+					'progress',
+					async val => {
+						if (val == 1) {
+							this.$emit('done')
+							this.done = true
+							resolve(val)
+						}
+					}, {
+						immediate: true
+					}
+				);
+			})
+		},
+		async render(args) {
+			try {
+				await this.getSize(args)
+				const {width} = args.css || args
+				if(!width && this.parentWidth) {
+					Object.assign(args, {width: this.parentWidth})
+				}
+				const newNode = await this.calcImage(args);
+				await this.getWebViewInited()
+				this.webview.evalJS(`source(${JSON.stringify(newNode)})`)
+				await this.getWebViewDone()
+				await sleep(this.afterDelay)
+				if (this.isCanvasToTempFilePath) {
+					const params = {
+						fileType: this.fileType,
+						quality: this.quality
+					}
+					this.webview.evalJS(`save(${JSON.stringify(params)})`)
+				}
+				return Promise.resolve()
+			} catch (e) {
+				this.$emit('fail', e)
+			}
+		},
+		getfile(e){
+			let url = plus.io.convertLocalFileSystemURL( e )
+			return new Promise((resolve,reject)=>{
+				plus.io.resolveLocalFileSystemURL(url, entry => {
+					var reader = null;
+					entry.file( file => {
+						reader = new plus.io.FileReader();
+						reader.onloadend =  ( read )=> {
+							resolve(read.target.result)
+						};
+						reader.readAsDataURL( file );
+					}, function ( error ) {
+						alert( error.message );
+					} );
+				},err=>{
+					resolve(e)
+				})
+			})
+		},
+		async calcImage(args) {
+			let node = JSON.parse(JSON.stringify(args))
+			const urlReg = /url\((.+)\)/
+			const {backgroundImage} = node.css||{}
+			const isBG = backgroundImage && urlReg.exec(backgroundImage)[1]
+			const url = node.url || node.src || isBG
+			if(['text', 'qrcode'].includes(node.type)) {
+				return node
+			}
+			if ((node.type === "image" || isBG) && url && !isBase64(url) && (this.osName == 'ios' ? true : !networkReg.test(url))) {
+				let {path} = await getImageInfo(url)
+				if(this.osName == 'ios') {
+					path = await this.getfile(path)
+				}
+				if (isBG) {
+					node.css.backgroundImage = `url(${path})`
+				} else {
+					node.src = path
+				}
+			} else if (node.views && node.views.length) {
+				for (let i = 0; i < node.views.length; i++) {
+					node.views[i] = await this.calcImage(node.views[i])
+				}
+			}
+			return node
+		},
+		async canvasToTempFilePath(args = {}) {
+			if (!this.inited) {
+				return this.$emit('fail', 'no init')
+			}
+			this.tempFilePath = []
+			if (args.fileType == 'jpg') {
+				args.fileType = 'jpeg'
+			}
+			this.webview.evalJS(`save(${JSON.stringify(args)})`)
+			try {
+				let tempFilePath = await this.getTempFilePath()
+				tempFilePath = await this.setFilePath(tempFilePath)
+				args.success({
+					errMsg: "canvasToTempFilePath:ok",
+					tempFilePath
+				})
+			} catch (e) {
+				args.fail({
+					error: e
+				})
+			}
+		}
+	}
+}
+// #endif
\ No newline at end of file
diff --git a/uni_modules/lime-painter/components/l-painter/painter.js b/uni_modules/lime-painter/components/l-painter/painter.js
new file mode 100644
index 0000000..b0813bc
--- /dev/null
+++ b/uni_modules/lime-painter/components/l-painter/painter.js
@@ -0,0 +1 @@
+var t=function(){return t=Object.assign||function(t){for(var e,i=1,n=arguments.length;i<n;i++)for(var r in e=arguments[i])Object.prototype.hasOwnProperty.call(e,r)&&(t[r]=e[r]);return t},t.apply(this,arguments)};function e(t,e,i,n){return new(i||(i=Promise))((function(r,o){function s(t){try{h(n.next(t))}catch(t){o(t)}}function a(t){try{h(n.throw(t))}catch(t){o(t)}}function h(t){var e;t.done?r(t.value):(e=t.value,e instanceof i?e:new i((function(t){t(e)}))).then(s,a)}h((n=n.apply(t,e||[])).next())}))}function i(t,e){var i,n,r,o,s={label:0,sent:function(){if(1&r[0])throw r[1];return r[1]},trys:[],ops:[]};return o={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(o[Symbol.iterator]=function(){return this}),o;function a(o){return function(a){return function(o){if(i)throw new TypeError("Generator is already executing.");for(;s;)try{if(i=1,n&&(r=2&o[0]?n.return:o[0]?n.throw||((r=n.return)&&r.call(n),0):n.next)&&!(r=r.call(n,o[1])).done)return r;switch(n=0,r&&(o=[2&o[0],r.value]),o[0]){case 0:case 1:r=o;break;case 4:return s.label++,{value:o[1],done:!1};case 5:s.label++,n=o[1],o=[0];continue;case 7:o=s.ops.pop(),s.trys.pop();continue;default:if(!(r=s.trys,(r=r.length>0&&r[r.length-1])||6!==o[0]&&2!==o[0])){s=0;continue}if(3===o[0]&&(!r||o[1]>r[0]&&o[1]<r[3])){s.label=o[1];break}if(6===o[0]&&s.label<r[1]){s.label=r[1],r=o;break}if(r&&s.label<r[2]){s.label=r[2],s.ops.push(o);break}r[2]&&s.ops.pop(),s.trys.pop();continue}o=e.call(t,s)}catch(t){o=[6,t],n=0}finally{i=r=0}if(5&o[0])throw o[1];return{value:o[0]?o[1]:void 0,done:!0}}([o,a])}}}var n,r,o={MP_WEIXIN:"mp-weixin",MP_QQ:"mp-qq",MP_ALIPAY:"mp-alipay",MP_BAIDU:"mp-baidu",MP_TOUTIAO:"mp-toutiao",MP_DINGDING:"mp-dingding",H5:"h5",WEB:"web",PLUS:"plus"},s=["contentSize","clientSize","borderSize","offsetSize"],a="row",h="column",d="top",c="middle",l="bottom",f="left",u="center",p="right",g="view",v="text",y="image",b="qrcode",x="block",m="inline-block",w="none",S="flex",z="absolute",B="fixed",M={display:x,color:"#000000",lineHeight:"1.4em",fontSize:14,fontWeight:400,fontFamily:"sans-serif",lineCap:"butt",flexDirection:a,flexWrap:"nowrap",textAlign:"left",alignItems:"flex-start",justifyContent:"flex-start",position:"static",transformOrigin:"center center"},I={upx2px:function(t){return window.innerWidth/750*t},getSystemInfoSync:function(){return{screenWidth:window.innerWidth}},getImageInfo:function(t){var e=t.src,i=t.success,n=t.fail,r=new Image;r.onload=function(){i({width:this.naturalWidth,height:this.naturalHeight,path:this.src,src:e})},r.onerror=n,r.src=e}},k="object"==typeof window?"undefined"==typeof uni||"undefined"!=typeof uni&&!uni.addInterceptor?o.WEB:o.H5:"object"==typeof swan?o.MP_BAIDU:"object"==typeof tt?o.MP_TOUTIAO:"object"==typeof plus?o.PLUS:"object"==typeof wx?o.MP_WEIXIN:void 0,P=k==o.MP_WEIXIN?wx:"undefined"!=typeof uni?uni.getImageInfo?{upx2px:function(t){return uni.upx2px(t)},getSystemInfoSync:function(){return uni.getSystemInfoSync()},getImageInfo:function(t){return uni.getImageInfo(t)},downloadFile:function(t){return uni.downloadFile(t)}}:Object.assign(uni,I):"undefined"!=typeof window?I:uni;if(!P.upx2px){var W=(null!==(r=P.getSystemInfoSync&&(null===(n=uni.getSystemInfoSync())||void 0===n?void 0:n.screenWidth))&&void 0!==r?r:375)/750;P.upx2px=function(t){return W*t}}function R(t){return/^-?\d+(\.\d+)?$/.test(t)}function O(t,e,i){if("number"==typeof t)return t;if(R(t))return 1*t;if("string"==typeof t){var n=/^-?([0-9]+)?([.]{1}[0-9]+){0,1}(em|rpx|px|%)$/g.exec(t);if(!t||!n)return 0;var r=n[3];t=parseFloat(t);var o=0;return"rpx"===r?o=P.upx2px(t):"px"===r?o=1*t:"%"===r&&e?o=t*O(e)/100:"em"===r&&e&&(o=t*O(e||14)),1*o.toFixed(2)}return 0}function L(t){return/%$/.test(t)}var T=function(t){return!(!t||!t.startsWith("linear")&&!t.startsWith("radial"))},A=function(t,e,i,n,r,o){t.startsWith("linear")?function(t,e,i,n,r,o){for(var s=function(t,e,i,n,r){void 0===n&&(n=0);void 0===r&&(r=0);var o=t.match(/([-]?\d{1,3})deg/),s=o&&o[1]?parseFloat(o[1]):0;s>=360&&(s-=360);s<0&&(s+=360);if(0===(s=Math.round(s)))return{x0:Math.round(e/2)+n,y0:i+r,x1:Math.round(e/2)+n,y1:r};if(180===s)return{x0:Math.round(e/2)+n,y0:r,x1:Math.round(e/2)+n,y1:i+r};if(90===s)return{x0:n,y0:Math.round(i/2)+r,x1:e+n,y1:Math.round(i/2)+r};if(270===s)return{x0:e+n,y0:Math.round(i/2)+r,x1:n,y1:Math.round(i/2)+r};var a=Math.round(180*Math.asin(e/Math.sqrt(Math.pow(e,2)+Math.pow(i,2)))/Math.PI);if(s===a)return{x0:n,y0:i+r,x1:e+n,y1:r};if(s===180-a)return{x0:n,y0:r,x1:e+n,y1:i+r};if(s===180+a)return{x0:e+n,y0:r,x1:n,y1:i+r};if(s===360-a)return{x0:e+n,y0:i+r,x1:n,y1:r};var h=0,d=0,c=0,l=0;if(s<a||s>180-a&&s<180||s>180&&s<180+a||s>360-a){var f=s*Math.PI/180,u=s<a||s>360-a?i/2:-i/2,p=Math.tan(f)*u,g=s<a||s>180-a&&s<180?e/2-p:-e/2-p;h=-(c=p+(v=Math.pow(Math.sin(f),2)*g)),d=-(l=u+v/Math.tan(f))}if(s>a&&s<90||s>90&&s<90+a||s>180+a&&s<270||s>270&&s<360-a){var v;f=(90-s)*Math.PI/180,p=s>a&&s<90||s>90&&s<90+a?e/2:-e/2,u=Math.tan(f)*p,g=s>a&&s<90||s>270&&s<360-a?i/2-u:-i/2-u;h=-(c=p+(v=Math.pow(Math.sin(f),2)*g)/Math.tan(f)),d=-(l=u+v)}return h=Math.round(h+e/2)+n,d=Math.round(i/2-d)+r,c=Math.round(c+e/2)+n,l=Math.round(i/2-l)+r,{x0:h,y0:d,x1:c,y1:l}}(r,t,e,i,n),a=s.x0,h=s.y0,d=s.x1,c=s.y1,l=o.createLinearGradient(a,h,d,c),f=r.match(/linear-gradient\((.+)\)/)[1],u=F(f.substring(f.indexOf(",")+1)),p=0;p<u.colors.length;p++)l.addColorStop(u.percents[p],u.colors[p]);o.setFillStyle(l)}(e,i,n,r,t,o):t.startsWith("radial")&&function(t,e,i,n,r,o){for(var s=F(r.match(/radial-gradient\((.+)\)/)[1]),a=Math.round(t/2)+i,h=Math.round(e/2)+n,d=o.createRadialGradient(a,h,0,a,h,Math.max(t,e)/2),c=0;c<s.colors.length;c++)d.addColorStop(s.percents[c],s.colors[c]);o.setFillStyle(d)}(e,i,n,r,t,o)};function F(t){for(var e=[],i=[],n=0,r=t.substring(0,t.length-1).split("%,");n<r.length;n++){var o=r[n];e.push(o.substring(0,o.lastIndexOf(" ")).trim()),i.push(o.substring(o.lastIndexOf(" "),o.length)/100)}return{colors:e,percents:i}}function j(t,e,i){return e in t?Object.defineProperty(t,e,{value:i,enumerable:!0,configurable:!0,writable:!0}):t[e]=i,t}function C(){return C=Object.assign?Object.assign.bind():function(t){for(var e=1;e<arguments.length;e++){var i=arguments[e];for(var n in i)Object.prototype.hasOwnProperty.call(i,n)&&(t[n]=i[n])}return t},C.apply(this,arguments)}function E(t,e){return E=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},E(t,e)}function H(t,e){(null==e||e>t.length)&&(e=t.length);for(var i=0,n=new Array(e);i<e;i++)n[i]=t[i];return n}function U(t,e){var i="undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(i)return(i=i.call(t)).next.bind(i);if(Array.isArray(t)||(i=function(t,e){if(t){if("string"==typeof t)return H(t,e);var i=Object.prototype.toString.call(t).slice(8,-1);return"Object"===i&&t.constructor&&(i=t.constructor.name),"Map"===i||"Set"===i?Array.from(t):"Arguments"===i||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(i)?H(t,e):void 0}}(t))||e&&t&&"number"==typeof t.length){i&&(t=i);var n=0;return function(){return n>=t.length?{done:!0}:{done:!1,value:t[n++]}}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function Y(t){return"number"==typeof t}function $(t){return"auto"===t||null===t}function D(t){return/%$/.test(t)}var X,_=0,N=function(){function t(){j(this,"elements",[]),j(this,"afterElements",[]),j(this,"beforeElements",[]),j(this,"ids",[]),j(this,"width",0),j(this,"height",0),j(this,"top",0),j(this,"left",0),j(this,"pre",null),j(this,"offsetX",0),j(this,"offsetY",0),_++,this.id=_}var e=t.prototype;return e.fixedBind=function(t,e){void 0===e&&(e=0),this.container=e?t.parent:t.root,this.container.fixedLine=this,this.fixedAdd(t)},e.fixedAdd=function(t){this.elements.push(t);var e=t.computedStyle.zIndex;(void 0===e?0:e)>=0?this.afterElements.push(t):this.beforeElements.push(t),this.refreshLayout()},e.bind=function(t){this.container=t.parent,this.container.line=null,this.container.lines?(this.container.lines.push(this),this.pre=this.getPreLine(),this.top=this.pre.top+this.pre.height,this.left=this.container.contentSize.left):(this.top=this.container.contentSize.top,this.left=this.container.contentSize.left,this.container.lines=[this]),this.isInline=t.isInline(),this.container.line=this,this.outerWidth=t.parent&&t.parent.contentSize.width?t.parent.contentSize.width:1/0,this.add(t)},e.getPreLine=function(){return this.container.lines[this.container.lines.length-2]},e.canIEnter=function(t){return!((100*t.offsetSize.width+100*this.width)/100>this.outerWidth)||(this.closeLine(),!1)},e.closeLine=function(){delete this.container.line},e.add=function(t){this.ids.push(t.id),this.elements.push(t),this.refreshWidthHeight(t)},e.refreshWidthHeight=function(t){t.offsetSize.height>this.height&&(this.height=t.offsetSize.height),this.width+=t.offsetSize.width||0,(this.container.lineMaxWidth||0)<this.width&&(this.container.lineMaxWidth=this.width)},e.refreshXAlign=function(){if(this.isInline){var t=this.container.contentSize.width-this.width,e=this.container.style.textAlign;"center"===e?t/=2:"left"===e&&(t=0),this.offsetX=t}},e.getOffsetY=function(t){if(!t||!t.style)return 0;var e=(t.style||{}).verticalAlign;return"bottom"===e?this.height-t.contentSize.height:"middle"===e?(this.height-t.contentSize.height)/2:0},e.layout=function(t,e){for(var i in this.refreshXAlign(),this.pre?(this.top=this.pre.top+this.pre.height+this.offsetY,this.left=e+this.offsetX):(this.top=Math.max(this.top,this.container.contentSize.top,t)+this.offsetY,this.left=Math.max(this.left,this.container.contentSize.left,e)+this.offsetX),this.elements){var n=this.elements[i],r=this.elements[i-1],o=this.getOffsetY(n);n.style.top=this.top+o,n.style.left=r?r.offsetSize.left+r.offsetSize.width:this.left,n.getBoxPosition2()}},e.refreshLayout=function(){this.afterElements=this.afterElements.sort((function(t,e){return t.computedStyle.zIndex-e.computedStyle.zIndex})),this.beforeElements=this.beforeElements.sort((function(t,e){return t.computedStyle.zIndex-e.computedStyle.zIndex}))},t}(),V=((X={})[a]={width:"width",contentWidth:"width",x:"x",y:"y",contentX:"left",height:"height",contentHeight:"height"},X[h]={width:"height",contentWidth:"height",x:"y",y:"x",contentX:"top",height:"width",contentHeight:"width"},X),G=function(t){var e,i;function n(){var e;return j(function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(e=t.call(this)||this),"outerWidth",0),e.exactValue=0,e.flexTotal=0,e.key=null,e}i=t,(e=n).prototype=Object.create(i.prototype),e.prototype.constructor=e,E(e,i);var r=n.prototype;return r.bind=function(t){console.warn("[painter] flex-box 功能未完善谨慎使用"),this.container=t.parent,this.container.line=this,this.container.lines?(this.container.lines.push(this),this.pre=this.getPreLine(),this.top=this.pre.top+this.pre.height,this.left=this.container.contentSize.left):(this.top=this.container.contentSize.top,this.left=this.container.contentSize.left,this.container.lines=[this]),t.parent&&(this.key=V[t.parent.style.flexDirection]),this.initHeight(t),this.outerWidth=t.parent&&t.parent.contentSize[this.key.contentWidth]?t.parent.contentSize[this.key.contentWidth]:1/0,this.add(t)},r.add=function(t){this.ids.push(t.id),Y(t.style.flex)?this.flexTotal+=t.style.flex:Y(t.style[this.key.width])&&(this.exactValue+=t.contentSize[this.key.width]),this.elements.push(t),this.refreshWidthHeight(t),t.next||this.closeLine()},r.closeLine=function(){this.calcFlex()},r.initHeight=function(t){this[this.key.height]=0},r.calcFlex=function(){var t=this,e=this.container.contentSize[this.key.contentWidth];this.elements.forEach((function(i){var n=i.style.width||0;Y(i.style.flex)&&(n=i.style.flex/t.flexTotal*(e-t.exactValue)),i.computedStyle[t.key.width]=n,i.getBoxWidthHeight()}))},r.refreshWidthHeight=function(t){this.container.style.alignItems&&!t.style.alignSelf&&(t.style.alignSelf=this.container.style.alignItems),t.contentSize[this.key.height]>this[this.key.height]&&(this[this.key.height]=t.offsetSize[this.key.height]),this[this.key.width]+=t.offsetSize[this.key.width],(this.container.lineMaxWidth||0)<this[this.key.width]&&(this.container.lineMaxWidth=this[this.key.width])},r.refreshXAlign=function(){var t=this,e=this.elements.reduce((function(e,i){return e+i.offsetSize[t.key.width]}),0),i=this.outerWidth==1/0?0:this.outerWidth-Math.max(this[this.key.width],e);"center"===this.container.style.justifyContent?i/=2:"flex-start"===this.container.style.justifyContent&&(i=0),this.offsetX=i||0,this.refreshYAlign()},r.refreshYAlign=function(){if(1==this.container.lines.length)return 0;var t=this.container.lines.reduce((function(t,e){return t+e.height}),0);if("center"===this.container.style.alignItems){var e=(this.container.contentSize[this.key.contentHeight]-t)/(this.container.lines.length+1);this.container.lines.forEach((function(t){t.offsetY=e}))}if("flex-end"===this.container.style.alignItems){var i=this.container.contentSize[this.key.contentHeight]-t;this.container.lines[0].offsetY=i}},r.getOffsetY=function(t){return this.container.lines.length>1?0:"flex-end"===t.style.alignSelf?this.container.contentSize[this.key.contentHeight]-t.contentSize[this.key.height]:"center"===t.style.alignSelf?(this.container.contentSize[this.key.contentHeight]-t.contentSize[this.key.height])/2:0},n}(N),q=y,J=v,Q=g,Z=b,K=x,et=m,it=S,nt=z,rt=B,ot=0,st={left:null,top:null,width:null,height:null},at=function(){function t(t,e,i,n){var r=this;j(this,"id",ot++),j(this,"style",{left:null,top:null,width:null,height:null}),j(this,"computedStyle",{}),j(this,"originStyle",{}),j(this,"children",{}),j(this,"layoutBox",C({},st)),j(this,"contentSize",C({},st)),j(this,"clientSize",C({},st)),j(this,"borderSize",C({},st)),j(this,"offsetSize",C({},st)),this.ctx=n,this.root=i,e&&(this.parent=e),this.name=t.name||t.type,this.attributes=this.getAttributes(t);var o=this.getComputedStyle(t,null==e?void 0:e.computedStyle);this.isAbsolute=o.position==nt,this.isFixed=o.position==rt,this.originStyle=o,Object.keys(o).forEach((function(t){Object.defineProperty(r.style,t,{configurable:!0,enumerable:!0,get:function(){return o[t]},set:function(e){o[t]=e}})}));var s={contentSize:C({},this.contentSize),clientSize:C({},this.clientSize),borderSize:C({},this.borderSize),offsetSize:C({},this.offsetSize)};Object.keys(s).forEach((function(t){Object.keys(r[t]).forEach((function(e){Object.defineProperty(r[t],e,{configurable:!0,enumerable:!0,get:function(){return s[t][e]},set:function(i){s[t][e]=i}})}))})),this.computedStyle=this.style}var e=t.prototype;return e.add=function(t){t.parent=this,this.children[t.id]=t},e.getChildren=function(){var t=this;return Object.keys(this.children).map((function(e){return t.children[e]}))},e.getLineRect=function(t,e){var i={width:0,height:0},n=e?e.lines:this.parent&&this.parent.lines;return n&&n.find((function(e){return e.ids.includes(t)}))||i},e.getComputedStyle=function(t,e){var i=["color","fontSize","lineHeight","verticalAlign","fontWeight","textAlign"],n=t.css,r=void 0===n?{}:n,o=t.type,s=void 0===o?Q:o,a=C({},M);if([J,q,Z].includes(s)&&!r.display&&(a.display=et),e)for(var h=0;h<i.length;h++){var d=i[h];(r[d]||e[d])&&(r[d]=r[d]||e[d])}for(var c=function(){var t=f[l],e=r[t];if(/-/.test(t)&&(t=t.replace(/-([a-z])/g,(function(t,e){return e.toUpperCase()})),a.key=e),/^(box|text)?shadow$/i.test(t)){var i=[];return e.replace(/((\d+(rpx|px)?\s+?){3})(.+)/,(function(){for(var t=arguments.length,e=new Array(t),n=0;n<t;n++)e[n]=arguments[n];i=e[1].match(/\d+(rpx|px)?/g).map((function(t){return O(t)})).concat(e[4])})),/^text/.test(t)?a.textShadow=i:a.boxShadow=i,"continue"}if(/^border/i.test(t)&&!/radius$/i.test(t)){var n,o=t.match(/^border([BTRLa-z]+)?/)[0],h=t.match(/[W|S|C][a-z]+/),d=e.replace(/([\(,])\s+|\s+([\),])/g,"$1$2").split(" ").map((function(t){return/^\d/.test(t)?O(t,""):t}));return a[o]=((n={})[o+"Width"]=R(d[0])?d[0]:0,n[o+"Style"]=d[1]||"solid",n[o+"Color"]=d[2]||"black",n),1==d.length&&h&&(a[o][o+h[0]]=d[0]),"continue"}if(/^background(color)?$/i.test(t))return a.backgroundColor=e,"continue";if(/^objectPosition$/i.test(t))return a[t]=e.split(" "),"continue";if(/padding|margin|radius/i.test(t)){var c=/radius$/i.test(t),u=c?"borderRadius":t.match(/[a-z]+/)[0],p=[0,0,0,0].map((function(t,e){return c?["borderTopLeftRadius","borderTopRightRadius","borderBottomRightRadius","borderBottomLeftRadius"][e]:[u+"Top",u+"Right",u+"Bottom",u+"Left"][e]})),g="margin";if("padding"===t||t===g||/^(border)?radius$/i.test(t)){var v,y=(null==e?void 0:e.split(" ").map((function(e){return/^\d+(rpx|px)?$/.test(e)?O(e):t!=g&&/auto/.test(e)?0:e}),[]))||[0],b=c?"borderRadius":t,x=y[0],m=y[1],w=y[2],S=y[3];a[b]=((v={})[p[0]]=$(x)?0:x,v[p[1]]=R(m)||$(m)?m:x,v[p[2]]=$(R(w)?w:x)?0:R(w)?w:x,v[p[3]]=R(S)?S:m||x,v)}else{var z;if("object"==typeof a[u])a[u][t]=u==g&&$(e)||D(e)?e:O(e);else a[u]=((z={})[p[0]]=a[u]||0,z[p[1]]=a[u]||0,z[p[2]]=a[u]||0,z[p[3]]=a[u]||0,z),a[u][t]=u==g&&$(e)||D(e)?e:O(e)}return"continue"}if(/^transform$/i.test(t))return a[t]={},e.replace(/([a-zA-Z]+)\(([0-9,-\.%rpxdeg\s]+)\)/g,(function(e,i,n){var o=n.split(",").map((function(t){return t.replace(/(^\s*)|(\s*$)/g,"")})),s=function(t,e){return t.includes("deg")?1*t:e&&!D(e)?O(t,e):t};i.includes("matrix")?a[t][i]=o.map((function(t){return 1*t})):i.includes("rotate")?a[t][i]=1*n.match(/^-?\d+(\.\d+)?/)[0]:/[X, Y]/.test(i)?a[t][i]=/[X]/.test(i)?s(o[0],r.width):s(o[0],r.height):(a[t][i+"X"]=s(o[0],r.width),a[t][i+"Y"]=s(o[1]||o[0],r.height))})),"continue";/^font$/i.test(t)&&console.warn("font 不支持简写"),/^left|top$/i.test(t)&&![nt,rt].includes(r.position)?a[t]=0:a[t]=/^[\d\.]+(px|rpx)?$/.test(e)?O(e):/em$/.test(e)&&s==J?O(e,r.fontSize):e},l=0,f=Object.keys(r);l<f.length;l++)c();return a},e.setPosition=function(t,e){var i={left:"width",top:"height",right:"width",bottom:"height"};Object.keys(i).forEach((function(n){var r="right"==n?"left":"top";["right","bottom"].includes(n)&&void 0!==t.style[n]&&"number"!=typeof t.originStyle[r]?t.style[r]=e[i[n]]-t.offsetSize[i[n]]-O(t.style[n],e[i[n]]):t.style[n]=O(t.style[n],e[i[n]])}))},e.getAttributes=function(t){var e=t.attributes||{};return(t.url||t.src)&&(e.src=e.src||t.url||t.src),t.replace&&(e.replace=t.replace),t.text&&(e.text=t.text),e},e.getOffsetSize=function(t,e,i){void 0===i&&(i=s[3]);var n=e||{},r=n.margin,o=(r=void 0===r?{}:r).marginLeft,a=void 0===o?0:o,h=r.marginTop,d=void 0===h?0:h,c=r.marginRight,l=void 0===c?0:c,f=r.marginBottom,u=void 0===f?0:f,p=n.padding,g=(p=void 0===p?{}:p).paddingLeft,v=void 0===g?0:g,y=p.paddingTop,b=void 0===y?0:y,x=p.paddingRight,m=void 0===x?0:x,w=p.paddingBottom,S=void 0===w?0:w,z=n.border,B=(z=void 0===z?{}:z).borderWidth,M=void 0===B?0:B,I=n.borderTop,k=(I=void 0===I?{}:I).borderTopWidth,P=void 0===k?M:k,W=n.borderBottom,R=(W=void 0===W?{}:W).borderBottomWidth,O=void 0===R?M:R,L=n.borderRight,T=(L=void 0===L?{}:L).borderRightWidth,A=void 0===T?M:T,F=n.borderLeft,j=(F=void 0===F?{}:F).borderLeftWidth,C=void 0===j?M:j,E=a<0&&l<0?Math.abs(a+l):0,H=d<0&&u<0?Math.abs(d+u):0,U=a>=0&&l<0,Y=d>=0&&u<0;return i==s[0]&&(this[i].left=t.left+a+v+C+(U?2*-l:0),this[i].top=t.top+d+b+P+(Y?2*-u:0),this[i].width=t.width+(this[i].widthAdd?0:E),this[i].height=t.height+(this[i].heightAdd?0:H),this[i].widthAdd=E,this[i].heightAdd=H),i==s[1]&&(this[i].left=t.left+a+C+(U<0?-l:0),this[i].top=t.top+d+P+(Y?-u:0),this[i].width=t.width+v+m,this[i].height=t.height+b+S),i==s[2]&&(this[i].left=t.left+a+C/2+(U<0?-l:0),this[i].top=t.top+d+P/2+(Y?-u:0),this[i].width=t.width+v+m+C/2+A/2,this[i].height=t.height+b+S+O/2+P/2),i==s[3]&&(this[i].left=t.left+(U<0?-l:0),this[i].top=t.top+(Y?-u:0),this[i].width=t.width+v+m+C+A+a+l,this[i].height=t.height+b+S+O+P+u+d),this[i]},e.layoutBoxUpdate=function(t,e,i,n){var r=this;if(void 0===i&&(i=-1),"border-box"==e.boxSizing){var o=e||{},a=o.border,h=(a=void 0===a?{}:a).borderWidth,d=void 0===h?0:h,c=o.borderTop,l=(c=void 0===c?{}:c).borderTopWidth,f=void 0===l?d:l,u=o.borderBottom,p=(u=void 0===u?{}:u).borderBottomWidth,g=void 0===p?d:p,v=o.borderRight,y=(v=void 0===v?{}:v).borderRightWidth,b=void 0===y?d:y,x=o.borderLeft,m=(x=void 0===x?{}:x).borderLeftWidth,w=void 0===m?d:m,S=o.padding,z=(S=void 0===S?{}:S).paddingTop,B=void 0===z?0:z,M=S.paddingRight,I=void 0===M?0:M,k=S.paddingBottom,P=void 0===k?0:k,W=S.paddingLeft,R=void 0===W?0:W;i||(t.width-=R+I+b+w),1!==i||n||(t.height-=B+P+f+g)}this.layoutBox&&(s.forEach((function(i){return r.layoutBox[i]=r.getOffsetSize(t,e,i)})),this.layoutBox=Object.assign({},this.layoutBox,this.layoutBox.borderSize))},e.getBoxPosition2=function(){var t=this.computedStyle,e=this.fixedLine,i=this.lines,n=t.left,r=void 0===n?0:n,o=t.top,s=void 0===o?0:o,a=t.padding||{},h=a.paddingBottom,d=void 0===h?0:h,c=a.paddingRight,l=void 0===c?0:c,f=C({},this.contentSize,{left:r,top:s}),u=this.contentSize.top-this.offsetSize.top,p=this.contentSize.left-this.offsetSize.left;if(this.root.fixedLine&&!this.root.isDone){this.root.isDone=!0;for(var g,v=U(this.root.fixedLine.elements);!(g=v()).done;){var y=g.value;y.setPosition(y,this.root.offsetSize),y.getBoxPosition2()}}if(e)for(var b,x=U(e.elements);!(b=x()).done;){var m=b.value;m.setPosition(m,f),m.style.left+=r+p+l,m.style.top+=s+u+d,m.getBoxPosition2()}if(i)for(var w,S=U(i);!(w=S()).done;){w.value.layout(f.top+u,f.left+p)}return this.layoutBoxUpdate(f,t),this.layoutBox},e.getBoxState=function(t,e){return this.isBlock(t)||this.isBlock(e)},e.isBlock=function(t){return void 0===t&&(t=this),t&&t.style.display==K},e.isFlex=function(t){return void 0===t&&(t=this),t&&t.style.display==it},e.isInFlow=function(){return!(this.isAbsolute||this.isFixed)},e.inFlexBox=function(t){return void 0===t&&(t=this),!!t.isInFlow()&&(!!t.parent&&(!(!t.parent||t.parent.style.display!==it)||void 0))},e.isInline=function(t){return void 0===t&&(t=this),t&&t.style.display==et},e.contrastSize=function(t,e,i){var n=t;return i&&(n=Math.min(n,i)),e&&(n=Math.max(n,e)),n},e.measureText=function(t,e){var i=this.ctx.measureText(t),n=i.width,r=i.actualBoundingBoxAscent,o=i.actualBoundingBoxDescent;return{ascent:r,descent:o,width:n,fontHeight:r+o||.7*e+1}},e.getBoxWidthHeight=function(){var t,e=this,i=this.name,n=this.computedStyle,r=this.attributes,o=this.parent,s=void 0===o?{}:o,a=this.ctx,h=this.getChildren(),d=n.left,c=void 0===d?0:d,l=n.top,f=void 0===l?0:l,u=n.bottom,p=n.right,g=n.width,v=void 0===g?0:g,y=n.minWidth,b=n.maxWidth,x=n.minHeight,m=n.maxHeight,w=n.height,S=void 0===w?0:w,z=n.fontSize,B=void 0===z?14:z,M=n.fontWeight,I=n.fontFamily,k=n.fontStyle,P=n.position,W=n.lineClamp,R=n.lineHeight,L=n.padding,T=void 0===L?{}:L,A=n.margin,F=void 0===A?{}:A,j=n.border,C=(j=void 0===j?{}:j).borderWidth,E=void 0===C?0:C,H=n.borderRight,U=(H=void 0===H?{}:H).borderRightWidth,Y=void 0===U?E:U,$=n.borderLeft,X=($=void 0===$?{}:$).borderLeftWidth,_=void 0===X?E:X,V=s.contentSize&&s.contentSize.width,Z=s.contentSize&&s.contentSize.height;if(D(v)&&V&&(v=O(v,V)),D(v)&&!V&&(v=null),D(S)&&Z&&(S=O(S,Z)),D(S)&&!Z&&(S=null),D(y)&&V&&(y=O(y,V)),D(b)&&V&&(b=O(b,V)),D(x)&&Z&&(x=O(x,Z)),D(m)&&Z&&(m=O(m,Z)),n.padding&&null!=(t=s.contentSize)&&t.width)for(var K in n.padding)Object.hasOwnProperty.call(n.padding,K)&&(n.padding[K]=O(n.padding[K],V));var tt=T.paddingRight,et=void 0===tt?0:tt,it=T.paddingLeft,rt=void 0===it?0:it;if(n.margin&&[n.margin.marginLeft,n.margin.marginRight].includes("auto"))if(v){var ot=V&&V-v-et-rt-_-Y||0;n.margin.marginLeft==n.margin.marginRight?n.margin.marginLeft=n.margin.marginRight=ot/2:"auto"==n.margin.marginLeft?n.margin.marginLeft=ot:n.margin.marginRight=ot}else n.margin.marginLeft=n.margin.marginRight=0;var st=F.marginRight,at=void 0===st?0:st,ht=F.marginLeft,dt={width:v,height:S,left:0,top:0},ct=rt+et+_+Y+(void 0===ht?0:ht)+at;if(i==J&&!this.attributes.widths){var lt=r.text||"";a.save(),a.setFonts({fontFamily:I,fontSize:B,fontWeight:M,fontStyle:k});var ft=new Map;lt.split("\n").map((function(t){var i=t.split("").map((function(t){var i=ft.get(t);if(i)return i;var n=e.measureText(t,B).width;return ft.set(t,n),n})),n=e.measureText(t,B),r=n.fontHeight,o=n.ascent,s=n.descent;e.attributes.fontHeight=r,e.attributes.ascent=o,e.attributes.descent=s,e.attributes.widths||(e.attributes.widths=[]),e.attributes.widths.push({widths:i,total:i.reduce((function(t,e){return t+e}),0)})})),a.restore()}if(i==q&&null==v){var ut=r.width,pt=r.height;dt.width=this.contrastSize(Math.round(ut*S/pt)||0,y,b),this.layoutBoxUpdate(dt,n,0)}if(i==J&&null==v){var gt=this.attributes.widths,vt=Math.max.apply(Math,gt.map((function(t){return t.total})));if(s&&V>0&&(vt>V||this.isBlock(this))&&!this.isAbsolute&&!this.isFixed)vt=V-ct;dt.width=this.contrastSize(vt,y,b),this.layoutBoxUpdate(dt,n,0)}if(i==J&&!this.attributes.lines){var yt=this.attributes.widths.length;this.attributes.widths.forEach((function(t){return t.widths.reduce((function(t,e,i){return t+e>dt.width?(yt++,e):t+e}),0)})),yt=W&&yt>W?W:yt,this.attributes.lines=yt}if(i==q&&null==S){var bt=r.width,xt=r.height;dt.height=this.contrastSize(O(dt.width*xt/bt)||0,x,m),this.layoutBoxUpdate(dt,n,1)}i==J&&null==S&&(R=O(R,B),dt.height=this.contrastSize(O(this.attributes.lines*R),x,m),this.layoutBoxUpdate(dt,n,1,!0)),s&&s.children&&V&&([Q,J].includes(i)&&this.isFlex()||i==Q&&this.isBlock(this)&&!this.isInFlow())&&(dt.width=this.contrastSize(V-ct,y,b),this.layoutBoxUpdate(dt,n)),v&&!D(v)&&(dt.width=this.contrastSize(v,y,b),this.layoutBoxUpdate(dt,n,0)),S&&!D(S)&&(dt.height=this.contrastSize(dt.height,x,m),this.layoutBoxUpdate(dt,n,1));var mt=0;if(h.length){var wt=null;h.forEach((function(t,i){t.getBoxWidthHeight();var r=h[i+1];if(r&&r.isInFlow()&&(t.next=r),t.isInFlow()&&!t.inFlexBox()){var o=e.getBoxState(wt,t);e.line&&e.line.canIEnter(t)&&!o?e.line.add(t):(new N).bind(t),wt=t}else t.inFlexBox()?e.line&&(e.line.canIEnter(t)||"nowrap"==n.flexWrap)?e.line.add(t):(new G).bind(t):t.isFixed?e.root.fixedLine?e.root.fixedLine.fixedAdd(t):(new N).fixedBind(t):e.fixedLine?e.fixedLine.fixedAdd(t):(new N).fixedBind(t,1)})),this.lines&&(mt=this.lines.reduce((function(t,e){return t+e.height}),0))}var St=0,zt=0;if(!v&&(this.isAbsolute||this.isFixed)&&V){var Bt=P==nt?V:this.root.width,Mt=Bt-(D(c)?O(c,Bt):c)-(D(p)?O(p,Bt):p);St=n.left?Mt:this.lineMaxWidth}if(!S&&(null!=f?f:this.isAbsolute||this.isFixed&&Z)){var It=P==nt?Z:this.root.height,kt=It-(D(f)?O(f,It):f)-(D(u)?O(u,It):u);zt=n.top?kt:0}if(v&&!D(v)||dt.width||(dt.width=St||this.contrastSize((this.isBlock(this)&&!this.isInFlow()?V||s.lineMaxWidth:this.lineMaxWidth)||this.lineMaxWidth,y,b),this.layoutBoxUpdate(dt,n,0)),S||!mt&&!zt||(dt.height=zt||this.contrastSize(mt,x,m),this.layoutBoxUpdate(dt,n)),n.borderRadius&&this.borderSize&&this.borderSize.width)for(var K in n.borderRadius)Object.hasOwnProperty.call(n.borderRadius,K)&&(n.borderRadius[K]=O(n.borderRadius[K],this.borderSize.width));return this.layoutBox},e.layout=function(){return this.getBoxWidthHeight(),this.root.offsetSize=this.offsetSize,this.getBoxPosition2(),this.offsetSize},t}(),ht=function(){var t,e,i,n,r,o,s=[0,11,15,19,23,27,31,16,18,20,22,24,26,28,20,22,24,24,26,28,28,22,24,24,26,26,28,28,24,24,26,26,26,28,28,24,26,26,26,28,28],a=[3220,1468,2713,1235,3062,1890,2119,1549,2344,2936,1117,2583,1330,2470,1667,2249,2028,3780,481,4011,142,3098,831,3445,592,2517,1776,2234,1951,2827,1070,2660,1345,3177],h=[30660,29427,32170,30877,26159,25368,27713,26998,21522,20773,24188,23371,17913,16590,20375,19104,13663,12392,16177,14854,9396,8579,11994,11245,5769,5054,7399,6608,1890,597,3340,2107],d=[1,0,19,7,1,0,16,10,1,0,13,13,1,0,9,17,1,0,34,10,1,0,28,16,1,0,22,22,1,0,16,28,1,0,55,15,1,0,44,26,2,0,17,18,2,0,13,22,1,0,80,20,2,0,32,18,2,0,24,26,4,0,9,16,1,0,108,26,2,0,43,24,2,2,15,18,2,2,11,22,2,0,68,18,4,0,27,16,4,0,19,24,4,0,15,28,2,0,78,20,4,0,31,18,2,4,14,18,4,1,13,26,2,0,97,24,2,2,38,22,4,2,18,22,4,2,14,26,2,0,116,30,3,2,36,22,4,4,16,20,4,4,12,24,2,2,68,18,4,1,43,26,6,2,19,24,6,2,15,28,4,0,81,20,1,4,50,30,4,4,22,28,3,8,12,24,2,2,92,24,6,2,36,22,4,6,20,26,7,4,14,28,4,0,107,26,8,1,37,22,8,4,20,24,12,4,11,22,3,1,115,30,4,5,40,24,11,5,16,20,11,5,12,24,5,1,87,22,5,5,41,24,5,7,24,30,11,7,12,24,5,1,98,24,7,3,45,28,15,2,19,24,3,13,15,30,1,5,107,28,10,1,46,28,1,15,22,28,2,17,14,28,5,1,120,30,9,4,43,26,17,1,22,28,2,19,14,28,3,4,113,28,3,11,44,26,17,4,21,26,9,16,13,26,3,5,107,28,3,13,41,26,15,5,24,30,15,10,15,28,4,4,116,28,17,0,42,26,17,6,22,28,19,6,16,30,2,7,111,28,17,0,46,28,7,16,24,30,34,0,13,24,4,5,121,30,4,14,47,28,11,14,24,30,16,14,15,30,6,4,117,30,6,14,45,28,11,16,24,30,30,2,16,30,8,4,106,26,8,13,47,28,7,22,24,30,22,13,15,30,10,2,114,28,19,4,46,28,28,6,22,28,33,4,16,30,8,4,122,30,22,3,45,28,8,26,23,30,12,28,15,30,3,10,117,30,3,23,45,28,4,31,24,30,11,31,15,30,7,7,116,30,21,7,45,28,1,37,23,30,19,26,15,30,5,10,115,30,19,10,47,28,15,25,24,30,23,25,15,30,13,3,115,30,2,29,46,28,42,1,24,30,23,28,15,30,17,0,115,30,10,23,46,28,10,35,24,30,19,35,15,30,17,1,115,30,14,21,46,28,29,19,24,30,11,46,15,30,13,6,115,30,14,23,46,28,44,7,24,30,59,1,16,30,12,7,121,30,12,26,47,28,39,14,24,30,22,41,15,30,6,14,121,30,6,34,47,28,46,10,24,30,2,64,15,30,17,4,122,30,29,14,46,28,49,10,24,30,24,46,15,30,4,18,122,30,13,32,46,28,48,14,24,30,42,32,15,30,20,4,117,30,40,7,47,28,43,22,24,30,10,67,15,30,19,6,118,30,18,31,47,28,34,34,24,30,20,61,15,30],c=[255,0,1,25,2,50,26,198,3,223,51,238,27,104,199,75,4,100,224,14,52,141,239,129,28,193,105,248,200,8,76,113,5,138,101,47,225,36,15,33,53,147,142,218,240,18,130,69,29,181,194,125,106,39,249,185,201,154,9,120,77,228,114,166,6,191,139,98,102,221,48,253,226,152,37,179,16,145,34,136,54,208,148,206,143,150,219,189,241,210,19,92,131,56,70,64,30,66,182,163,195,72,126,110,107,58,40,84,250,133,186,61,202,94,155,159,10,21,121,43,78,212,229,172,115,243,167,87,7,112,192,247,140,128,99,13,103,74,222,237,49,197,254,24,227,165,153,119,38,184,180,124,17,68,146,217,35,32,137,46,55,63,209,91,149,188,207,205,144,135,151,178,220,252,190,97,242,86,211,171,20,42,93,158,132,60,57,83,71,109,65,162,31,45,67,216,183,123,164,118,196,23,73,236,127,12,111,246,108,161,59,82,41,157,85,170,251,96,134,177,187,204,62,90,203,89,95,176,156,169,160,81,11,245,22,235,122,117,44,215,79,174,213,233,230,231,173,232,116,214,244,234,168,80,88,175],l=[1,2,4,8,16,32,64,128,29,58,116,232,205,135,19,38,76,152,45,90,180,117,234,201,143,3,6,12,24,48,96,192,157,39,78,156,37,74,148,53,106,212,181,119,238,193,159,35,70,140,5,10,20,40,80,160,93,186,105,210,185,111,222,161,95,190,97,194,153,47,94,188,101,202,137,15,30,60,120,240,253,231,211,187,107,214,177,127,254,225,223,163,91,182,113,226,217,175,67,134,17,34,68,136,13,26,52,104,208,189,103,206,129,31,62,124,248,237,199,147,59,118,236,197,151,51,102,204,133,23,46,92,184,109,218,169,79,158,33,66,132,21,42,84,168,77,154,41,82,164,85,170,73,146,57,114,228,213,183,115,230,209,191,99,198,145,63,126,252,229,215,179,123,246,241,255,227,219,171,75,150,49,98,196,149,55,110,220,165,87,174,65,130,25,50,100,200,141,7,14,28,56,112,224,221,167,83,166,81,162,89,178,121,242,249,239,195,155,43,86,172,69,138,9,18,36,72,144,61,122,244,245,247,243,251,235,203,139,11,22,44,88,176,125,250,233,207,131,27,54,108,216,173,71,142,0],f=[],u=[],p=[],g=[],v=[],y=2;function b(t,e){var i;t>e&&(i=t,t=e,e=i),i=e,i*=e,i+=e,i>>=1,g[i+=t]=1}function x(t,i){var n;for(p[t+e*i]=1,n=-2;n<2;n++)p[t+n+e*(i-2)]=1,p[t-2+e*(i+n+1)]=1,p[t+2+e*(i+n)]=1,p[t+n+1+e*(i+2)]=1;for(n=0;n<2;n++)b(t-1,i+n),b(t+1,i-n),b(t-n,i-1),b(t+n,i+1)}function m(t){for(;t>=255;)t=((t-=255)>>8)+(255&t);return t}var w=[];function S(t,e,i,n){var r,o,s;for(r=0;r<n;r++)f[i+r]=0;for(r=0;r<e;r++){if(255!=(s=c[f[t+r]^f[i]]))for(o=1;o<n;o++)f[i+o-1]=f[i+o]^l[m(s+w[n-o])];else for(o=i;o<i+n;o++)f[o]=f[o+1];f[i+n-1]=255==s?0:l[m(s+w[0])]}}function z(t,e){var i;return t>e&&(i=t,t=e,e=i),i=e,i+=e*e,i>>=1,g[i+=t]}function B(t){var i,n,r,o;switch(t){case 0:for(n=0;n<e;n++)for(i=0;i<e;i++)i+n&1||z(i,n)||(p[i+n*e]^=1);break;case 1:for(n=0;n<e;n++)for(i=0;i<e;i++)1&n||z(i,n)||(p[i+n*e]^=1);break;case 2:for(n=0;n<e;n++)for(r=0,i=0;i<e;i++,r++)3==r&&(r=0),r||z(i,n)||(p[i+n*e]^=1);break;case 3:for(o=0,n=0;n<e;n++,o++)for(3==o&&(o=0),r=o,i=0;i<e;i++,r++)3==r&&(r=0),r||z(i,n)||(p[i+n*e]^=1);break;case 4:for(n=0;n<e;n++)for(r=0,o=n>>1&1,i=0;i<e;i++,r++)3==r&&(r=0,o=!o),o||z(i,n)||(p[i+n*e]^=1);break;case 5:for(o=0,n=0;n<e;n++,o++)for(3==o&&(o=0),r=0,i=0;i<e;i++,r++)3==r&&(r=0),(i&n&1)+!(!r|!o)||z(i,n)||(p[i+n*e]^=1);break;case 6:for(o=0,n=0;n<e;n++,o++)for(3==o&&(o=0),r=0,i=0;i<e;i++,r++)3==r&&(r=0),(i&n&1)+(r&&r==o)&1||z(i,n)||(p[i+n*e]^=1);break;case 7:for(o=0,n=0;n<e;n++,o++)for(3==o&&(o=0),r=0,i=0;i<e;i++,r++)3==r&&(r=0),(r&&r==o)+(i+n&1)&1||z(i,n)||(p[i+n*e]^=1)}}function M(t){var e,i=0;for(e=0;e<=t;e++)v[e]>=5&&(i+=3+v[e]-5);for(e=3;e<t-1;e+=2)v[e-2]==v[e+2]&&v[e+2]==v[e-1]&&v[e-1]==v[e+1]&&3*v[e-1]==v[e]&&(0==v[e-3]||e+3>t||3*v[e-3]>=4*v[e]||3*v[e+3]>=4*v[e])&&(i+=40);return i}function I(){var t,i,n,r,o,s=0,a=0;for(i=0;i<e-1;i++)for(t=0;t<e-1;t++)(p[t+e*i]&&p[t+1+e*i]&&p[t+e*(i+1)]&&p[t+1+e*(i+1)]||!(p[t+e*i]||p[t+1+e*i]||p[t+e*(i+1)]||p[t+1+e*(i+1)]))&&(s+=3);for(i=0;i<e;i++){for(v[0]=0,n=r=t=0;t<e;t++)(o=p[t+e*i])==r?v[n]++:v[++n]=1,a+=(r=o)?1:-1;s+=M(n)}a<0&&(a=-a);var h=a,d=0;for(h+=h<<2,h<<=1;h>e*e;)h-=e*e,d++;for(s+=10*d,t=0;t<e;t++){for(v[0]=0,n=r=i=0;i<e;i++)(o=p[t+e*i])==r?v[n]++:v[++n]=1,r=o;s+=M(n)}return s}var k=null;return{api:{get ecclevel(){return y},set ecclevel(t){y=t},get size(){return _size},set size(t){_size=t},get canvas(){return k},set canvas(t){k=t},getFrame:function(v){return function(v){var M,k,P,W,R,O,L,T;W=v.length,t=0;do{if(t++,P=4*(y-1)+16*(t-1),i=d[P++],n=d[P++],r=d[P++],o=d[P],W<=(P=r*(i+n)+n-3+(t<=9)))break}while(t<40);for(e=17+4*t,R=r+(r+o)*(i+n)+n,W=0;W<R;W++)u[W]=0;for(f=v.slice(0),W=0;W<e*e;W++)p[W]=0;for(W=0;W<(e*(e+1)+1)/2;W++)g[W]=0;for(W=0;W<3;W++){for(P=0,k=0,1==W&&(P=e-7),2==W&&(k=e-7),p[k+3+e*(P+3)]=1,M=0;M<6;M++)p[k+M+e*P]=1,p[k+e*(P+M+1)]=1,p[k+6+e*(P+M)]=1,p[k+M+1+e*(P+6)]=1;for(M=1;M<5;M++)b(k+M,P+1),b(k+1,P+M+1),b(k+5,P+M),b(k+M+1,P+5);for(M=2;M<4;M++)p[k+M+e*(P+2)]=1,p[k+2+e*(P+M+1)]=1,p[k+4+e*(P+M)]=1,p[k+M+1+e*(P+4)]=1}if(t>1)for(W=s[t],k=e-7;;){for(M=e-7;M>W-3&&(x(M,k),!(M<W));)M-=W;if(k<=W+9)break;x(6,k-=W),x(k,6)}for(p[8+e*(e-8)]=1,k=0;k<7;k++)b(7,k),b(e-8,k),b(7,k+e-7);for(M=0;M<8;M++)b(M,7),b(M+e-8,7),b(M,e-8);for(M=0;M<9;M++)b(M,8);for(M=0;M<8;M++)b(M+e-8,8),b(8,M);for(k=0;k<7;k++)b(8,k+e-7);for(M=0;M<e-14;M++)1&M?(b(8+M,6),b(6,8+M)):(p[8+M+6*e]=1,p[6+e*(8+M)]=1);if(t>6)for(W=a[t-7],P=17,M=0;M<6;M++)for(k=0;k<3;k++,P--)1&(P>11?t>>P-12:W>>P)?(p[5-M+e*(2-k+e-11)]=1,p[2-k+e-11+e*(5-M)]=1):(b(5-M,2-k+e-11),b(2-k+e-11,5-M));for(k=0;k<e;k++)for(M=0;M<=k;M++)p[M+e*k]&&b(M,k);for(R=f.length,O=0;O<R;O++)u[O]=f.charCodeAt(O);if(f=u.slice(0),R>=(M=r*(i+n)+n)-2&&(R=M-2,t>9&&R--),O=R,t>9){for(f[O+2]=0,f[O+3]=0;O--;)W=f[O],f[O+3]|=255&W<<4,f[O+2]=W>>4;f[2]|=255&R<<4,f[1]=R>>4,f[0]=64|R>>12}else{for(f[O+1]=0,f[O+2]=0;O--;)W=f[O],f[O+2]|=255&W<<4,f[O+1]=W>>4;f[1]|=255&R<<4,f[0]=64|R>>4}for(O=R+3-(t<10);O<M;)f[O++]=236,f[O++]=17;for(w[0]=1,O=0;O<o;O++){for(w[O+1]=1,L=O;L>0;L--)w[L]=w[L]?w[L-1]^l[m(c[w[L]]+O)]:w[L-1];w[0]=l[m(c[w[0]]+O)]}for(O=0;O<=o;O++)w[O]=c[w[O]];for(P=M,k=0,O=0;O<i;O++)S(k,r,P,o),k+=r,P+=o;for(O=0;O<n;O++)S(k,r+1,P,o),k+=r+1,P+=o;for(k=0,O=0;O<r;O++){for(L=0;L<i;L++)u[k++]=f[O+L*r];for(L=0;L<n;L++)u[k++]=f[i*r+O+L*(r+1)]}for(L=0;L<n;L++)u[k++]=f[i*r+O+L*(r+1)];for(O=0;O<o;O++)for(L=0;L<i+n;L++)u[k++]=f[M+O+L*o];for(f=u,M=k=e-1,P=R=1,T=(r+o)*(i+n)+n,O=0;O<T;O++)for(W=f[O],L=0;L<8;L++,W<<=1){128&W&&(p[M+e*k]=1);do{R?M--:(M++,P?0!=k?k--:(P=!P,6==(M-=2)&&(M--,k=9)):k!=e-1?k++:(P=!P,6==(M-=2)&&(M--,k-=8))),R=!R}while(z(M,k))}for(f=p.slice(0),W=0,k=3e4,P=0;P<8&&(B(P),(M=I())<k&&(k=M,W=P),7!=W);P++)p=f.slice(0);for(W!=P&&B(W),k=h[W+(y-1<<3)],P=0;P<8;P++,k>>=1)1&k&&(p[e-1-P+8*e]=1,P<6?p[8+e*P]=1:p[8+e*(P+1)]=1);for(P=0;P<7;P++,k>>=1)1&k&&(p[8+e*(e-7+P)]=1,P?p[6-P+8*e]=1:p[7+8*e]=1);return p}(v)},utf16to8:function(t){var e,i,n,r;for(e="",n=t.length,i=0;i<n;i++)(r=t.charCodeAt(i))>=1&&r<=127?e+=t.charAt(i):r>2047?(e+=String.fromCharCode(224|r>>12&15),e+=String.fromCharCode(128|r>>6&63),e+=String.fromCharCode(128|r>>0&63)):(e+=String.fromCharCode(192|r>>6&31),e+=String.fromCharCode(128|r>>0&63));return e},draw:function(t,i,n,r,o){i.drawView(n,r);var s=i.ctx,a=n.contentSize,h=a.width,d=a.height,c=a.left,l=a.top;r.borderRadius,r.backgroundColor;var f=r.color,u=void 0===f?"#000000":f;r.border,n.contentSize.left,n.borderSize.left,n.contentSize.top,n.borderSize.top;if(y=o||y,s){s.save(),i.setOpacity(r),i.setTransform(n,r);var p=Math.min(h,d);t=this.utf16to8(t);var g=this.getFrame(t),v=p/e;s.setFillStyle(u);for(var b=0;b<e;b++)for(var x=0;x<e;x++)g[x*e+b]&&s.fillRect(c+v*b,l+v*x,v,v);s.restore(),i.setBorder(n,r)}else console.warn("No canvas provided to draw QR code in!")}}}}(),dt=y,ct=v,lt=b,ft=g,ut=d,pt=c,gt=l,vt=f,yt=u,bt=p,xt=function(){function n(t,e){var i,n=this;this.v="1.9.3.4",this.id=null,this.pixelRatio=1,this.width=0,this.height=0,this.sleep=1e3/30,this.count=0,this.isRate=!1,this.isDraw=!0,this.isCache=!0,this.fixed="",this.useCORS=!1,this.imageBus=[],this.createImage=function(t,e){return new Promise((function(i,r){var o=null;o=n.canvas.createImage?n.canvas.createImage():new Image,e&&o.setAttribute("crossOrigin","Anonymous"),o.src=t,o.onload=function(){i({width:o.naturalWidth||o.width,height:o.naturalHeight||o.height,path:o,src:this.src})},o.onerror=function(t){r(t)}}))},this.options=t,Object.assign(this,t),this.component=e,this.ctx=((i=t.context).setFonts=function(t){var e=t.fontFamily,n=void 0===e?"sans-serif":e,r=t.fontSize,s=void 0===r?14:r,a=t.fontWeight,h=void 0===a?"normal":a,d=t.fontStyle,c=void 0===d?"normal":d;k==o.MP_TOUTIAO&&(h="bold"==h?"bold":"",c="italic"==c?"italic":""),i.font="".concat(c," ").concat(h," ").concat(Math.round(s),"px ").concat(n)},i.draw&&i.setFillStyle?i:Object.assign(i,{setStrokeStyle:function(t){i.strokeStyle=t},setLineWidth:function(t){i.lineWidth=t},setLineCap:function(t){i.lineCap=t},setFillStyle:function(t){i.fillStyle=t},setFontSize:function(t){i.font="".concat(String(t),"px sans-serif")},setGlobalAlpha:function(t){i.globalAlpha=t},setLineJoin:function(t){i.lineJoin=t},setTextAlign:function(t){i.textAlign=t},setMiterLimit:function(t){i.miterLimit=t},setShadow:function(t,e,n,r){i.shadowOffsetX=t,i.shadowOffsetY=e,i.shadowBlur=n,i.shadowColor=r},setTextBaseline:function(t){i.textBaseline=t},createCircularGradient:function(){},draw:function(){}})),this.progress=0,this.root={width:t.width,height:t.height,fontSizeRate:1,fixedLine:null},this.size=this.root,this.init();var r=0;Object.defineProperty(this,"progress",{configurable:!0,set:function(t){r=t,n.lifecycle("onProgress",t/n.count)},get:function(){return r||0}})}return n.prototype.lifecycle=function(t,e){this.options.listen&&this.options.listen[t]&&this.options.listen[t](e)},n.prototype.init=function(t){t&&(this.ctx=t),(this.canvas.height||o.WEB==k)&&(this.canvas.height=this.size.height*this.pixelRatio,this.canvas.width=this.size.width*this.pixelRatio,this.ctx.scale(this.pixelRatio,this.pixelRatio))},n.prototype.clear=function(){this.ctx.clearRect(0,0,this.size.width,this.size.height)},n.prototype.clipPath=function(t,e,i,n,r,o,s){void 0===o&&(o=!1),void 0===s&&(s=!1);var a=this.ctx;if(/polygon/.test(r)){var h=r.match(/-?\d+(rpx|px|%)?\s+-?\d+(rpx|px|%)?/g)||[];a.beginPath(),h.map((function(r){var o=r.split(" "),s=o[0],a=o[1];return[O(s,i)+t,O(a,n)+e]})).forEach((function(t,e){0==e?a.moveTo(t[0],t[1]):a.lineTo(t[0],t[1])})),a.closePath(),s&&a.stroke(),o&&a.fill()}},n.prototype.roundRect=function(t,e,i,n,r,o,s){if(void 0===o&&(o=!1),void 0===s&&(s=!1),!(r<0)){var a=this.ctx;if(a.beginPath(),r){var h=r||{},d=h.borderTopLeftRadius,c=void 0===d?r||0:d,l=h.borderTopRightRadius,f=void 0===l?r||0:l,u=h.borderBottomRightRadius,p=void 0===u?r||0:u,g=h.borderBottomLeftRadius,v=void 0===g?r||0:g;a.arc(t+i-p,e+n-p,p,0,.5*Math.PI),a.lineTo(t+v,e+n),a.arc(t+v,e+n-v,v,.5*Math.PI,Math.PI),a.lineTo(t,e+c),a.arc(t+c,e+c,c,Math.PI,1.5*Math.PI),a.lineTo(t+i-f,e),a.arc(t+i-f,e+f,f,1.5*Math.PI,2*Math.PI),a.lineTo(t+i,e+n-p)}else a.rect(t,e,i,n);a.closePath(),s&&a.stroke(),o&&a.fill()}},n.prototype.setTransform=function(t,e){var i=e.transform,n=e.transformOrigin,r=this.ctx,o=i||{},s=o.scaleX,a=void 0===s?1:s,h=o.scaleY,d=void 0===h?1:h,c=o.translateX,l=void 0===c?0:c,f=o.translateY,u=void 0===f?0:f,p=o.rotate,g=void 0===p?0:p,v=o.skewX,y=void 0===v?0:v,b=o.skewY,x=void 0===b?0:b,m=t.left,w=t.top,S=t.width,z=t.height;l=O(l,S)||0,u=O(u,z)||0;var B={top:O("0%",1),center:O("50%",1),bottom:O("100%",1)},M={left:O("0%",1),center:O("50%",1),right:O("100%",1)};if(n=n.split(" ").filter((function(t,e){return e<2})).reduce((function(t,e){if(/\d+/.test(e)){var i=O(e,1)/(/px|rpx$/.test(e)?R(t.x)?z:S:1);return R(t.x)?Object.assign(t,{y:i}):Object.assign(t,{x:i})}return R(M[e])&&!R(t.x)?Object.assign(t,{x:M[e]}):Object.assign(t,{y:B[e]||.5})}),{}),(l||u)&&r.translate(l,u),(a||d)&&r.scale(a,d),g){var I=m+S*n.x,k=w+z*n.y;r.translate(I,k),r.rotate(g*Math.PI/180),r.translate(-I,-k)}(y||x)&&r.transform(1,Math.tan(x*Math.PI/180),Math.tan(y*Math.PI/180),1,0,0)},n.prototype.setBackground=function(t,e,i,n,r){var s=this.ctx;t&&"transparent"!=t?T(t)?A(t,e,i,n,r,s):s.setFillStyle(t):[o.MP_TOUTIAO,o.MP_BAIDU].includes(k)?s.setFillStyle("rgba(0,0,0,0)"):s.setFillStyle("transparent")},n.prototype.setShadow=function(t){var e=t.boxShadow,i=void 0===e?[]:e,n=this.ctx;if(i.length){var r=i[0],o=i[1],s=i[2],a=i[3];n.setShadow(r,o,s,a)}},n.prototype.setBorder=function(t,e){var i=this.ctx,n=t.width,r=t.height,o=t.left,s=t.top,a=e.border,h=e.borderBottom,d=e.borderTop,c=e.borderRight,l=e.borderLeft,f=e.borderRadius,u=e.lineCap,p=a||{},g=p.borderWidth,v=void 0===g?0:g,y=p.borderStyle,b=p.borderColor,x=h||{},m=x.borderBottomWidth,w=void 0===m?v:m,S=x.borderBottomStyle,z=void 0===S?y:S,B=x.borderBottomColor,M=void 0===B?b:B,I=d||{},P=I.borderTopWidth,W=void 0===P?v:P,R=I.borderTopStyle,O=void 0===R?y:R,L=I.borderTopColor,T=void 0===L?b:L,A=c||{},F=A.borderRightWidth,j=void 0===F?v:F,C=A.borderRightStyle,E=void 0===C?y:C,H=A.borderRightColor,U=void 0===H?b:H,Y=l||{},$=Y.borderLeftWidth,D=void 0===$?v:$,X=Y.borderLeftStyle,_=void 0===X?y:X,N=Y.borderLeftColor,V=void 0===N?b:N,G=f||{},q=G.borderTopLeftRadius,J=void 0===q?f||0:q,Q=G.borderTopRightRadius,Z=void 0===Q?f||0:Q,K=G.borderBottomRightRadius,tt=void 0===K?f||0:K,et=G.borderBottomLeftRadius,it=void 0===et?f||0:et;if(h||l||d||c||a){var nt=function(t,e,n){"dashed"==e?/mp/.test(k)?i.setLineDash([Math.ceil(4*t/3),Math.ceil(4*t/3)]):i.setLineDash([Math.ceil(6*t),Math.ceil(6*t)]):"dotted"==e&&i.setLineDash([t,t]),i.setStrokeStyle(n)},rt=function(t,e,n,r,o,s,a,h,d,c,l,f,p,g,v){i.save(),i.setLineCap(v?"square":u),i.setLineWidth(f),nt(f,p,g),i.beginPath(),i.arc(t,e,a,Math.PI*d,Math.PI*c),i.lineTo(n,r),i.arc(o,s,h,Math.PI*c,Math.PI*l),i.stroke(),i.restore()};if(i.save(),a&&!h&&!l&&!d&&!c)return i.setLineWidth(v),nt(v,y,b),this.roundRect(o,s,n,r,f,!1,!!b),void i.restore();w&&rt(o+n-tt,s+r-tt,o+it,s+r,o+it,s+r-it,tt,it,.25,.5,.75,w,z,M,D&&j),D&&rt(o+it,s+r-it,o,s+J,o+J,s+J,it,J,.75,1,1.25,D,_,V,W&&w),W&&rt(o+J,s+J,o+n-Z,s,o+n-Z,s+Z,J,Z,1.25,1.5,1.75,W,O,T,D&&j),j&&rt(o+n-Z,s+Z,o+n,s+r-tt,o+n-tt,s+r-tt,Z,tt,1.75,2,.25,j,E,U,W&&w)}},n.prototype.setOpacity=function(t){var e=t.opacity,i=void 0===e?1:e;this.ctx.setGlobalAlpha(i)},n.prototype.drawPattern=function(t,n,r){return e(this,void 0,void 0,(function(){var e=this;return i(this,(function(i){return[2,new Promise((function(i,o){e.drawView(n,r,!0,!1,!0);var s=e,a=s.ctx;s.canvas;var h=n.width,d=n.height,c=n.left,l=n.top,f=r||{},u=f.borderRadius,p=void 0===u?0:u,g=f.backgroundImage,v=f.backgroundRepeat,y=void 0===v?"repeat":v;g&&function(t){var o=a.createPattern(t.src,y);a.setFillStyle(o),e.roundRect(c,l,h,d,p,!0,!1),e.setBorder(n,r),i()}(t)}))]}))}))},n.prototype.drawView=function(t,e,i,n,r){void 0===i&&(i=!0),void 0===n&&(n=!0),void 0===r&&(r=!0);var o=this.ctx,s=t.width,a=t.height,h=t.left,d=t.top,c=e||{},l=c.borderRadius,f=void 0===l?0:l,u=c.backgroundColor,p=void 0===u?"transparent":u,g=c.overflow;e.opacity&&this.setOpacity(e),this.setTransform(t,e),r&&(o.save(),this.setShadow(e)),i&&this.setBackground(p,s,a,h,d),e.clipPath?this.clipPath(h,d,s,a,e.clipPath,i,!1):this.roundRect(h,d,s,a,f,i,!1),r&&o.restore(),n&&this.setBorder(t,e),"hidden"==g&&o.clip()},n.prototype.drawImage=function(t,n,r,s){return void 0===n&&(n={}),void 0===r&&(r={}),void 0===s&&(s=!0),e(this,void 0,void 0,(function(){var a=this;return i(this,(function(h){switch(h.label){case 0:return[4,new Promise((function(h,d){return e(a,void 0,void 0,(function(){var e,a,d,c,l,f,u,p,g,v,y,b,x,m,w,S,z,B,M,I,P,W=this;return i(this,(function(i){return e=this.ctx,a=r.borderRadius,d=void 0===a?0:a,c=r.backgroundColor,l=void 0===c?"transparent":c,f=r.objectFit,u=void 0===f?"fill":f,p=r.backgroundSize,g=void 0===p?"fill":p,v=r.objectPosition,y=r.backgroundPosition,b=r.boxShadow,r.backgroundImage&&(u=g,v=y),b&&this.drawView(n,Object.assign(r,{backgroundColor:l||b&&(l||"#ffffff")}),!0,!1,!0),x=n.width,m=n.height,w=n.left,S=n.top,e.save(),z=n.contentSize.left-n.borderSize.left,B=n.contentSize.top-n.borderSize.top,s||(this.setOpacity(r),this.setTransform(n,r),this.setBackground(l,x,m,w,S),this.roundRect(w,S,x,m,d,!!(d||!b&&l),!1)),w+=z,S+=B,e.clip(),M=function(t){if("fill"!==u){var i=function(t,e,i){var n=t.objectFit,r=t.objectPosition,o=e.width/e.height,s=i.width/i.height,a=1;"contain"==n&&o>=s||"cover"==n&&o<s?a=e.height/i.height:("contain"==n&&o<s||"cover"==n&&o>=s)&&(a=e.width/i.width);var h=i.width*a,d=i.height*a,c=r||[],l=c[0],f=c[1],u=/^\d+px|rpx$/.test(l)?O(l,e.width):(e.width-h)*(L(l)?O(l,1):{left:0,center:.5,right:1}[l||"center"]),p=/^\d+px|rpx$/.test(f)?O(f,e.height):(e.height-d)*(L(f)?O(f,1):{top:0,center:.5,bottom:1}[f||"center"]),g=function(t,e){return[(t-u)/a,(e-p)/a]},v=g(0,0),y=v[0],b=v[1],x=g(e.width,e.height),m=x[0],w=x[1];return{sx:Math.max(y,0),sy:Math.max(b,0),sw:Math.min(m-y,i.width),sh:Math.min(w-b,i.height),dx:Math.max(u,0),dy:Math.max(p,0),dw:Math.min(h,e.width),dh:Math.min(d,e.height)}}({objectFit:u,objectPosition:v},n.contentSize,t),r=i.sx,s=i.sy,a=i.sh,h=i.sw,d=i.dx,c=i.dy,l=i.dh,f=i.dw;k==o.MP_BAIDU?e.drawImage(t.src,d+w,c+S,f,l,r,s,h,a):e.drawImage(t.src,r,s,h,a,d+w,c+S,f,l)}else e.drawImage(t.src,w,S,x,m)},I=function(){e.restore(),W.drawView(n,r,!1,!0,!1),h(1)},P=function(t){M(t),I()},P(t),[2]}))}))}))];case 1:return h.sent(),[2]}}))}))},n.prototype.drawText=function(t,e,i,n){var r=this.ctx,o=e.borderSize,s=e.contentSize,a=e.left,h=e.top,d=s.width,c=s.height,l=s.left-o.left,f=s.top-o.top,u=i.color,p=void 0===u?"#000000":u,g=i.lineHeight,v=void 0===g?"1.4em":g,y=i.fontSize,b=void 0===y?14:y,x=i.fontWeight,m=i.fontFamily,w=i.fontStyle,S=i.textAlign,z=void 0===S?"left":S,B=i.verticalAlign,M=void 0===B?pt:B,I=i.backgroundColor,k=i.lineClamp,P=i.backgroundClip,W=i.textShadow,R=i.textDecoration;if(this.drawView(e,i,P!=ct),v=O(v,b),t){switch(r.save(),this.setShadow({boxShadow:W}),a+=l,h+=f,r.setFonts({fontFamily:m,fontSize:b,fontWeight:x,fontStyle:w}),r.setTextBaseline(pt),r.setTextAlign(z),P?this.setBackground(I,d,c,a,h):r.setFillStyle(p),z){case vt:break;case yt:a+=.5*d;break;case bt:a+=d}var L=n.lines*v,T=Math.ceil((c-L)/2);switch(T<0&&(T=0),M){case ut:break;case pt:h+=T;break;case gt:h+=2*T}var A=n.fontHeight,F=n.descent,j=(v-A)/2,C=function(t){var e=r.measureText(t),i=e.actualBoundingBoxDescent,n=void 0===i?0:i,o=e.actualBoundingBoxAscent,s=void 0===o?0:o,a=n+s||.7*b+1;return M==ut?{fix:s,height:a,lineY:v-a}:M==pt?{fix:v/2+n/4,height:a,lineY:(v-a)/2}:M==gt?{fix:v-n,height:a,lineY:0}:{fix:0,height:0,lineY:0}},E=function(t,e,i){var o=t;switch(z){case vt:o+=i;break;case yt:o=(t-=i/2)+i;break;case bt:o=t,t-=i}if(R){r.setLineWidth(b/13),r.beginPath();var s=.1*n.fontHeight;/\bunderline\b/.test(R)&&(F||(e+=j/2),r.moveTo(t,e+s),r.lineTo(o,e+s)),/\boverline\b/.test(R)&&(F||(e-=j/2),r.moveTo(t,e-n.fontHeight-s),r.lineTo(o,e-n.fontHeight-s)),/\bline-through\b/.test(R)&&(r.moveTo(t,e-.5*n.fontHeight),r.lineTo(o,e-.5*n.fontHeight)),r.closePath(),r.setStrokeStyle(p),r.stroke()}};if(!n.widths||1==n.widths.length&&n.widths[0].total<=s.width){var H=C(t),U=H.fix,Y=H.lineY;return r.fillText(t,a,h+U),E(a,(h+=v)-Y,n&&n.widths&&n.widths[0].total||n.text),r.restore(),void this.setBorder(e,i)}for(var $=t.split(""),D=h,X=a,_="",N=0,V=0;V<=$.length;V++){var G=$[V]||"",q="\n"===G,J=""==G,Q=_+(G=q?"":G),Z=r.measureText(Q).width;if(N>=k)break;if(X=a,Z>s.width||q||J){if(N++,_=J&&Z<=s.width?Q:_,N===k&&Z>d){for(;r.measureText("".concat(_,"...")).width>s.width&&!(_.length<=1);)_=_.substring(0,_.length-1);_+="..."}var K=C(_);U=K.fix,Y=K.lineY;if(r.fillText(_,X,h+U),E(X,(h+=v)-Y,Z),_=G,h>D+c)break}else _=Q}r.restore()}},n.prototype.source=function(t){var n;return e(this,void 0,void 0,(function(){var e,r,o,s=this;return i(this,(function(i){switch(i.label){case 0:if(this.node=null,e=+new Date,"{}"==JSON.stringify(t))return[2];if(!t.type)for(r in t.type=ft,t.css=t.css||{},t)["views","children","type","css"].includes(r)||(t.css[r]=t[r],delete t[r]);return(null===(n=t.css)||void 0===n?void 0:n.width)||t.css||(t.css={}),[4,this.create(t)];case 1:return o=i.sent(),this.size=(null==o?void 0:o.layout())||{},this.node=o,this.onEffectFinished().then((function(t){return s.lifecycle("onEffectSuccess",t)})).catch((function(t){return s.lifecycle("onEffectFail",t)})),console.log("布局用时："+(+new Date-e)+"ms"),[2,this.size]}}))}))},n.prototype.getImageInfo=function(t){return this.imageBus[t]||(this.imageBus[t]=this.createImage(t,this.useCORS)),this.imageBus[t]},n.prototype.create=function(n,r){var o,s;return e(this,void 0,void 0,(function(){var e,a,h,d,c,l,f,u,p,g,v,y,b,x,m,S,z;return i(this,(function(i){switch(i.label){case 0:if(e=n.type==dt,a=[ct,lt].includes(n.type),h=n.css||{},d=h.backgroundImage,c=h.display,e&&!n.src&&!n.url||a&&!n.text)return[2];if(c==w)return[2];if(a&&(n.text=String(n.text)),!(e||n.type==ft&&d))return[3,4];l=e?n.src:"",f=/url\((.+)\)/,d&&(null===(o=f.exec(d))||void 0===o?void 0:o[1])&&(l=(null===(s=f.exec(d))||void 0===s?void 0:s[1])||""),i.label=1;case 1:return i.trys.push([1,3,,4]),[4,this.getImageInfo(l)];case 2:return u=i.sent(),p=u.width,g=u.height,!(v=u.path)&&e?[2]:(v&&(n.attributes=Object.assign(n.attributes||{},{width:p,height:g,path:v,src:v,naturalSrc:l})),[3,4]);case 3:return y=i.sent(),n.type!=ft?[2]:(this.lifecycle("onEffectFail",t(t({},y),{src:l})),[3,4]);case 4:if(this.count+=1,b=new at(n,r,this.root,this.ctx),!(x=n.views||n.children))return[3,8];m=0,i.label=5;case 5:return m<x.length?(S=x[m],[4,this.create(S,b)]):[3,8];case 6:(z=i.sent())&&b.add(z),i.label=7;case 7:return m++,[3,5];case 8:return[2,b]}}))}))},n.prototype.drawNode=function(t,n){return void 0===n&&(n=!1),e(this,void 0,void 0,(function(){var e,r,o,s,a,h,d,c,l,f,u,p,g,v,y,b,x,m,w,S;return i(this,(function(i){switch(i.label){case 0:return e=t.layoutBox,r=t.computedStyle,o=t.attributes,s=t.name,a=t.children,h=t.fixedLine,d=t.attributes,c=d.src,l=d.text,["fixed"].includes(r.position)&&!n?[2]:(this.ctx.save(),s!==ft?[3,7]:c?r.backgroundRepeat?[4,this.drawPattern(o,e,r)]:[3,2]:[3,5]);case 1:return i.sent(),[3,4];case 2:return[4,this.drawImage(o,e,r,!1)];case 3:i.sent(),i.label=4;case 4:return[3,6];case 5:this.drawView(e,r),i.label=6;case 6:return[3,10];case 7:return s===dt&&c?[4,this.drawImage(o,e,r,!1)]:[3,9];case 8:return i.sent(),[3,10];case 9:s===ct?this.drawText(l,e,r,o):s===lt&&ht.api&&ht.api.draw(l,this,e,r),i.label=10;case 10:if(this.progress+=1,u=(f=h||{}).beforeElements,p=f.afterElements,!u)return[3,14];g=0,v=u,i.label=11;case 11:return g<v.length?(S=v[g],[4,this.drawNode(S)]):[3,14];case 12:i.sent(),i.label=13;case 13:return g++,[3,11];case 14:if(!a)return[3,18];y=Object.values?Object.values(a):Object.keys(a).map((function(t){return a[t]})),b=0,x=y,i.label=15;case 15:return b<x.length?"absolute"===(S=x[b]).computedStyle.position?[3,17]:[4,this.drawNode(S)]:[3,18];case 16:i.sent(),i.label=17;case 17:return b++,[3,15];case 18:if(!p)return[3,22];m=0,w=p,i.label=19;case 19:return m<w.length?(S=w[m],[4,this.drawNode(S)]):[3,22];case 20:i.sent(),i.label=21;case 21:return m++,[3,19];case 22:return this.ctx.restore(),[2]}}))}))},n.prototype.render=function(t){var n=this;return void 0===t&&(t=30),new Promise((function(r,o){return e(n,void 0,void 0,(function(){var e,n,s,a,h,d,c,l,f,u;return i(this,(function(i){switch(i.label){case 0:return e=+new Date,this.init(),[4,(p=t,void 0===p&&(p=0),new Promise((function(t){return setTimeout(t,p)})))];case 1:i.sent(),i.label=2;case 2:if(i.trys.push([2,14,,15]),!this.node)return[3,12];if(n=this.root.fixedLine||{},s=n.beforeElements,a=n.afterElements,!s)return[3,6];h=0,d=s,i.label=3;case 3:return h<d.length?(f=d[h],[4,this.drawNode(f,!0)]):[3,6];case 4:i.sent(),i.label=5;case 5:return h++,[3,3];case 6:return[4,this.drawNode(this.node)];case 7:if(i.sent(),!a)return[3,11];c=0,l=a,i.label=8;case 8:return c<l.length?(f=l[c],[4,this.drawNode(f,!0)]):[3,11];case 9:i.sent(),i.label=10;case 10:return c++,[3,8];case 11:return r(this.node),[3,13];case 12:this.lifecycle("onEffectFail","node is empty"),i.label=13;case 13:return[3,15];case 14:return u=i.sent(),this.lifecycle("onEffectFail",u),o(u),[3,15];case 15:return console.log("渲染用时："+(+new Date-e-30)+"ms"),[2]}var p}))}))}))},n.prototype.onEffectFinished=function(){var t=this,e=Object.keys(this.imageBus).map((function(e){return t.imageBus[e]}));return Promise.all(e)},n.prototype.destroy=function(){this.node=[]},n.prototype.save=function(t){try{var e=t||{},i=e.fileType,n=void 0===i?"png":i,r=e.quality,o=void 0===r?1:r;return this.canvas.toDataURL("image/".concat(n),o)}catch(t){return this.lifecycle("onEffectFail","image cross domain"),t}},n}();o.WEB==k&&(window.Painter=xt);export{xt as Painter,xt as default};
diff --git a/uni_modules/lime-painter/components/l-painter/props.js b/uni_modules/lime-painter/components/l-painter/props.js
new file mode 100644
index 0000000..51964d5
--- /dev/null
+++ b/uni_modules/lime-painter/components/l-painter/props.js
@@ -0,0 +1,50 @@
+export default {
+	props: {
+		board: Object,
+		pathType: String, // 'base64'、'url'
+		fileType: {
+			type: String,
+			default: 'png'
+		},
+		quality: {
+			type: Number,
+			default: 1
+		},
+		css: [String, Object],
+		// styles: [String, Object],
+		width: [Number, String],
+		height: [Number, String],
+		pixelRatio: Number,
+		customStyle: String,
+		isCanvasToTempFilePath: Boolean,
+		// useCanvasToTempFilePath: Boolean,
+		sleep: {
+			type: Number,
+			default: 1000 / 30
+		},
+		beforeDelay: {
+			type: Number,
+			default: 100
+		},
+		afterDelay: {
+			type: Number,
+			default: 100
+		},
+		// #ifdef MP-WEIXIN || MP-TOUTIAO || MP-ALIPAY
+		type: {
+			type: String,
+			default: '2d'
+		},
+		// #endif
+		// #ifdef APP-NVUE
+		hybrid: Boolean,
+		timeout: {
+			type: Number,
+			default: 2000
+		},
+		// #endif
+		// #ifdef H5
+		useCORS: Boolean
+		// #endif
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/lime-painter/components/l-painter/utils.js b/uni_modules/lime-painter/components/l-painter/utils.js
new file mode 100644
index 0000000..9059278
--- /dev/null
+++ b/uni_modules/lime-painter/components/l-painter/utils.js
@@ -0,0 +1,469 @@
+export const networkReg = /^(http|\/\/)/;
+export const isBase64 = (path) => /^data:image\/(\w+);base64/.test(path);
+export function sleep(delay) {
+	return new Promise(resolve => setTimeout(resolve, delay))
+}
+const isDev = ['devtools'].includes(uni.getSystemInfoSync().platform)
+// 缓存图片
+let cache = {}
+export function isNumber(value) {
+	return /^-?\d+(\.\d+)?$/.test(value);
+}
+export function toPx(value, baseSize, isDecimal = false) {
+	// 如果是数字
+	if (typeof value === 'number') {
+		return value
+	}
+	// 如果是字符串数字
+	if (isNumber(value)) {
+		return value * 1
+	}
+	// 如果有单位
+	if (typeof value === 'string') {
+		const reg = /^-?([0-9]+)?([.]{1}[0-9]+){0,1}(em|rpx|px|%)$/g
+		const results = reg.exec(value);
+		if (!value || !results) {
+			return 0;
+		}
+		const unit = results[3];
+		value = parseFloat(value);
+		let res = 0;
+		if (unit === 'rpx') {
+			res = uni.upx2px(value);
+		} else if (unit === 'px') {
+			res = value * 1;
+		} else if (unit === '%') {
+			res = value * toPx(baseSize) / 100;
+		} else if (unit === 'em') {
+			res = value * toPx(baseSize || 14);
+		}
+		return isDecimal ? res.toFixed(2) * 1 : Math.round(res);
+	}
+	return 0
+}
+
+// 计算版本
+export function compareVersion(v1, v2) {
+	v1 = v1.split('.')
+	v2 = v2.split('.')
+	const len = Math.max(v1.length, v2.length)
+	while (v1.length < len) {
+		v1.push('0')
+	}
+	while (v2.length < len) {
+		v2.push('0')
+	}
+	for (let i = 0; i < len; i++) {
+		const num1 = parseInt(v1[i], 10)
+		const num2 = parseInt(v2[i], 10)
+
+		if (num1 > num2) {
+			return 1
+		} else if (num1 < num2) {
+			return -1
+		}
+	}
+	return 0
+}
+// #ifdef MP
+export const prefix = () => {
+	// #ifdef MP-TOUTIAO
+	return tt
+	// #endif
+	// #ifdef MP-WEIXIN
+	return wx
+	// #endif
+	// #ifdef MP-BAIDU
+	return swan
+	// #endif
+	// #ifdef MP-ALIPAY
+	return my
+	// #endif
+	// #ifdef MP-QQ
+	return qq
+	// #endif
+	// #ifdef MP-360
+	return qh
+	// #endif
+}
+// #endif
+
+
+const base64ToArrayBuffer = (data) => {
+	// #ifndef MP-WEIXIN || APP-PLUS
+	/**
+	 * Base64Binary.decode(base64_string);  
+	 * Base64Binary.decodeArrayBuffer(base64_string); 
+	 */
+	const Base64Binary = {
+		_keyStr: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",
+		/* will return a  Uint8Array type */
+		decodeArrayBuffer(input) {
+			const bytes = (input.length / 4) * 3;
+			const ab = new ArrayBuffer(bytes);
+			this.decode(input, ab);
+			return ab;
+		},
+		removePaddingChars(input) {
+			const lkey = this._keyStr.indexOf(input.charAt(input.length - 1));
+			if (lkey == 64) {
+				return input.substring(0, input.length - 1);
+			}
+			return input;
+		},
+		decode(input, arrayBuffer) {
+			//get last chars to see if are valid
+			input = this.removePaddingChars(input);
+			input = this.removePaddingChars(input);
+
+			const bytes = parseInt((input.length / 4) * 3, 10);
+
+			let uarray;
+			let chr1, chr2, chr3;
+			let enc1, enc2, enc3, enc4;
+			let i = 0;
+			let j = 0;
+
+			if (arrayBuffer)
+				uarray = new Uint8Array(arrayBuffer);
+			else
+				uarray = new Uint8Array(bytes);
+
+			input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
+
+			for (i = 0; i < bytes; i += 3) {
+				//get the 3 octects in 4 ascii chars
+				enc1 = this._keyStr.indexOf(input.charAt(j++));
+				enc2 = this._keyStr.indexOf(input.charAt(j++));
+				enc3 = this._keyStr.indexOf(input.charAt(j++));
+				enc4 = this._keyStr.indexOf(input.charAt(j++));
+
+				chr1 = (enc1 << 2) | (enc2 >> 4);
+				chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
+				chr3 = ((enc3 & 3) << 6) | enc4;
+
+				uarray[i] = chr1;
+				if (enc3 != 64) uarray[i + 1] = chr2;
+				if (enc4 != 64) uarray[i + 2] = chr3;
+			}
+			return uarray;
+		}
+	}
+	return Base64Binary.decodeArrayBuffer(data)
+	// #endif
+	// #ifdef MP-WEIXIN || APP-PLUS
+	return uni.base64ToArrayBuffer(data)
+	// #endif
+}
+
+
+/**
+ * base64转路径
+ * @param {Object} base64
+ */
+export function base64ToPath(base64) {
+	const [, format] = /^data:image\/(\w+);base64,/.exec(base64) || [];
+
+	return new Promise((resolve, reject) => {
+		// #ifdef MP
+		const fs = uni.getFileSystemManager()
+		//自定义文件名
+		if (!format) {
+			reject(new Error('ERROR_BASE64SRC_PARSE'))
+		}
+		const time = new Date().getTime();
+		let pre = prefix()
+		const filePath = `${pre.env.USER_DATA_PATH}/${time}.${format}`
+		//let buffer = base64ToArrayBuffer(bodyData)
+		fs.writeFile({
+			filePath,
+			data: base64.split(',')[1], //base64.replace(/^data:\S+\/\S+;base64,/, ''),
+			encoding: 'base64',
+			// data: buffer,
+			// encoding: 'binary',
+			success() {
+				resolve(filePath)
+			},
+			fail(err) {
+				reject(err)
+			}
+		})
+		// #endif
+
+		// #ifdef H5
+		// mime类型
+		let mimeString = base64.split(',')[0].split(':')[1].split(';')[0];
+		//base64 解码
+		let byteString = atob(base64.split(',')[1]);
+		//创建缓冲数组
+		let arrayBuffer = new ArrayBuffer(byteString.length);
+		//创建视图
+		let intArray = new Uint8Array(arrayBuffer);
+		for (let i = 0; i < byteString.length; i++) {
+			intArray[i] = byteString.charCodeAt(i);
+		}
+		resolve(URL.createObjectURL(new Blob([intArray], {
+			type: mimeString
+		})))
+		// #endif
+
+		// #ifdef APP-PLUS
+		const bitmap = new plus.nativeObj.Bitmap('bitmap' + Date.now())
+		bitmap.loadBase64Data(base64, () => {
+			if (!format) {
+				reject(new Error('ERROR_BASE64SRC_PARSE'))
+			}
+			const time = new Date().getTime();
+			const filePath = `_doc/uniapp_temp/${time}.${format}`
+			bitmap.save(filePath, {},
+				() => {
+					bitmap.clear()
+					resolve(filePath)
+				},
+				(error) => {
+					bitmap.clear()
+					reject(error)
+				})
+		}, (error) => {
+			bitmap.clear()
+			reject(error)
+		})
+		// #endif
+	})
+}
+
+/**
+ * 路径转base64
+ * @param {Object} string
+ */
+export function pathToBase64(path) {
+	if (/^data:/.test(path)) return path
+	return new Promise((resolve, reject) => {
+		// #ifdef H5
+		let image = new Image();
+		image.setAttribute("crossOrigin", 'Anonymous');
+		image.onload = function() {
+			let canvas = document.createElement('canvas');
+			canvas.width = this.naturalWidth;
+			canvas.height = this.naturalHeight;
+			canvas.getContext('2d').drawImage(image, 0, 0);
+			let result = canvas.toDataURL('image/png')
+			resolve(result);
+			canvas.height = canvas.width = 0
+		}
+		image.src = path + '?v=' + Math.random()
+		image.onerror = (error) => {
+			reject(error);
+		};
+		// #endif
+
+		// #ifdef MP
+		if (uni.canIUse('getFileSystemManager')) {
+			uni.getFileSystemManager().readFile({
+				filePath: path,
+				encoding: 'base64',
+				success: (res) => {
+					resolve('data:image/png;base64,' + res.data)
+				},
+				fail: (error) => {
+					reject(error)
+				}
+			})
+		}
+		// #endif
+
+		// #ifdef APP-PLUS
+		plus.io.resolveLocalFileSystemURL(getLocalFilePath(path), (entry) => {
+			entry.file((file) => {
+				const fileReader = new plus.io.FileReader()
+				fileReader.onload = (data) => {
+					resolve(data.target.result)
+				}
+				fileReader.onerror = (error) => {
+					reject(error)
+				}
+				fileReader.readAsDataURL(file)
+			}, reject)
+		}, reject)
+		// #endif
+	})
+}
+
+
+
+export function getImageInfo(path, useCORS) {
+	return new Promise(async (resolve, reject) => {
+		let src = path
+		if (cache[path] && cache[path].errMsg) {
+			resolve(cache[path])
+		} else {
+			try {
+				// if (!isBase64 && PLATFORM == UNI_PLATFORM.PLUS && !/^\/?(static|_doc)\//.test(src)) {
+				// 	src = await downloadFile(path) as string
+				// } else 
+				// #ifdef MP || APP-PLUS
+				if (isBase64(path)) {
+					src = await base64ToPath(path)
+				}
+				// #endif
+				// #ifdef H5
+				if(useCORS) {
+					src = await pathToBase64(path)
+				}
+				// #endif
+				
+			} catch (error) {
+				reject({
+					...error,
+					src
+				})
+			}
+			uni.getImageInfo({
+				src,
+				success: (image) => {
+					const localReg = /^\.|^\/(?=[^\/])/;
+					// #ifdef MP-WEIXIN || MP-BAIDU || MP-QQ || MP-TOUTIAO
+					image.path = localReg.test(src) ?  `/${image.path}` : image.path;
+					// #endif
+					// #ifdef H5
+					image.path = image.path.replace(/^\./, window.location.origin)
+					// #endif
+					if (isDev) {
+						resolve(image)
+					} else {
+						cache[path] = image
+						resolve(cache[path])
+					}
+				},
+				fail(err) {
+					reject({
+						err,
+						path
+					})
+				}
+			})
+		}
+	})
+}
+
+export function downloadFile(url) {
+	if (!url) return Promise.reject({
+		err: 'no url'
+	})
+	return new Promise((resolve, reject) => {
+		if (cache[url]) {
+			return reject()
+		}
+		cache[url] = 1
+		uni.downloadFile({
+			url,
+			success(res) {
+				resolve(res)
+			},
+			fail(err) {
+				reject(err)
+			}
+		})
+	})
+}
+
+// #ifdef APP-PLUS
+const getLocalFilePath = (path) => {
+	if (path.indexOf('_www') === 0 || path.indexOf('_doc') === 0 || path.indexOf('_documents') === 0 || path
+		.indexOf('_downloads') === 0) {
+		return path
+	}
+	if (path.indexOf('file://') === 0) {
+		return path
+	}
+	if (path.indexOf('/storage/emulated/0/') === 0) {
+		return path
+	}
+	if (path.indexOf('/') === 0) {
+		const localFilePath = plus.io.convertAbsoluteFileSystem(path)
+		if (localFilePath !== path) {
+			return localFilePath
+		} else {
+			path = path.substr(1)
+		}
+	}
+	return '_www/' + path
+}
+const getFile = (url) => {
+	return new Promise((resolve, rejcet) => {
+		plus.io.resolveLocalFileSystemURL(url, resolve, (err) => {
+			resolve(false)
+		})
+	})
+}
+const createFile = ({
+	fs,
+	url,
+	target,
+	name
+}) => {
+	return new Promise((resolve, reject) => {
+		plus.io.resolveLocalFileSystemURL(url, res1 => {
+			fs.root.getDirectory(target, {
+				create: true
+			}, fileEntry => {
+				const success = () => {
+					res1.remove()
+					resolve()
+				}
+				getFile(target + name).then(res => {
+					if (res) {
+						res.remove((res2) => {
+							res1.moveTo(fileEntry, name, success, reject)
+						})
+					}
+					res1.moveTo(fileEntry, name, success, reject)
+				})
+			})
+		}, reject)
+	})
+}
+export function useNvue(target, version, timeout) {
+	return new Promise((resolve, reject) => {
+		plus.io.requestFileSystem(plus.io.PRIVATE_DOC, async (fs) => {
+			try {
+				cache['lime-painter'] = 0
+				let names = ['uni.webview.1.5.3.js', 'painter.js', 'index.html']
+				let urls = ['https://gitee.com/dcloud/uni-app/raw/dev/dist/',
+					'https://static-6d65bd90-8508-4d6c-abbc-a4ef5c8e49e7.bspapp.com/lime-painter/'
+				]
+				const oldVersion = plus.storage.getItem('lime-painter')
+				const isFile = await getFile(`${target}${names[1]}`)
+				if (isFile && oldVersion && compareVersion(oldVersion, version) >= 0) {
+					resolve()
+				} else {
+					for (var i = 0; i < names.length; i++) {
+						const name = names[i]
+						const file = await downloadFile(urls[i >= 1 ? 1 : 0] + name)
+						await createFile({
+							fs,
+							url: file.tempFilePath,
+							target,
+							name: name.includes('uni.webview') ? 'uni.webview.js' : name
+						})
+					}
+					plus.storage.setItem('lime-painter', version)
+					cache['lime-painter'] = version
+					resolve()
+				}
+			} catch (e) {
+				let index = parseInt(timeout / 20)
+				while (!cache['lime-painter'] && index) {
+					await sleep(20)
+					index--
+				}
+				if (cache['lime-painter']) {
+					resolve()
+				} else {
+					reject(e)
+				}
+			}
+		}, reject)
+	})
+}
+// #endif
diff --git a/uni_modules/lime-painter/components/lime-painter/index.vue b/uni_modules/lime-painter/components/lime-painter/index.vue
new file mode 100644
index 0000000..ba53413
--- /dev/null
+++ b/uni_modules/lime-painter/components/lime-painter/index.vue
@@ -0,0 +1,2 @@
+<template>
+</template>
\ No newline at end of file
diff --git a/uni_modules/lime-painter/package.json b/uni_modules/lime-painter/package.json
new file mode 100644
index 0000000..f973fc3
--- /dev/null
+++ b/uni_modules/lime-painter/package.json
@@ -0,0 +1,96 @@
+{
+  "id": "lime-painter",
+  "displayName": "海报画板",
+  "version": "1.9.3.4",
+  "description": "一款canvas海报组件，更优雅的海报生成方案",
+  "keywords": [
+    "海报",
+    "canvas",
+    "生成海报",
+    "生成二维码",
+    "JSON"
+],
+  "repository": "https://gitee.com/liangei/lime-painter", 
+  "engines": {
+    "HBuilderX": "^3.4.14"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": "305716444"
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "u",
+          "Edge": "u",
+          "Firefox": "u",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+        "QQ": "y",
+        "钉钉": "u",
+        "快手": "u",
+        "飞书": "u",
+        "京东": "u",
+        "小红书": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  },
+  "name": "lime-painter",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "author": "",
+  "license": "ISC"
+}
diff --git a/uni_modules/lime-painter/readme.md b/uni_modules/lime-painter/readme.md
new file mode 100644
index 0000000..3bd8e41
--- /dev/null
+++ b/uni_modules/lime-painter/readme.md
@@ -0,0 +1,910 @@
+# Painter 画板 测试版
+
+> uniapp 海报画板，更优雅的海报生成方案  
+> [查看更多 站点 1](https://limeui.qcoon.cn/#/painter)  
+> [查看更多 站点 2](http://liangei.gitee.io/limeui/#/painter)  
+> Q 群：806744170
+
+## 平台兼容
+
+| H5  | 微信小程序 | 支付宝小程序 | 百度小程序 | 头条小程序 | QQ 小程序 | App |
+| --- | ---------- | ------------ | ---------- | ---------- | --------- | --- |
+| √   | √          | √            | 未测       | √          | √         | √   |
+
+## 安装
+在市场导入[海报画板](https://ext.dcloud.net.cn/plugin?id=2389)uni_modules版本的即可，无需`import`
+
+## 代码演示
+
+### 基本用法
+
+- 插件提供 JSON 及 XML 的方式绘制海报
+- 参考了 css 块状流布局模拟 css schema 方式。
+- 使用JSON的方式时，请使用驼峰key
+
+
+#### 方式一 XML
+
+- 提供`l-painter-view`、`l-painter-text`、`l-painter-image`、`l-painter-qrcode`四种类型组件
+- 通过 `css` 属性绘制样式，与 style 使用方式保持一致。
+
+```html
+<l-painter>
+  <l-painter-view
+    css="background: #07c160; height: 120rpx; width: 120rpx; display: inline-block"
+  ></l-painter-view>
+  <l-painter-view
+    css="background: #1989fa; height: 120rpx; width: 120rpx; border-top-right-radius: 60rpx; border-bottom-left-radius: 60rpx; display: inline-block; margin: 0 30rpx;"
+  ></l-painter-view>
+  <l-painter-view
+    css="background: #ff9d00; height: 120rpx; width: 120rpx; border-radius: 50%; display: inline-block"
+  ></l-painter-view>
+</l-painter>
+```
+
+#### 方式二 JSON
+
+- 在 json 里四种类型组件的`type`为`view`、`text`、`image`、`qrcode`
+- 通过 `board` 设置海报所需的 JSON 数据进行绘制或`ref`获取组件实例调用组件内的`render(json)`
+- 所有类型的 schema 都具有`css`字段，css 的 key 值使用**驼峰**如：`lineHeight`
+
+```html
+<l-painter :board="poster"/>
+```
+
+```js
+data() {
+	return {
+		poster: {
+			css: {
+				// 根节点若无尺寸，自动获取父级节点
+				width: '750rpx'
+			},
+			views: [
+				{
+					css: {
+						background: "#07c160",
+						height: "120rpx",
+						width: "120rpx",
+						display: "inline-block"
+					},
+					type: "view"
+				},
+				{
+					css: {
+						background: "#1989fa",
+						height: "120rpx",
+						width: "120rpx",
+						borderTopRightRadius: "60rpx",
+						borderBottomLeftRadius: "60rpx",
+						display: "inline-block",
+						margin: "0 30rpx"
+					},
+					views: [],
+					type: "view"
+				},
+				{
+					css: {
+						background: "#ff9d00",
+						height: "120rpx",
+						width: "120rpx",
+						borderRadius: "50%",
+						display: "inline-block"
+					},
+					views: [],
+					type: "view"
+				},
+			]
+		}
+	}
+}
+```
+
+### View 容器
+
+- 类似于 `div` 可以嵌套承载更多的 view、text、image，qrcode 共同构建一颗完整的节点树
+- 在 JSON 里具有 `views` 的数组字段，用于嵌套承载节点。
+
+#### 方式一 XML
+
+```html
+<l-painter>
+  <l-painter-view css="background: #f0f0f0; padding-top: 100rpx;">
+    <l-painter-view
+      css="background: #d9d9d9; width: 33.33%; height: 100rpx; display: inline-block"
+    ></l-painter-view>
+    <l-painter-view
+      css="background: #bfbfbf; width: 66.66%; height: 100rpx; display: inline-block"
+    ></l-painter-view>
+  </l-painter-view>
+</l-painter>
+```
+
+#### 方式二 JSON
+
+```js
+{
+	css: {},
+	views: [
+		{
+			type: 'view',
+			css: {
+				background: '#f0f0f0',
+				paddingTop: '100rpx'
+			},
+			views: [
+				{
+					type: 'view',
+					css: {
+						background: '#d9d9d9',
+						width: '33.33%',
+						height: '100rpx',
+						display: 'inline-block'
+					}
+				},
+				{
+					type: 'view',
+					css: {
+						background: '#bfbfbf',
+						width: '66.66%',
+						height: '100rpx',
+						display: 'inline-block'
+					}
+				}
+			],
+
+		}
+	]
+}
+```
+
+### Text 文本
+
+- 通过 `text` 属性填写文本内容。
+- 支持`\n`换行符
+- 支持省略号，使用 css 的`line-clamp`设置行数，当文字内容超过会显示省略号。
+- 支持`text-decoration`
+
+#### 方式一 XML
+
+```html
+<l-painter>
+  <l-painter-view css="background: #e0e2db; padding: 30rpx; color: #222a29">
+    <l-painter-text
+      text="登鹳雀楼\n白日依山尽，黄河入海流\n欲穷千里目，更上一层楼"
+    />
+    <l-painter-text
+      text="登鹳雀楼\n白日依山尽，黄河入海流\n欲穷千里目，更上一层楼"
+      css="text-align:center; padding-top: 20rpx; text-decoration: line-through "
+    />
+    <l-painter-text
+      text="登鹳雀楼\n白日依山尽，黄河入海流\n欲穷千里目，更上一层楼"
+      css="text-align:right; padding-top: 20rpx"
+    />
+    <l-painter-text
+      text="水调歌头\n明月几时有？把酒问青天。不知天上宫阙，今夕是何年。我欲乘风归去，又恐琼楼玉宇，高处不胜寒。起舞弄清影，何似在人间。"
+      css="line-clamp: 3; padding-top: 20rpx; background: linear-gradient(,#ff971b 0%, #ff5000 100%); background-clip: text"
+    />
+  </l-painter-view>
+</l-painter>
+```
+
+#### 方式二 JSON
+
+```js
+// 基础用法
+{
+	type: 'text',
+	text: '登鹳雀楼\n白日依山尽，黄河入海流\n欲穷千里目，更上一层楼',
+},
+{
+	type: 'text',
+	text: '登鹳雀楼\n白日依山尽，黄河入海流\n欲穷千里目，更上一层楼',
+	css: {
+		// 设置居中对齐
+		textAlign: 'center',
+		// 设置中划线
+		textDecoration: 'line-through'
+	}
+},
+{
+	type: 'text',
+	text: '登鹳雀楼\n白日依山尽，黄河入海流\n欲穷千里目，更上一层楼',
+	css: {
+		// 设置右对齐
+		textAlign: 'right',
+	}
+},
+{
+	type: 'text',
+	text: '登鹳雀楼\n白日依山尽，黄河入海流\n欲穷千里目，更上一层楼',
+	css: {
+		// 设置行数，超出显示省略号
+		lineClamp: 3,
+		// 渐变文字
+		background: 'linear-gradient(,#ff971b 0%, #1989fa 100%)',
+		backgroundClip: 'text'
+	}
+}
+```
+
+### Image 图片
+
+- 通过 `src` 属性填写图片路径。
+- 图片路径支持：网络图片，本地 static 里的图片路径，缓存路径
+- 通过 `css` 的 `object-fit`属性可以设置图片的填充方式，可选值见下方 CSS 表格。
+- 通过 `css` 的 `object-position`配合 `object-fit` 可以设置图片的对齐方式，类似于`background-position`，详情见下方 CSS 表格。
+- 使用网络图片时：小程序需要去公众平台配置 [downloadFile](https://mp.weixin.qq.com/) 域名
+- 使用网络图片时：**H5 和 Nvue 需要决跨域问题**
+
+#### 方式一 XML
+
+```html
+<l-painter>
+  <!-- 基础用法 -->
+  <l-painter-image
+    src="https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg"
+    css="width: 200rpx; height: 200rpx"
+  />
+  <!-- 填充方式 -->
+  <!-- css object-fit 设置 填充方式 见下方表格-->
+  <l-painter-image
+    src="https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg"
+    css="width: 200rpx; height: 200rpx; object-fit: contain; background: #eee"
+  />
+  <!-- css object-position 设置 图片的对齐方式-->
+  <l-painter-image
+    src="https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg"
+    css="width: 200rpx; height: 200rpx; object-fit: contain; object-position: 50% 50%; background: #eee"
+  />
+</l-painter>
+```
+
+#### 方式二 JSON
+
+```js
+// 基础用法
+{
+	type: 'image',
+	src: 'https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg',
+	css: {
+		width: '200rpx',
+		height: '200rpx'
+	}
+},
+// 填充方式
+// css objectFit 设置 填充方式 见下方表格
+{
+	type: 'image',
+	src: 'https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg',
+	css: {
+		width: '200rpx',
+		height: '200rpx',
+		objectFit: 'contain'
+	}
+},
+// css objectPosition 设置 图片的对齐方式
+{
+	type: 'image',
+	src: 'https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg',
+	css: {
+		width: '200rpx',
+		height: '200rpx',
+		objectFit: 'contain',
+		objectPosition: '50% 50%'
+	}
+}
+```
+
+### Qrcode 二维码
+
+- 通过`text`属性填写需要生成二维码的文本。
+- 通过 `css` 里的 `color` 可设置生成码点的颜色。
+- 通过 `css` 里的 `background`可设置背景色。
+- 通过 `css `里的 `width`、`height`设置尺寸。
+
+#### 方式一 XML
+
+```html
+<l-painter>
+  <l-painter-qrcode
+    text="limeui.qcoon.cn"
+    css="width: 200rpx; height: 200rpx"
+  />
+</l-painter>
+```
+
+#### 方式二 JSON
+
+```js
+{
+	type: 'qrcode',
+	text: 'limeui.qcoon.cn',
+	css: {
+		width: '200rpx',
+		height: '200rpx',
+	}
+}
+```
+
+### 生成图片
+
+- 1、通过设置`isCanvasToTempFilePath`自动生成图片并在 `@success` 事件里接收海报临时路径
+- 2、通过调用内部方法生成图片：
+
+```html
+<l-painter ref="painter">...code</l-painter>
+```
+
+```js
+this.$refs.painter.canvasToTempFilePathSync({
+  fileType: "jpg",
+  // 如果返回的是base64是无法使用 saveImageToPhotosAlbum，需要设置 pathType为url
+  pathType: 'url',
+  quality: 1,
+  success: (res) => {
+    console.log(res.tempFilePath);
+	// 非H5 保存到相册
+	// H5 提示用户长按图另存
+	uni.saveImageToPhotosAlbum({
+		filePath: res.tempFilePath,
+		success: function () {
+			console.log('save success');
+		}
+	});
+  },
+});
+```
+
+### 主动调用方式
+
+- 通过获取组件实例内部的`render`函数 传递`JSON`即可
+
+```html
+<l-painter ref="painter" />
+```
+
+```js
+// 渲染
+this.$refs.painter.render(jsonSchema);
+// 生成图片
+this.$refs.painter.canvasToTempFilePathSync({
+  fileType: "jpg",
+  // 如果返回的是base64是无法使用 saveImageToPhotosAlbum，需要设置 pathType为url
+  pathType: 'url',
+  quality: 1,
+  success: (res) => {
+    console.log(res.tempFilePath);
+	// 非H5 保存到相册
+	uni.saveImageToPhotosAlbum({
+		filePath: res.tempFilePath,
+		success: function () {
+			console.log('save success');
+		}
+	});
+  },
+});
+```
+
+
+### H5跨域
+- 一般是需要后端或管理OSS资源的大佬处理
+- 一般OSS的处理方式:
+
+1、设置来源
+```cmd
+*
+```
+
+2、允许Methods
+```html
+GET
+```
+
+3、允许Headers
+```html
+access-control-allow-origin:*
+```
+
+4、最后如果还是不行,可试下给插件设置`useCORS`
+```html
+<l-painter useCORS>
+```
+
+
+
+### 海报示例
+
+- 提供一份示例，只把插件当成生成图片的工具，非必要不要在弹窗里使用。
+- 通过设置`isCanvasToTempFilePath`主动生成图片，再由 `@success` 事件接收海报临时路径
+- 设置`custom-style="position: fixed; left: 200%"`样式把画板移到屏幕之外，达到隐藏画板的效果。
+- **注意**：受平台影响海报画板最好不要隐藏，可能会无法生成图片。
+
+#### 方式一 XML
+
+```html
+<image :src="path" mode="widthFix"></image>
+<l-painter
+  isCanvasToTempFilePath
+  @success="path = $event"
+  custom-style="position: fixed; left: 200%"
+  css="width: 750rpx; padding-bottom: 40rpx; background: linear-gradient(,#ff971b 0%, #ff5000 100%)"
+>
+  <l-painter-image
+    src="https://cdn.jsdelivr.net/gh/liangei/image@latest/avatar-1.jpeg"
+    css="margin-left: 40rpx; margin-top: 40rpx; width: 84rpx;  height: 84rpx; border-radius: 50%;"
+  />
+  <l-painter-view
+    css="margin-top: 40rpx; padding-left: 20rpx; display: inline-block"
+  >
+    <l-painter-text
+      text="隔壁老王"
+      css="display: block; padding-bottom: 10rpx; color: #fff; font-size: 32rpx; fontWeight: bold"
+    />
+    <l-painter-text
+      text="为您挑选了一个好物"
+      css="color: rgba(255,255,255,.7); font-size: 24rpx"
+    />
+  </l-painter-view>
+  <l-painter-view
+    css="margin-left: 40rpx; margin-top: 30rpx; padding: 32rpx; box-sizing: border-box; background: #fff; border-radius: 16rpx; width: 670rpx; box-shadow: 0 20rpx 58rpx rgba(0,0,0,.15)"
+  >
+    <l-painter-image
+      src="https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg"
+      css="object-fit: cover; object-position: 50% 50%; width: 606rpx; height: 606rpx; border-radius: 12rpx;"
+    />
+    <l-painter-view
+      css="margin-top: 32rpx; color: #FF0000; font-weight: bold; font-size: 28rpx; line-height: 1em;"
+    >
+      <l-painter-text text="￥" css="vertical-align: bottom" />
+      <l-painter-text
+        text="39"
+        css="vertical-align: bottom; font-size: 58rpx"
+      />
+      <l-painter-text text=".39" css="vertical-align: bottom" />
+      <l-painter-text
+        text="￥59.99"
+        css="vertical-align: bottom; padding-left: 10rpx; font-weight: normal; text-decoration: line-through; color: #999999"
+      />
+    </l-painter-view>
+    <l-painter-view css="margin-top: 32rpx; font-size: 26rpx; color: #8c5400">
+      <l-painter-text text="自营" css="color: #212121; background: #ffb400;" />
+      <l-painter-text
+        text="30天最低价"
+        css="margin-left: 16rpx; background: #fff4d9; text-decoration: line-through;"
+      />
+      <l-painter-text
+        text="满减优惠"
+        css="margin-left: 16rpx; background: #fff4d9"
+      />
+      <l-painter-text
+        text="超高好评"
+        css="margin-left: 16rpx; background: #fff4d9"
+      />
+    </l-painter-view>
+    <l-painter-view css="margin-top: 30rpx">
+      <l-painter-text
+        css="line-clamp: 2; color: #333333; line-height: 1.8em; font-size: 36rpx; width: 478rpx; padding-right:32rpx; box-sizing: border-box"
+        text="360儿童电话手表9X 智能语音问答定位支付手表 4G全网通20米游泳级防水视频通话拍照手表男女孩星空蓝"
+      ></l-painter-text>
+      <l-painter-qrcode
+        css="width: 128rpx; height: 128rpx;"
+        text="limeui.qcoon.cn"
+      ></l-painter-qrcode>
+    </l-painter-view>
+  </l-painter-view>
+</l-painter>
+```
+
+```js
+data() {
+	return {
+		path: ''
+	}
+}
+```
+
+#### 方式二 JSON
+
+```html
+<image :src="path" mode="widthFix"></image>
+<l-painter
+  :board="poster"
+  isCanvasToTempFilePath
+  @success="path = $event"
+  custom-style="position: fixed; left: 200%"
+/>
+```
+
+```js
+data() {
+	return {
+		path: '',
+		poster: {
+		    css: {
+		        width: "750rpx",
+		        paddingBottom: "40rpx",
+		        background: "linear-gradient(,#000 0%, #ff5000 100%)"
+		    },
+		    views: [
+		        {
+		            src: "https://fastly.jsdelivr.net/gh/liangei/image@latest/avatar-1.jpeg",
+		            type: "image",
+		            css: {
+		                background: "#fff",
+		                objectFit: "cover",
+		                marginLeft: "40rpx",
+		                marginTop: "40rpx",
+		                width: "84rpx",
+		                border: "2rpx solid #fff",
+		                boxSizing: "border-box",
+		                height: "84rpx",
+		                borderRadius: "50%"
+		            }
+		        },
+		        {
+		            type: "view",
+		            css: {
+		                marginTop: "40rpx",
+		                paddingLeft: "20rpx",
+		                display: "inline-block"
+		            },
+		            views: [
+		                {
+		                    text: "隔壁老王",
+		                    type: "text",
+		                    css: {
+		                        display: "block",
+		                        paddingBottom: "10rpx",
+		                        color: "#fff",
+		                        fontSize: "32rpx",
+		                        fontWeight: "bold"
+		                    }
+		                },
+		                {
+		                    text: "为您挑选了一个好物",
+		                    type: "text",
+		                    css: {
+		                        color: "rgba(255,255,255,.7)",
+		                        fontSize: "24rpx"
+		                    },
+		                }
+		            ],
+		        },
+		        {
+		            css: {
+		                marginLeft: "40rpx",
+		                marginTop: "30rpx",
+		                padding: "32rpx",
+		                boxSizing: "border-box",
+		                background: "#fff",
+		                borderRadius: "16rpx",
+		                width: "670rpx",
+		                boxShadow: "0 20rpx 58rpx rgba(0,0,0,.15)"
+		            },
+		            views: [
+		                {
+							src: "https://m.360buyimg.com/babel/jfs/t1/196317/32/13733/288158/60f4ea39E6fb378ed/d69205b1a8ed3c97.jpg",
+							type: "image",
+		                    css: {
+		                        objectFit: "cover",
+		                        objectPosition: "50% 50%",
+		                        width: "606rpx",
+		                        height: "606rpx"
+		                    },
+		                }, {
+		                    css: {
+		                        marginTop: "32rpx",
+		                        color: "#FF0000",
+		                        fontWeight: "bold",
+		                        fontSize: "28rpx",
+		                        lineHeight: "1em"
+		                    },
+		                    views: [{
+								text: "￥",
+								type: "text",
+		                        css: {
+		                            verticalAlign: "bottom"
+		                        },
+		                    }, {
+								text: "39",
+								type: "text",
+		                        css: {
+		                            verticalAlign: "bottom",
+		                            fontSize: "58rpx"
+		                        },
+		                    }, {
+								text: ".39",
+								type: "text",
+		                        css: {
+		                            verticalAlign: "bottom"
+		                        },
+		                    }, {
+								text: "￥59.99",
+								type: "text",
+		                        css: {
+		                            verticalAlign: "bottom",
+		                            paddingLeft: "10rpx",
+		                            fontWeight: "normal",
+		                            textDecoration: "line-through",
+		                            color: "#999999"
+		                        }
+		                    }],
+
+		                    type: "view"
+		                }, {
+		                    css: {
+		                        marginTop: "32rpx",
+		                        fontSize: "26rpx",
+		                        color: "#8c5400"
+		                    },
+		                    views: [{
+								text: "自营",
+								type: "text",
+		                        css: {
+		                            color: "#212121",
+		                            background: "#ffb400"
+		                        },
+		                    }, {
+								text: "30天最低价",
+								type: "text",
+		                        css: {
+		                            marginLeft: "16rpx",
+		                            background: "#fff4d9",
+		                            textDecoration: "line-through"
+		                        },
+		                    }, {
+								text: "满减优惠",
+								type: "text",
+		                        css: {
+		                            marginLeft: "16rpx",
+		                            background: "#fff4d9"
+		                        },
+		                    }, {
+								text: "超高好评",
+								type: "text",
+		                        css: {
+		                            marginLeft: "16rpx",
+		                            background: "#fff4d9"
+		                        },
+
+		                    }],
+
+		                    type: "view"
+		                }, {
+		                    css: {
+		                        marginTop: "30rpx"
+		                    },
+		                    views: [
+								{
+									text: "360儿童电话手表9X 智能语音问答定位支付手表 4G全网通20米游泳级防水视频通话拍照手表男女孩星空蓝",
+									type: "text",
+									css: {
+										paddingRight: "32rpx",
+										boxSizing: "border-box",
+										lineClamp: 2,
+										color: "#333333",
+										lineHeight: "1.8em",
+										fontSize: "36rpx",
+										width: "478rpx"
+		                        },
+		                    }, {
+								text: "limeui.qcoon.cn",
+								type: "qrcode",
+		                        css: {
+		                            width: "128rpx",
+		                            height: "128rpx",
+		                        },
+
+		                    }],
+		                    type: "view"
+		                }],
+		            type: "view"
+		        }
+		    ]
+		}
+	}
+}
+```
+
+### Nvue
+- 必须为HBX 3.4.11及以上
+
+
+### 原生小程序
+
+- 插件里的`painter.js`支持在原生小程序中使用
+- new Painter 之后在`source`里传入 JSON
+- 再调用`render`绘制海报
+- 如需生成图片，请查看微信小程序 cavnas 的[canvasToTempFilePath](https://developers.weixin.qq.com/miniprogram/dev/api/canvas/wx.canvasToTempFilePath.html)
+
+```html
+<canvas type="2d" id="painter" style="width: 100%"></canvas>
+```
+
+```js
+import { Painter } from "./painter";
+page({
+  data: {
+    poster: {
+      css: {
+        width: "750rpx",
+      },
+      views: [
+        {
+          type: "view",
+          css: {
+            background: "#d2d4c8",
+            paddingTop: "100rpx",
+          },
+          views: [
+            {
+              type: "view",
+              css: {
+                background: "#5f7470",
+                width: "33.33%",
+                height: "100rpx",
+                display: "inline-block",
+              },
+            },
+            {
+              type: "view",
+              css: {
+                background: "#889696",
+                width: "33.33%",
+                height: "100rpx",
+                display: "inline-block",
+              },
+            },
+            {
+              type: "view",
+              css: {
+                background: "#b8bdb5",
+                width: "33.33%",
+                height: "100rpx",
+                display: "inline-block",
+              },
+            },
+          ],
+        },
+      ],
+    },
+  },
+  async onLoad() {
+    const res = await this.getCentext();
+    const painter = new Painter(res);
+    // 返回计算布局后的整个内容尺寸
+    const { width, height } = await painter.source(this.data.poster);
+    // 得到计算后的尺寸后 可给canvas尺寸赋值，达到动态响应效果
+    // 渲染
+    await painter.render();
+  },
+  // 获取canvas 2d
+  // 非2d也可以使用这里只是举个例子
+  getCentext() {
+    return new Promise((resolve) => {
+      wx.createSelectorQuery()
+        .select(`#painter`)
+        .node()
+        .exec((res) => {
+          let { node: canvas } = res[0];
+          resolve({
+            canvas,
+            context: canvas.getContext("2d"),
+            width: canvas.width,
+            height: canvas.height,
+            pixelRatio: 2,
+          });
+        });
+    });
+  },
+});
+```
+
+### 旧版(1.6.x)更新
+
+- 由于 1.8.x 版放弃了以定位的方式，所以 1.6.x 版更新之后要每个样式都加上`position: absolute`
+- 旧版的 `image` mode 模式被放弃，使用`object-fit`
+- 旧版的 `isRenderImage` 改成 `is-canvas-to-temp-filePath`
+- 旧版的 `maxLines` 改成 `line-clamp`
+
+## API
+
+### Props
+
+| 参数                       | 说明                                                         | 类型             | 默认值       |
+| -------------------------- | ------------------------------------------------------------ | ---------------- | ------------ |
+| board                      | JSON 方式的海报元素对象集                                    | <em>object</em>  | -            |
+| css                        | 海报最外层的样式，可以理解为`body`                           | <em>object</em>  | 参数请向下看 |
+| custom-style               | canvas 自定义样式                                            | <em>string</em>  |              |
+| is-canvas-to-temp-filePath | 是否生成图片，在`@success`事件接收图片地址                   | <em>boolean</em> | `false`      |
+| after-delay                | 生成图片错乱，可延时生成图片                                 | <em>number</em>  | `100`        |
+| type                       | canvas 类型，对微信头条支付宝小程序可有效,可选值：`2d`，`''` | <em>string</em>  | `2d`         |
+| file-type                  | 生成图片的后缀类型, 可选值：`png`、`jpg`                     | <em>string</em>  | `png`        |
+| path-type                  | 生成图片路径类型，可选值`url`、`base64`                      | <em>string</em>  | `-`          |
+| pixel-ratio                | 生成图片的像素密度，默认为对应手机的像素密度，`nvue`无效     | <em>number</em>  | `-`          |
+| width                      | **废弃** 画板的宽度，一般只用于通过内部方法时加上            | <em>number</em>  | ``           |
+| height                     | **废弃** 画板的高度 ，同上                                   | <em>number</em>  | ``           |
+
+### css
+| 属性名                                                                              | 支持的值或类型                                                                                                                                                                       | 默认值   |
+| ----------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ | -------- |
+| (min\max)width                                                                      | 支持`%`、`rpx`、`px`                                                                                                                                                                 | -        |
+| height                                                                              | 同上                                                                                                                                                                                 | -        |
+| color                                                                               | `string`                                                                                                                                                                             | -        |
+| position                                                                            | 定位，可选值：`absolute`、`fixed`                                                                                                                                                    | -        |
+| ↳ left、top、right、bottom                                                          | 配合`position`才生效，支持`%`、`rpx`、`px`                                                                                                                                           | -        |
+| margin                                                                              | 可简写或各方向分别写，如：`margin-top`，支持`auto`、`rpx`、`px`                                                                                                                      | -        |
+| padding                                                                             | 可简写或各方向分别写，支持`rpx`、`px`                                                                                                                                                | -        |
+| border                                                                              | 可简写或各个值分开写：`border-width`、`border-style` 、`border-color`，简写请按顺序写                                                                                                | -        |
+| line-clamp                                                                          | `number`，超过行数显示省略号                                                                                                                                                         | -        |
+| vertical-align                                                                      | 文字垂直对齐，可选值：`bottom`、`top`、`middle`                                                                                                                                      | `middle` |
+| line-height                                                                         | 文字行高，支持`rpx`、`px`、`em`                                                                                                                                                      | `1.4em`  |
+| font-weight                                                                         | 文字粗细，可选值：`normal`、`bold`                                                                                                                                                   | `normal` |
+| font-size                                                                           | 文字大小，`string`，支持`rpx`、`px`                                                                                                                                                  | `14px`   |
+| text-decoration                                                                     | 文本修饰，可选值：`underline` 、`line-through`、`overline`                                                                                                                           | -        |
+| text-align                                                                          | 文本水平对齐，可选值：`right` 、`center`                                                                                                                                             | `left`   |
+| display                                                                             | 框类型，可选值：`block`、`inline-block`、`flex`、`none`，当为`none`时是不渲染该段, `flex`功能简陋。                                                                                                            | -        |
+| flex                                                                                | 配合 display: flex; 属性定义了在分配多余空间,目前只用为数值如： flex: 1                                                                                                           | -        |
+| align-self                                                                          | 配合 display: flex; 单个项目垂直轴对齐方式: `flex-start` `flex-end` `center`                                                                                                         | `flex-start`        |
+| justify-content                                                                     | 配合 display: flex; 水平轴对齐方式: `flex-start` `flex-end` `center`                                                                                                         | `flex-start`        |
+| align-items                                                                         | 配合 display: flex; 垂直轴对齐方式: `flex-start` `flex-end` `center`                                                                                                  | `flex-start`        |
+| border-radius                                                                       | 圆角边框，支持`%`、`rpx`、`px`                                                                                                                                                       | -        |
+| box-sizing                                                                          | 可选值：`border-box`                                                                                                                                                                 | -        |
+| box-shadow                                                                          | 投影                                                                                                                                                                                 | -        |
+| background(color)                                                                   | 支持渐变，但必须写百分比！如:`linear-gradient(,#ff971b 0%, #ff5000 100%)`、`radial-gradient(#0ff 15%, #f0f 60%)`,目前 radial-gradient 渐变的圆心为元素中点，半径为最长边，不支持设置 | -        |
+| background-clip                                                                	  | 文字渐变，配合`background`背景渐变，设置`background-clip: text` 达到文字渐变效果 | -        |
+| background-image                                                                    | view 元素背景：`url(src)`,若只是设置背景图，请不要设置`background-repeat`                                                                                                                                                           | -        |
+| background-repeat                                                                   | 设置是否及如何重复背景纹理，可选值：`repeat`、`repeat-x`、`repeat-y`、`no-repeat`                                                                                                    | `repeat` |
+| [object-fit](https://developer.mozilla.org/zh-CN/docs/Web/CSS/object-fit/)          | 图片元素适应容器方式,类似于`mode`,可选值：`cover`、 `contain`、 `fill`、 `none`                                                                                                      | -        |
+| [object-position](https://developer.mozilla.org/zh-CN/docs/Web/CSS/object-position) | 图片的对齐方式，配合`object-fit`使用                                                                                                                                                 | -        |
+
+### 图片填充模式 object-fit
+
+| 名称    | 含义                                                   |
+| ------- | ------------------------------------------------------ |
+| contain | 保持宽高缩放图片，使图片的长边能完全显示出来           |
+| cover   | 保持宽高缩放图片，使图片的短边能完全显示出来，裁剪长边 |
+| fill    | 拉伸图片，使图片填满元素                               |
+| none    | 保持图片原有尺寸                                       |
+
+### 事件 Events
+
+| 事件名   | 说明                                                             | 返回值 |
+| -------- | ---------------------------------------------------------------- | ------ |
+| success  | 生成图片成功,若使用`is-canvas-to-temp-filePath` 可以接收图片地址 | path   |
+| fail     | 生成图片失败                                                     | error  |
+| done     | 绘制成功                                                         |        |
+| progress | 绘制进度                                                         | number |
+
+### 内部函数 Ref
+| 事件名   | 说明                                                             | 返回值 |
+| -------- | ---------------------------------------------------------------- | ------ |
+| render(object)   |  渲染器，传入JSON 绘制海报 | promise   |
+| [canvasToTempFilePath](https://uniapp.dcloud.io/api/canvas/canvasToTempFilePath.html#canvastotempfilepath)(object)   | 把当前画布指定区域的内容导出生成指定大小的图片，并返回文件临时路径。    |   |
+| canvasToTempFilePathSync(object)    | 同步接口，同上                                                         |        |
+
+
+## 常见问题
+
+- 1、H5 端使用网络图片需要解决跨域问题。
+- 2、小程序使用网络图片需要去公众平台增加下载白名单！二级域名也需要配！
+- 3、H5 端生成图片是 base64，有时显示只有一半可以使用原生标签`<IMG/>`
+- 4、发生保存图片倾斜变形或提示 native buffer exceed size limit 时，使用 pixel-ratio="2"参数，降分辨率。
+- 5、h5 保存图片不需要调接口，提示用户长按图片保存。
+- 6、画板不能隐藏，包括`v-if`，`v-show`、`display:none`、`opacity:0`，另外也不要把画板放在弹窗里。如果需要隐藏画板请设置 `custom-style="position: fixed; left: 200%"`
+- 7、微信小程序 canvas 2d **不支持真机调试**，请使用真机预览方式。
+- 8、微信小程序打开调试时可以生但并闭无法生成时，这种情况一般是没有在公众号配置download域名
+- 9、HBX 3.4.5之前的版本不支持vue3
+- 10、在微信开发工具上 canvas 层级最高无法zindex，并不影响真机
+- 11、请不要导入非uni_modules插件
+- 华为手机 APP 上无法生成图片，请使用 HBX2.9.11++（已过时，忽略这条）
+- IOS APP 请勿使用 HBX2.9.3.20201014 的版本！这个版本无法生成图片。（已过时，忽略这条）
+- 苹果微信 7.0.20 存在闪退和图片无法 onload 为微信 bug（已过时，忽略这条）
+
+## 打赏
+
+如果你觉得本插件，解决了你的问题，赠人玫瑰，手留余香。
+
+![输入图片说明](https://static-6d65bd90-8508-4d6c-abbc-a4ef5c8e49e7.bspapp.com/image/222521_bb543f96_518581.jpeg "微信图片编辑_20201122220352.jpg")
+![输入图片说明](https://static-6d65bd90-8508-4d6c-abbc-a4ef5c8e49e7.bspapp.com/image/wxplay.jpg "wxplay.jpg")
\ No newline at end of file
diff --git a/uni_modules/lime-painter/static/index.html b/uni_modules/lime-painter/static/index.html
new file mode 100644
index 0000000..fdf884e
--- /dev/null
+++ b/uni_modules/lime-painter/static/index.html
@@ -0,0 +1,119 @@
+<!DOCTYPE html>
+<html lang="zh">
+
+<head>
+	<meta charset="UTF-8">
+	<meta name="viewport" content="width=device-width, initial-scale=1.0">
+	<meta http-equiv="X-UA-Compatible" content="ie=edge">
+	<title></title>
+	<style type="text/css">
+		html,
+		body,
+		canvas {
+			padding: 0;
+			margin: 0;
+			width: 100%;
+			height: 100%;
+			overflow-y: hidden;
+			background-color: transparent;
+		}
+	</style>
+</head>
+
+<body>
+	<canvas id="lime-painter"></canvas>
+	<script type="text/javascript" src="./uni.webview.1.5.3.js"></script>
+	<script type="text/javascript" src="./painter.js"></script>
+	<script> 
+		var cache = [];
+		var painter = null;
+		var canvas = null;
+		var context = null;
+		var timer = null;
+		var pixelRatio = 1;
+		console.log = function (...args) {
+			postMessage(args);
+		};
+		// function stringify(key, value) {
+		// 	if (typeof value === 'object' && value !== null) {
+		// 		if (cache.indexOf(value) !== -1) {
+		// 			return;
+		// 		}
+		// 		cache.push(value);
+		// 	}
+		// 	return value;
+		// };
+
+		function emit(event, data) {
+			postMessage({
+				event,
+				data: (typeof data !== 'object' && data !== null ? data : JSON.stringify(data)) 
+			});
+			cache = [];
+		};
+		function postMessage(data) {
+			uni.postMessage({
+				data
+			});
+		};
+		
+		function init(dpr) {
+			canvas = document.querySelector('#lime-painter');
+			context = canvas.getContext('2d');
+			pixelRatio = dpr || window.devicePixelRatio;
+			painter = new Painter({
+				id: 'lime-painter',
+				context,
+				canvas,
+				pixelRatio,
+				width: canvas.offsetWidth,
+				height: canvas.offsetHeight,
+				listen: {
+					onProgress(v) {
+						emit('progressChange', v);
+					},
+					onEffectFail(err) {
+						//console.error(err)
+						emit('fail', err);
+					}
+				}
+			});
+			emit('inited', true);
+		};
+		function save(args) {
+			delete args.success;
+			delete args.fail;
+			clearTimeout(timer);
+			timer = setTimeout(() => {
+				const path = painter.save(args);
+				if (typeof path == 'string') {
+					const index = Math.ceil(path.length / 8);
+					for (var i = 0; i < 8; i++) {
+						if (i == 7) {
+							emit('success', path.substr(i * index, index));
+						} else {
+							emit('file', path.substr(i * index, index));
+						}
+					};
+				} else {
+					// console.log('canvas no data')
+					emit('fail', 'canvas no data');
+				};
+			}, 30);
+		};
+		async function source(args) {
+			let size = await painter.source(args);
+			emit('layoutChange', size);
+			if(!canvas.height) {
+				console.log('canvas no size')
+				emit('fail', 'canvas no size');
+			}
+			painter.render().catch(err => {
+				// console.error(err)
+				emit('fail', err);
+			});
+		};
+	</script>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/uni_modules/lime-painter/static/painter.js b/uni_modules/lime-painter/static/painter.js
new file mode 100644
index 0000000..2910063
--- /dev/null
+++ b/uni_modules/lime-painter/static/painter.js
@@ -0,0 +1 @@
+!function(t,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e((t="undefined"!=typeof globalThis?globalThis:t||self).Painter={})}(this,(function(t){"use strict";var e=function(){return e=Object.assign||function(t){for(var e,i=1,n=arguments.length;i<n;i++)for(var o in e=arguments[i])Object.prototype.hasOwnProperty.call(e,o)&&(t[o]=e[o]);return t},e.apply(this,arguments)};function i(t,e,i,n){return new(i||(i=Promise))((function(o,r){function s(t){try{h(n.next(t))}catch(t){r(t)}}function a(t){try{h(n.throw(t))}catch(t){r(t)}}function h(t){var e;t.done?o(t.value):(e=t.value,e instanceof i?e:new i((function(t){t(e)}))).then(s,a)}h((n=n.apply(t,e||[])).next())}))}function n(t,e){var i,n,o,r,s={label:0,sent:function(){if(1&o[0])throw o[1];return o[1]},trys:[],ops:[]};return r={next:a(0),throw:a(1),return:a(2)},"function"==typeof Symbol&&(r[Symbol.iterator]=function(){return this}),r;function a(r){return function(a){return function(r){if(i)throw new TypeError("Generator is already executing.");for(;s;)try{if(i=1,n&&(o=2&r[0]?n.return:r[0]?n.throw||((o=n.return)&&o.call(n),0):n.next)&&!(o=o.call(n,r[1])).done)return o;switch(n=0,o&&(r=[2&r[0],o.value]),r[0]){case 0:case 1:o=r;break;case 4:return s.label++,{value:r[1],done:!1};case 5:s.label++,n=r[1],r=[0];continue;case 7:r=s.ops.pop(),s.trys.pop();continue;default:if(!(o=s.trys,(o=o.length>0&&o[o.length-1])||6!==r[0]&&2!==r[0])){s=0;continue}if(3===r[0]&&(!o||r[1]>o[0]&&r[1]<o[3])){s.label=r[1];break}if(6===r[0]&&s.label<o[1]){s.label=o[1],o=r;break}if(o&&s.label<o[2]){s.label=o[2],s.ops.push(r);break}o[2]&&s.ops.pop(),s.trys.pop();continue}r=e.call(t,s)}catch(t){r=[6,t],n=0}finally{i=o=0}if(5&r[0])throw r[1];return{value:r[0]?r[1]:void 0,done:!0}}([r,a])}}}var o,r,s={MP_WEIXIN:"mp-weixin",MP_QQ:"mp-qq",MP_ALIPAY:"mp-alipay",MP_BAIDU:"mp-baidu",MP_TOUTIAO:"mp-toutiao",MP_DINGDING:"mp-dingding",H5:"h5",WEB:"web",PLUS:"plus"},a=["contentSize","clientSize","borderSize","offsetSize"],h="row",d="column",c="top",l="middle",f="bottom",u="left",p="center",g="right",v="view",y="text",b="image",x="qrcode",m="block",w="inline-block",S="none",z="flex",M="absolute",B="fixed",I="transparent",k="fill",P={display:m,color:"#000000",lineHeight:"1.4em",fontSize:14,fontWeight:400,fontFamily:"sans-serif",lineCap:"butt",flexDirection:h,flexWrap:"nowrap",textAlign:"left",alignItems:"flex-start",justifyContent:"flex-start",position:"static",transformOrigin:"center center"},W={upx2px:function(t){return window.innerWidth/750*t},getSystemInfoSync:function(){return{screenWidth:window.innerWidth}},getImageInfo:function(t){var e=t.src,i=t.success,n=t.fail,o=new Image;o.onload=function(){i({width:this.naturalWidth,height:this.naturalHeight,path:this.src,src:e})},o.onerror=n,o.src=e}},R="object",O="undefined",T=typeof window==R?typeof uni==O||typeof uni!==O&&!uni.addInterceptor?s.WEB:s.H5:typeof swan==R?s.MP_BAIDU:typeof tt==R?s.MP_TOUTIAO:typeof plus===R?s.PLUS:typeof wx==R?s.MP_WEIXIN:void 0,L=T==s.MP_WEIXIN?wx:typeof uni!=O?uni.getImageInfo?{upx2px:function(t){return uni.upx2px(t)},getSystemInfoSync:function(){return uni.getSystemInfoSync()},getImageInfo:function(t){return uni.getImageInfo(t)},downloadFile:function(t){return uni.downloadFile(t)}}:Object.assign(uni,W):typeof window!=O?W:uni;if(!L.upx2px){var A=(null!==(r=L.getSystemInfoSync&&(null===(o=uni.getSystemInfoSync())||void 0===o?void 0:o.screenWidth))&&void 0!==r?r:375)/750;L.upx2px=function(t){return A*t}}function F(t){return/^-?\d+(\.\d+)?$/.test(t)}function j(t,e,i){if("number"==typeof t)return t;if(F(t))return 1*t;if("string"==typeof t){var n=/^-?([0-9]+)?([.]{1}[0-9]+){0,1}(em|rpx|px|%)$/g.exec(t);if(!t||!n)return 0;var o=n[3];t=parseFloat(t);var r=0;return"rpx"===o?r=L.upx2px(t):"px"===o?r=1*t:"%"===o&&e?r=t*j(e)/100:"em"===o&&e&&(r=t*j(e||14)),1*r.toFixed(2)}return 0}function C(t){return/%$/.test(t)}var E=function(t){return!(!t||!t.startsWith("linear")&&!t.startsWith("radial"))},H=function(t,e,i,n,o,r){t.startsWith("linear")?function(t,e,i,n,o,r){for(var s=function(t,e,i,n,o){void 0===n&&(n=0);void 0===o&&(o=0);var r=t.match(/([-]?\d{1,3})deg/),s=r&&r[1]?parseFloat(r[1]):0;s>=360&&(s-=360);s<0&&(s+=360);if(0===(s=Math.round(s)))return{x0:Math.round(e/2)+n,y0:i+o,x1:Math.round(e/2)+n,y1:o};if(180===s)return{x0:Math.round(e/2)+n,y0:o,x1:Math.round(e/2)+n,y1:i+o};if(90===s)return{x0:n,y0:Math.round(i/2)+o,x1:e+n,y1:Math.round(i/2)+o};if(270===s)return{x0:e+n,y0:Math.round(i/2)+o,x1:n,y1:Math.round(i/2)+o};var a=Math.round(180*Math.asin(e/Math.sqrt(Math.pow(e,2)+Math.pow(i,2)))/Math.PI);if(s===a)return{x0:n,y0:i+o,x1:e+n,y1:o};if(s===180-a)return{x0:n,y0:o,x1:e+n,y1:i+o};if(s===180+a)return{x0:e+n,y0:o,x1:n,y1:i+o};if(s===360-a)return{x0:e+n,y0:i+o,x1:n,y1:o};var h=0,d=0,c=0,l=0;if(s<a||s>180-a&&s<180||s>180&&s<180+a||s>360-a){var f=s*Math.PI/180,u=s<a||s>360-a?i/2:-i/2,p=Math.tan(f)*u,g=s<a||s>180-a&&s<180?e/2-p:-e/2-p;h=-(c=p+(v=Math.pow(Math.sin(f),2)*g)),d=-(l=u+v/Math.tan(f))}if(s>a&&s<90||s>90&&s<90+a||s>180+a&&s<270||s>270&&s<360-a){var v;f=(90-s)*Math.PI/180,p=s>a&&s<90||s>90&&s<90+a?e/2:-e/2,u=Math.tan(f)*p,g=s>a&&s<90||s>270&&s<360-a?i/2-u:-i/2-u;h=-(c=p+(v=Math.pow(Math.sin(f),2)*g)/Math.tan(f)),d=-(l=u+v)}return h=Math.round(h+e/2)+n,d=Math.round(i/2-d)+o,c=Math.round(c+e/2)+n,l=Math.round(i/2-l)+o,{x0:h,y0:d,x1:c,y1:l}}(o,t,e,i,n),a=s.x0,h=s.y0,d=s.x1,c=s.y1,l=r.createLinearGradient(a,h,d,c),f=o.match(/linear-gradient\((.+)\)/)[1],u=U(f.substring(f.indexOf(",")+1)),p=0;p<u.colors.length;p++)l.addColorStop(u.percents[p],u.colors[p]);r.setFillStyle(l)}(e,i,n,o,t,r):t.startsWith("radial")&&function(t,e,i,n,o,r){for(var s=U(o.match(/radial-gradient\((.+)\)/)[1]),a=Math.round(t/2)+i,h=Math.round(e/2)+n,d=r.createRadialGradient(a,h,0,a,h,Math.max(t,e)/2),c=0;c<s.colors.length;c++)d.addColorStop(s.percents[c],s.colors[c]);r.setFillStyle(d)}(e,i,n,o,t,r)};function U(t){for(var e=[],i=[],n=0,o=t.substring(0,t.length-1).split("%,");n<o.length;n++){var r=o[n];e.push(r.substring(0,r.lastIndexOf(" ")).trim()),i.push(r.substring(r.lastIndexOf(" "),r.length)/100)}return{colors:e,percents:i}}function Y(t,e,i){return e in t?Object.defineProperty(t,e,{value:i,enumerable:!0,configurable:!0,writable:!0}):t[e]=i,t}function $(){return $=Object.assign?Object.assign.bind():function(t){for(var e=1;e<arguments.length;e++){var i=arguments[e];for(var n in i)Object.prototype.hasOwnProperty.call(i,n)&&(t[n]=i[n])}return t},$.apply(this,arguments)}function D(t,e){return D=Object.setPrototypeOf?Object.setPrototypeOf.bind():function(t,e){return t.__proto__=e,t},D(t,e)}function _(t,e){(null==e||e>t.length)&&(e=t.length);for(var i=0,n=new Array(e);i<e;i++)n[i]=t[i];return n}function X(t,e){var i="undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(i)return(i=i.call(t)).next.bind(i);if(Array.isArray(t)||(i=function(t,e){if(t){if("string"==typeof t)return _(t,e);var i=Object.prototype.toString.call(t).slice(8,-1);return"Object"===i&&t.constructor&&(i=t.constructor.name),"Map"===i||"Set"===i?Array.from(t):"Arguments"===i||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(i)?_(t,e):void 0}}(t))||e&&t&&"number"==typeof t.length){i&&(t=i);var n=0;return function(){return n>=t.length?{done:!0}:{done:!1,value:t[n++]}}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}function N(t){return"number"==typeof t}function V(t){return"auto"===t||null===t}function G(t){return/%$/.test(t)}var q,J=0,Q=function(){function t(){Y(this,"elements",[]),Y(this,"afterElements",[]),Y(this,"beforeElements",[]),Y(this,"ids",[]),Y(this,"width",0),Y(this,"height",0),Y(this,"top",0),Y(this,"left",0),Y(this,"pre",null),Y(this,"offsetX",0),Y(this,"offsetY",0),J++,this.id=J}var e=t.prototype;return e.fixedBind=function(t,e){void 0===e&&(e=0),this.container=e?t.parent:t.root,this.container.fixedLine=this,this.fixedAdd(t)},e.fixedAdd=function(t){this.elements.push(t);var e=t.computedStyle.zIndex;(void 0===e?0:e)>=0?this.afterElements.push(t):this.beforeElements.push(t),this.refreshLayout()},e.bind=function(t){this.container=t.parent,this.container.line=null,this.container.lines?(this.container.lines.push(this),this.pre=this.getPreLine(),this.top=this.pre.top+this.pre.height,this.left=this.container.contentSize.left):(this.top=this.container.contentSize.top,this.left=this.container.contentSize.left,this.container.lines=[this]),this.isInline=t.isInline(),this.container.line=this,this.outerWidth=t.parent&&t.parent.contentSize.width?t.parent.contentSize.width:1/0,this.add(t)},e.getPreLine=function(){return this.container.lines[this.container.lines.length-2]},e.canIEnter=function(t){return!((100*t.offsetSize.width+100*this.width)/100>this.outerWidth)||(this.closeLine(),!1)},e.closeLine=function(){delete this.container.line},e.add=function(t){this.ids.push(t.id),this.elements.push(t),this.refreshWidthHeight(t)},e.refreshWidthHeight=function(t){t.offsetSize.height>this.height&&(this.height=t.offsetSize.height),this.width+=t.offsetSize.width||0,(this.container.lineMaxWidth||0)<this.width&&(this.container.lineMaxWidth=this.width)},e.refreshXAlign=function(){if(this.isInline){var t=this.container.contentSize.width-this.width,e=this.container.style.textAlign;"center"===e?t/=2:"left"===e&&(t=0),this.offsetX=t}},e.getOffsetY=function(t){if(!t||!t.style)return 0;var e=(t.style||{}).verticalAlign;return"bottom"===e?this.height-t.contentSize.height:"middle"===e?(this.height-t.contentSize.height)/2:0},e.layout=function(t,e){for(var i in this.refreshXAlign(),this.pre?(this.top=this.pre.top+this.pre.height+this.offsetY,this.left=e+this.offsetX):(this.top=Math.max(this.top,this.container.contentSize.top,t)+this.offsetY,this.left=Math.max(this.left,this.container.contentSize.left,e)+this.offsetX),this.elements){var n=this.elements[i],o=this.elements[i-1],r=this.getOffsetY(n);n.style.top=this.top+r,n.style.left=o?o.offsetSize.left+o.offsetSize.width:this.left,n.getBoxPosition2()}},e.refreshLayout=function(){this.afterElements=this.afterElements.sort((function(t,e){return t.computedStyle.zIndex-e.computedStyle.zIndex})),this.beforeElements=this.beforeElements.sort((function(t,e){return t.computedStyle.zIndex-e.computedStyle.zIndex}))},t}(),Z=((q={})[h]={width:"width",contentWidth:"width",x:"x",y:"y",contentX:"left",height:"height",contentHeight:"height"},q[d]={width:"height",contentWidth:"height",x:"y",y:"x",contentX:"top",height:"width",contentHeight:"width"},q),K=function(t){var e,i;function n(){var e;return Y(function(t){if(void 0===t)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return t}(e=t.call(this)||this),"outerWidth",0),e.exactValue=0,e.flexTotal=0,e.key=null,e}i=t,(e=n).prototype=Object.create(i.prototype),e.prototype.constructor=e,D(e,i);var o=n.prototype;return o.bind=function(t){console.warn("[painter] flex-box 功能未完善谨慎使用"),this.container=t.parent,this.container.line=this,this.container.lines?(this.container.lines.push(this),this.pre=this.getPreLine(),this.top=this.pre.top+this.pre.height,this.left=this.container.contentSize.left):(this.top=this.container.contentSize.top,this.left=this.container.contentSize.left,this.container.lines=[this]),t.parent&&(this.key=Z[t.parent.style.flexDirection]),this.initHeight(t),this.outerWidth=t.parent&&t.parent.contentSize[this.key.contentWidth]?t.parent.contentSize[this.key.contentWidth]:1/0,this.add(t)},o.add=function(t){this.ids.push(t.id),N(t.style.flex)?this.flexTotal+=t.style.flex:N(t.style[this.key.width])&&(this.exactValue+=t.contentSize[this.key.width]),this.elements.push(t),this.refreshWidthHeight(t),t.next||this.closeLine()},o.closeLine=function(){this.calcFlex()},o.initHeight=function(t){this[this.key.height]=0},o.calcFlex=function(){var t=this,e=this.container.contentSize[this.key.contentWidth];this.elements.forEach((function(i){var n=i.style.width||0;N(i.style.flex)&&(n=i.style.flex/t.flexTotal*(e-t.exactValue)),i.computedStyle[t.key.width]=n,i.getBoxWidthHeight()}))},o.refreshWidthHeight=function(t){this.container.style.alignItems&&!t.style.alignSelf&&(t.style.alignSelf=this.container.style.alignItems),t.contentSize[this.key.height]>this[this.key.height]&&(this[this.key.height]=t.offsetSize[this.key.height]),this[this.key.width]+=t.offsetSize[this.key.width],(this.container.lineMaxWidth||0)<this[this.key.width]&&(this.container.lineMaxWidth=this[this.key.width])},o.refreshXAlign=function(){var t=this,e=this.elements.reduce((function(e,i){return e+i.offsetSize[t.key.width]}),0),i=this.outerWidth==1/0?0:this.outerWidth-Math.max(this[this.key.width],e);"center"===this.container.style.justifyContent?i/=2:"flex-start"===this.container.style.justifyContent&&(i=0),this.offsetX=i||0,this.refreshYAlign()},o.refreshYAlign=function(){if(1==this.container.lines.length)return 0;var t=this.container.lines.reduce((function(t,e){return t+e.height}),0);if("center"===this.container.style.alignItems){var e=(this.container.contentSize[this.key.contentHeight]-t)/(this.container.lines.length+1);this.container.lines.forEach((function(t){t.offsetY=e}))}if("flex-end"===this.container.style.alignItems){var i=this.container.contentSize[this.key.contentHeight]-t;this.container.lines[0].offsetY=i}},o.getOffsetY=function(t){return this.container.lines.length>1?0:"flex-end"===t.style.alignSelf?this.container.contentSize[this.key.contentHeight]-t.contentSize[this.key.height]:"center"===t.style.alignSelf?(this.container.contentSize[this.key.contentHeight]-t.contentSize[this.key.height])/2:0},n}(Q),et=b,it=y,nt=v,ot=x,rt=m,st=w,at=z,ht=M,dt=B,ct=0,lt={left:null,top:null,width:null,height:null},ft=function(){function t(t,e,i,n){var o=this;Y(this,"id",ct++),Y(this,"style",{left:null,top:null,width:null,height:null}),Y(this,"computedStyle",{}),Y(this,"originStyle",{}),Y(this,"children",{}),Y(this,"layoutBox",$({},lt)),Y(this,"contentSize",$({},lt)),Y(this,"clientSize",$({},lt)),Y(this,"borderSize",$({},lt)),Y(this,"offsetSize",$({},lt)),this.ctx=n,this.root=i,e&&(this.parent=e),this.name=t.name||t.type,this.attributes=this.getAttributes(t);var r=this.getComputedStyle(t,null==e?void 0:e.computedStyle);this.isAbsolute=r.position==ht,this.isFixed=r.position==dt,this.originStyle=r,Object.keys(r).forEach((function(t){Object.defineProperty(o.style,t,{configurable:!0,enumerable:!0,get:function(){return r[t]},set:function(e){r[t]=e}})}));var s={contentSize:$({},this.contentSize),clientSize:$({},this.clientSize),borderSize:$({},this.borderSize),offsetSize:$({},this.offsetSize)};Object.keys(s).forEach((function(t){Object.keys(o[t]).forEach((function(e){Object.defineProperty(o[t],e,{configurable:!0,enumerable:!0,get:function(){return s[t][e]},set:function(i){s[t][e]=i}})}))})),this.computedStyle=this.style}var e=t.prototype;return e.add=function(t){t.parent=this,this.children[t.id]=t},e.getChildren=function(){var t=this;return Object.keys(this.children).map((function(e){return t.children[e]}))},e.getLineRect=function(t,e){var i={width:0,height:0},n=e?e.lines:this.parent&&this.parent.lines;return n&&n.find((function(e){return e.ids.includes(t)}))||i},e.getComputedStyle=function(t,e){var i=["color","fontSize","lineHeight","verticalAlign","fontWeight","textAlign"],n=t.css,o=void 0===n?{}:n,r=t.type,s=void 0===r?nt:r,a=$({},P);if([it,et,ot].includes(s)&&!o.display&&(a.display=st),e)for(var h=0;h<i.length;h++){var d=i[h];(o[d]||e[d])&&(o[d]=o[d]||e[d])}for(var c=function(){var t=f[l],e=o[t];if(/-/.test(t)&&(t=t.replace(/-([a-z])/g,(function(t,e){return e.toUpperCase()})),a.key=e),/^(box|text)?shadow$/i.test(t)){var i=[];return e.replace(/((\d+(rpx|px)?\s+?){3})(.+)/,(function(){for(var t=arguments.length,e=new Array(t),n=0;n<t;n++)e[n]=arguments[n];i=e[1].match(/\d+(rpx|px)?/g).map((function(t){return j(t)})).concat(e[4])})),/^text/.test(t)?a.textShadow=i:a.boxShadow=i,"continue"}if(/^border/i.test(t)&&!/radius$/i.test(t)){var n,r=t.match(/^border([BTRLa-z]+)?/)[0],h=t.match(/[W|S|C][a-z]+/),d=e.replace(/([\(,])\s+|\s+([\),])/g,"$1$2").split(" ").map((function(t){return/^\d/.test(t)?j(t,""):t}));return a[r]=((n={})[r+"Width"]=F(d[0])?d[0]:0,n[r+"Style"]=d[1]||"solid",n[r+"Color"]=d[2]||"black",n),1==d.length&&h&&(a[r][r+h[0]]=d[0]),"continue"}if(/^background(color)?$/i.test(t))return a.backgroundColor=e,"continue";if(/^objectPosition$/i.test(t))return a[t]=e.split(" "),"continue";if(/padding|margin|radius/i.test(t)){var c=/radius$/i.test(t),u=c?"borderRadius":t.match(/[a-z]+/)[0],p=[0,0,0,0].map((function(t,e){return c?["borderTopLeftRadius","borderTopRightRadius","borderBottomRightRadius","borderBottomLeftRadius"][e]:[u+"Top",u+"Right",u+"Bottom",u+"Left"][e]})),g="margin";if("padding"===t||t===g||/^(border)?radius$/i.test(t)){var v,y=(null==e?void 0:e.split(" ").map((function(e){return/^\d+(rpx|px)?$/.test(e)?j(e):t!=g&&/auto/.test(e)?0:e}),[]))||[0],b=c?"borderRadius":t,x=y[0],m=y[1],w=y[2],S=y[3];a[b]=((v={})[p[0]]=V(x)?0:x,v[p[1]]=F(m)||V(m)?m:x,v[p[2]]=V(F(w)?w:x)?0:F(w)?w:x,v[p[3]]=F(S)?S:m||x,v)}else{var z;if("object"==typeof a[u])a[u][t]=u==g&&V(e)||G(e)?e:j(e);else a[u]=((z={})[p[0]]=a[u]||0,z[p[1]]=a[u]||0,z[p[2]]=a[u]||0,z[p[3]]=a[u]||0,z),a[u][t]=u==g&&V(e)||G(e)?e:j(e)}return"continue"}if(/^transform$/i.test(t))return a[t]={},e.replace(/([a-zA-Z]+)\(([0-9,-\.%rpxdeg\s]+)\)/g,(function(e,i,n){var r=n.split(",").map((function(t){return t.replace(/(^\s*)|(\s*$)/g,"")})),s=function(t,e){return t.includes("deg")?1*t:e&&!G(e)?j(t,e):t};i.includes("matrix")?a[t][i]=r.map((function(t){return 1*t})):i.includes("rotate")?a[t][i]=1*n.match(/^-?\d+(\.\d+)?/)[0]:/[X, Y]/.test(i)?a[t][i]=/[X]/.test(i)?s(r[0],o.width):s(r[0],o.height):(a[t][i+"X"]=s(r[0],o.width),a[t][i+"Y"]=s(r[1]||r[0],o.height))})),"continue";/^font$/i.test(t)&&console.warn("font 不支持简写"),/^left|top$/i.test(t)&&![ht,dt].includes(o.position)?a[t]=0:a[t]=/^[\d\.]+(px|rpx)?$/.test(e)?j(e):/em$/.test(e)&&s==it?j(e,o.fontSize):e},l=0,f=Object.keys(o);l<f.length;l++)c();return a},e.setPosition=function(t,e){var i={left:"width",top:"height",right:"width",bottom:"height"};Object.keys(i).forEach((function(n){var o="right"==n?"left":"top";["right","bottom"].includes(n)&&void 0!==t.style[n]&&"number"!=typeof t.originStyle[o]?t.style[o]=e[i[n]]-t.offsetSize[i[n]]-j(t.style[n],e[i[n]]):t.style[n]=j(t.style[n],e[i[n]])}))},e.getAttributes=function(t){var e=t.attributes||{};return(t.url||t.src)&&(e.src=e.src||t.url||t.src),t.replace&&(e.replace=t.replace),t.text&&(e.text=t.text),e},e.getOffsetSize=function(t,e,i){void 0===i&&(i=a[3]);var n=e||{},o=n.margin,r=(o=void 0===o?{}:o).marginLeft,s=void 0===r?0:r,h=o.marginTop,d=void 0===h?0:h,c=o.marginRight,l=void 0===c?0:c,f=o.marginBottom,u=void 0===f?0:f,p=n.padding,g=(p=void 0===p?{}:p).paddingLeft,v=void 0===g?0:g,y=p.paddingTop,b=void 0===y?0:y,x=p.paddingRight,m=void 0===x?0:x,w=p.paddingBottom,S=void 0===w?0:w,z=n.border,M=(z=void 0===z?{}:z).borderWidth,B=void 0===M?0:M,I=n.borderTop,k=(I=void 0===I?{}:I).borderTopWidth,P=void 0===k?B:k,W=n.borderBottom,R=(W=void 0===W?{}:W).borderBottomWidth,O=void 0===R?B:R,T=n.borderRight,L=(T=void 0===T?{}:T).borderRightWidth,A=void 0===L?B:L,F=n.borderLeft,j=(F=void 0===F?{}:F).borderLeftWidth,C=void 0===j?B:j,E=s<0&&l<0?Math.abs(s+l):0,H=d<0&&u<0?Math.abs(d+u):0,U=s>=0&&l<0,Y=d>=0&&u<0;return i==a[0]&&(this[i].left=t.left+s+v+C+(U?2*-l:0),this[i].top=t.top+d+b+P+(Y?2*-u:0),this[i].width=t.width+(this[i].widthAdd?0:E),this[i].height=t.height+(this[i].heightAdd?0:H),this[i].widthAdd=E,this[i].heightAdd=H),i==a[1]&&(this[i].left=t.left+s+C+(U<0?-l:0),this[i].top=t.top+d+P+(Y?-u:0),this[i].width=t.width+v+m,this[i].height=t.height+b+S),i==a[2]&&(this[i].left=t.left+s+C/2+(U<0?-l:0),this[i].top=t.top+d+P/2+(Y?-u:0),this[i].width=t.width+v+m+C/2+A/2,this[i].height=t.height+b+S+O/2+P/2),i==a[3]&&(this[i].left=t.left+(U<0?-l:0),this[i].top=t.top+(Y?-u:0),this[i].width=t.width+v+m+C+A+s+l,this[i].height=t.height+b+S+O+P+u+d),this[i]},e.layoutBoxUpdate=function(t,e,i,n){var o=this;if(void 0===i&&(i=-1),"border-box"==e.boxSizing){var r=e||{},s=r.border,h=(s=void 0===s?{}:s).borderWidth,d=void 0===h?0:h,c=r.borderTop,l=(c=void 0===c?{}:c).borderTopWidth,f=void 0===l?d:l,u=r.borderBottom,p=(u=void 0===u?{}:u).borderBottomWidth,g=void 0===p?d:p,v=r.borderRight,y=(v=void 0===v?{}:v).borderRightWidth,b=void 0===y?d:y,x=r.borderLeft,m=(x=void 0===x?{}:x).borderLeftWidth,w=void 0===m?d:m,S=r.padding,z=(S=void 0===S?{}:S).paddingTop,M=void 0===z?0:z,B=S.paddingRight,I=void 0===B?0:B,k=S.paddingBottom,P=void 0===k?0:k,W=S.paddingLeft,R=void 0===W?0:W;i||(t.width-=R+I+b+w),1!==i||n||(t.height-=M+P+f+g)}this.layoutBox&&(a.forEach((function(i){return o.layoutBox[i]=o.getOffsetSize(t,e,i)})),this.layoutBox=Object.assign({},this.layoutBox,this.layoutBox.borderSize))},e.getBoxPosition2=function(){var t=this.computedStyle,e=this.fixedLine,i=this.lines,n=t.left,o=void 0===n?0:n,r=t.top,s=void 0===r?0:r,a=t.padding||{},h=a.paddingBottom,d=void 0===h?0:h,c=a.paddingRight,l=void 0===c?0:c,f=$({},this.contentSize,{left:o,top:s}),u=this.contentSize.top-this.offsetSize.top,p=this.contentSize.left-this.offsetSize.left;if(this.root.fixedLine&&!this.root.isDone){this.root.isDone=!0;for(var g,v=X(this.root.fixedLine.elements);!(g=v()).done;){var y=g.value;y.setPosition(y,this.root.offsetSize),y.getBoxPosition2()}}if(e)for(var b,x=X(e.elements);!(b=x()).done;){var m=b.value;m.setPosition(m,f),m.style.left+=o+p+l,m.style.top+=s+u+d,m.getBoxPosition2()}if(i)for(var w,S=X(i);!(w=S()).done;){w.value.layout(f.top+u,f.left+p)}return this.layoutBoxUpdate(f,t),this.layoutBox},e.getBoxState=function(t,e){return this.isBlock(t)||this.isBlock(e)},e.isBlock=function(t){return void 0===t&&(t=this),t&&t.style.display==rt},e.isFlex=function(t){return void 0===t&&(t=this),t&&t.style.display==at},e.isInFlow=function(){return!(this.isAbsolute||this.isFixed)},e.inFlexBox=function(t){return void 0===t&&(t=this),!!t.isInFlow()&&(!!t.parent&&(!(!t.parent||t.parent.style.display!==at)||void 0))},e.isInline=function(t){return void 0===t&&(t=this),t&&t.style.display==st},e.contrastSize=function(t,e,i){var n=t;return i&&(n=Math.min(n,i)),e&&(n=Math.max(n,e)),n},e.measureText=function(t,e){var i=this.ctx.measureText(t),n=i.width,o=i.actualBoundingBoxAscent,r=i.actualBoundingBoxDescent;return{ascent:o,descent:r,width:n,fontHeight:o+r||.7*e+1}},e.getBoxWidthHeight=function(){var t,e=this,i=this.name,n=this.computedStyle,o=this.attributes,r=this.parent,s=void 0===r?{}:r,a=this.ctx,h=this.getChildren(),d=n.left,c=void 0===d?0:d,l=n.top,f=void 0===l?0:l,u=n.bottom,p=n.right,g=n.width,v=void 0===g?0:g,y=n.minWidth,b=n.maxWidth,x=n.minHeight,m=n.maxHeight,w=n.height,S=void 0===w?0:w,z=n.fontSize,M=void 0===z?14:z,B=n.fontWeight,I=n.fontFamily,k=n.fontStyle,P=n.position,W=n.lineClamp,R=n.lineHeight,O=n.padding,T=void 0===O?{}:O,L=n.margin,A=void 0===L?{}:L,F=n.border,C=(F=void 0===F?{}:F).borderWidth,E=void 0===C?0:C,H=n.borderRight,U=(H=void 0===H?{}:H).borderRightWidth,Y=void 0===U?E:U,$=n.borderLeft,D=($=void 0===$?{}:$).borderLeftWidth,_=void 0===D?E:D,X=s.contentSize&&s.contentSize.width,N=s.contentSize&&s.contentSize.height;if(G(v)&&X&&(v=j(v,X)),G(v)&&!X&&(v=null),G(S)&&N&&(S=j(S,N)),G(S)&&!N&&(S=null),G(y)&&X&&(y=j(y,X)),G(b)&&X&&(b=j(b,X)),G(x)&&N&&(x=j(x,N)),G(m)&&N&&(m=j(m,N)),n.padding&&null!=(t=s.contentSize)&&t.width)for(var V in n.padding)Object.hasOwnProperty.call(n.padding,V)&&(n.padding[V]=j(n.padding[V],X));var q=T.paddingRight,J=void 0===q?0:q,Z=T.paddingLeft,tt=void 0===Z?0:Z;if(n.margin&&[n.margin.marginLeft,n.margin.marginRight].includes("auto"))if(v){var ot=X&&X-v-J-tt-_-Y||0;n.margin.marginLeft==n.margin.marginRight?n.margin.marginLeft=n.margin.marginRight=ot/2:"auto"==n.margin.marginLeft?n.margin.marginLeft=ot:n.margin.marginRight=ot}else n.margin.marginLeft=n.margin.marginRight=0;var rt=A.marginRight,st=void 0===rt?0:rt,at=A.marginLeft,dt={width:v,height:S,left:0,top:0},ct=tt+J+_+Y+(void 0===at?0:at)+st;if(i==it&&!this.attributes.widths){var lt=o.text||"";a.save(),a.setFonts({fontFamily:I,fontSize:M,fontWeight:B,fontStyle:k});var ft=new Map;lt.split("\n").map((function(t){var i=t.split("").map((function(t){var i=ft.get(t);if(i)return i;var n=e.measureText(t,M).width;return ft.set(t,n),n})),n=e.measureText(t,M),o=n.fontHeight,r=n.ascent,s=n.descent;e.attributes.fontHeight=o,e.attributes.ascent=r,e.attributes.descent=s,e.attributes.widths||(e.attributes.widths=[]),e.attributes.widths.push({widths:i,total:i.reduce((function(t,e){return t+e}),0)})})),a.restore()}if(i==et&&null==v){var ut=o.width,pt=o.height;dt.width=this.contrastSize(Math.round(ut*S/pt)||0,y,b),this.layoutBoxUpdate(dt,n,0)}if(i==it&&null==v){var gt=this.attributes.widths,vt=Math.max.apply(Math,gt.map((function(t){return t.total})));if(s&&X>0&&(vt>X||this.isBlock(this))&&!this.isAbsolute&&!this.isFixed)vt=X-ct;dt.width=this.contrastSize(vt,y,b),this.layoutBoxUpdate(dt,n,0)}if(i==it&&!this.attributes.lines){var yt=this.attributes.widths.length;this.attributes.widths.forEach((function(t){return t.widths.reduce((function(t,e,i){return t+e>dt.width?(yt++,e):t+e}),0)})),yt=W&&yt>W?W:yt,this.attributes.lines=yt}if(i==et&&null==S){var bt=o.width,xt=o.height;dt.height=this.contrastSize(j(dt.width*xt/bt)||0,x,m),this.layoutBoxUpdate(dt,n,1)}i==it&&null==S&&(R=j(R,M),dt.height=this.contrastSize(j(this.attributes.lines*R),x,m),this.layoutBoxUpdate(dt,n,1,!0)),s&&s.children&&X&&([nt,it].includes(i)&&this.isFlex()||i==nt&&this.isBlock(this)&&!this.isInFlow())&&(dt.width=this.contrastSize(X-ct,y,b),this.layoutBoxUpdate(dt,n)),v&&!G(v)&&(dt.width=this.contrastSize(v,y,b),this.layoutBoxUpdate(dt,n,0)),S&&!G(S)&&(dt.height=this.contrastSize(dt.height,x,m),this.layoutBoxUpdate(dt,n,1));var mt=0;if(h.length){var wt=null;h.forEach((function(t,i){t.getBoxWidthHeight();var o=h[i+1];if(o&&o.isInFlow()&&(t.next=o),t.isInFlow()&&!t.inFlexBox()){var r=e.getBoxState(wt,t);e.line&&e.line.canIEnter(t)&&!r?e.line.add(t):(new Q).bind(t),wt=t}else t.inFlexBox()?e.line&&(e.line.canIEnter(t)||"nowrap"==n.flexWrap)?e.line.add(t):(new K).bind(t):t.isFixed?e.root.fixedLine?e.root.fixedLine.fixedAdd(t):(new Q).fixedBind(t):e.fixedLine?e.fixedLine.fixedAdd(t):(new Q).fixedBind(t,1)})),this.lines&&(mt=this.lines.reduce((function(t,e){return t+e.height}),0))}var St=0,zt=0;if(!v&&(this.isAbsolute||this.isFixed)&&X){var Mt=P==ht?X:this.root.width,Bt=Mt-(G(c)?j(c,Mt):c)-(G(p)?j(p,Mt):p);St=n.left?Bt:this.lineMaxWidth}if(!S&&(null!=f?f:this.isAbsolute||this.isFixed&&N)){var It=P==ht?N:this.root.height,kt=It-(G(f)?j(f,It):f)-(G(u)?j(u,It):u);zt=n.top?kt:0}if(v&&!G(v)||dt.width||(dt.width=St||this.contrastSize((this.isBlock(this)&&!this.isInFlow()?X||s.lineMaxWidth:this.lineMaxWidth)||this.lineMaxWidth,y,b),this.layoutBoxUpdate(dt,n,0)),S||!mt&&!zt||(dt.height=zt||this.contrastSize(mt,x,m),this.layoutBoxUpdate(dt,n)),n.borderRadius&&this.borderSize&&this.borderSize.width)for(var V in n.borderRadius)Object.hasOwnProperty.call(n.borderRadius,V)&&(n.borderRadius[V]=j(n.borderRadius[V],this.borderSize.width));return this.layoutBox},e.layout=function(){return this.getBoxWidthHeight(),this.root.offsetSize=this.offsetSize,this.getBoxPosition2(),this.offsetSize},t}(),ut=function(){var t,e,i,n,o,r,s=[0,11,15,19,23,27,31,16,18,20,22,24,26,28,20,22,24,24,26,28,28,22,24,24,26,26,28,28,24,24,26,26,26,28,28,24,26,26,26,28,28],a=[3220,1468,2713,1235,3062,1890,2119,1549,2344,2936,1117,2583,1330,2470,1667,2249,2028,3780,481,4011,142,3098,831,3445,592,2517,1776,2234,1951,2827,1070,2660,1345,3177],h=[30660,29427,32170,30877,26159,25368,27713,26998,21522,20773,24188,23371,17913,16590,20375,19104,13663,12392,16177,14854,9396,8579,11994,11245,5769,5054,7399,6608,1890,597,3340,2107],d=[1,0,19,7,1,0,16,10,1,0,13,13,1,0,9,17,1,0,34,10,1,0,28,16,1,0,22,22,1,0,16,28,1,0,55,15,1,0,44,26,2,0,17,18,2,0,13,22,1,0,80,20,2,0,32,18,2,0,24,26,4,0,9,16,1,0,108,26,2,0,43,24,2,2,15,18,2,2,11,22,2,0,68,18,4,0,27,16,4,0,19,24,4,0,15,28,2,0,78,20,4,0,31,18,2,4,14,18,4,1,13,26,2,0,97,24,2,2,38,22,4,2,18,22,4,2,14,26,2,0,116,30,3,2,36,22,4,4,16,20,4,4,12,24,2,2,68,18,4,1,43,26,6,2,19,24,6,2,15,28,4,0,81,20,1,4,50,30,4,4,22,28,3,8,12,24,2,2,92,24,6,2,36,22,4,6,20,26,7,4,14,28,4,0,107,26,8,1,37,22,8,4,20,24,12,4,11,22,3,1,115,30,4,5,40,24,11,5,16,20,11,5,12,24,5,1,87,22,5,5,41,24,5,7,24,30,11,7,12,24,5,1,98,24,7,3,45,28,15,2,19,24,3,13,15,30,1,5,107,28,10,1,46,28,1,15,22,28,2,17,14,28,5,1,120,30,9,4,43,26,17,1,22,28,2,19,14,28,3,4,113,28,3,11,44,26,17,4,21,26,9,16,13,26,3,5,107,28,3,13,41,26,15,5,24,30,15,10,15,28,4,4,116,28,17,0,42,26,17,6,22,28,19,6,16,30,2,7,111,28,17,0,46,28,7,16,24,30,34,0,13,24,4,5,121,30,4,14,47,28,11,14,24,30,16,14,15,30,6,4,117,30,6,14,45,28,11,16,24,30,30,2,16,30,8,4,106,26,8,13,47,28,7,22,24,30,22,13,15,30,10,2,114,28,19,4,46,28,28,6,22,28,33,4,16,30,8,4,122,30,22,3,45,28,8,26,23,30,12,28,15,30,3,10,117,30,3,23,45,28,4,31,24,30,11,31,15,30,7,7,116,30,21,7,45,28,1,37,23,30,19,26,15,30,5,10,115,30,19,10,47,28,15,25,24,30,23,25,15,30,13,3,115,30,2,29,46,28,42,1,24,30,23,28,15,30,17,0,115,30,10,23,46,28,10,35,24,30,19,35,15,30,17,1,115,30,14,21,46,28,29,19,24,30,11,46,15,30,13,6,115,30,14,23,46,28,44,7,24,30,59,1,16,30,12,7,121,30,12,26,47,28,39,14,24,30,22,41,15,30,6,14,121,30,6,34,47,28,46,10,24,30,2,64,15,30,17,4,122,30,29,14,46,28,49,10,24,30,24,46,15,30,4,18,122,30,13,32,46,28,48,14,24,30,42,32,15,30,20,4,117,30,40,7,47,28,43,22,24,30,10,67,15,30,19,6,118,30,18,31,47,28,34,34,24,30,20,61,15,30],c=[255,0,1,25,2,50,26,198,3,223,51,238,27,104,199,75,4,100,224,14,52,141,239,129,28,193,105,248,200,8,76,113,5,138,101,47,225,36,15,33,53,147,142,218,240,18,130,69,29,181,194,125,106,39,249,185,201,154,9,120,77,228,114,166,6,191,139,98,102,221,48,253,226,152,37,179,16,145,34,136,54,208,148,206,143,150,219,189,241,210,19,92,131,56,70,64,30,66,182,163,195,72,126,110,107,58,40,84,250,133,186,61,202,94,155,159,10,21,121,43,78,212,229,172,115,243,167,87,7,112,192,247,140,128,99,13,103,74,222,237,49,197,254,24,227,165,153,119,38,184,180,124,17,68,146,217,35,32,137,46,55,63,209,91,149,188,207,205,144,135,151,178,220,252,190,97,242,86,211,171,20,42,93,158,132,60,57,83,71,109,65,162,31,45,67,216,183,123,164,118,196,23,73,236,127,12,111,246,108,161,59,82,41,157,85,170,251,96,134,177,187,204,62,90,203,89,95,176,156,169,160,81,11,245,22,235,122,117,44,215,79,174,213,233,230,231,173,232,116,214,244,234,168,80,88,175],l=[1,2,4,8,16,32,64,128,29,58,116,232,205,135,19,38,76,152,45,90,180,117,234,201,143,3,6,12,24,48,96,192,157,39,78,156,37,74,148,53,106,212,181,119,238,193,159,35,70,140,5,10,20,40,80,160,93,186,105,210,185,111,222,161,95,190,97,194,153,47,94,188,101,202,137,15,30,60,120,240,253,231,211,187,107,214,177,127,254,225,223,163,91,182,113,226,217,175,67,134,17,34,68,136,13,26,52,104,208,189,103,206,129,31,62,124,248,237,199,147,59,118,236,197,151,51,102,204,133,23,46,92,184,109,218,169,79,158,33,66,132,21,42,84,168,77,154,41,82,164,85,170,73,146,57,114,228,213,183,115,230,209,191,99,198,145,63,126,252,229,215,179,123,246,241,255,227,219,171,75,150,49,98,196,149,55,110,220,165,87,174,65,130,25,50,100,200,141,7,14,28,56,112,224,221,167,83,166,81,162,89,178,121,242,249,239,195,155,43,86,172,69,138,9,18,36,72,144,61,122,244,245,247,243,251,235,203,139,11,22,44,88,176,125,250,233,207,131,27,54,108,216,173,71,142,0],f=[],u=[],p=[],g=[],v=[],y=2;function b(t,e){var i;t>e&&(i=t,t=e,e=i),i=e,i*=e,i+=e,i>>=1,g[i+=t]=1}function x(t,i){var n;for(p[t+e*i]=1,n=-2;n<2;n++)p[t+n+e*(i-2)]=1,p[t-2+e*(i+n+1)]=1,p[t+2+e*(i+n)]=1,p[t+n+1+e*(i+2)]=1;for(n=0;n<2;n++)b(t-1,i+n),b(t+1,i-n),b(t-n,i-1),b(t+n,i+1)}function m(t){for(;t>=255;)t=((t-=255)>>8)+(255&t);return t}var w=[];function S(t,e,i,n){var o,r,s;for(o=0;o<n;o++)f[i+o]=0;for(o=0;o<e;o++){if(255!=(s=c[f[t+o]^f[i]]))for(r=1;r<n;r++)f[i+r-1]=f[i+r]^l[m(s+w[n-r])];else for(r=i;r<i+n;r++)f[r]=f[r+1];f[i+n-1]=255==s?0:l[m(s+w[0])]}}function z(t,e){var i;return t>e&&(i=t,t=e,e=i),i=e,i+=e*e,i>>=1,g[i+=t]}function M(t){var i,n,o,r;switch(t){case 0:for(n=0;n<e;n++)for(i=0;i<e;i++)i+n&1||z(i,n)||(p[i+n*e]^=1);break;case 1:for(n=0;n<e;n++)for(i=0;i<e;i++)1&n||z(i,n)||(p[i+n*e]^=1);break;case 2:for(n=0;n<e;n++)for(o=0,i=0;i<e;i++,o++)3==o&&(o=0),o||z(i,n)||(p[i+n*e]^=1);break;case 3:for(r=0,n=0;n<e;n++,r++)for(3==r&&(r=0),o=r,i=0;i<e;i++,o++)3==o&&(o=0),o||z(i,n)||(p[i+n*e]^=1);break;case 4:for(n=0;n<e;n++)for(o=0,r=n>>1&1,i=0;i<e;i++,o++)3==o&&(o=0,r=!r),r||z(i,n)||(p[i+n*e]^=1);break;case 5:for(r=0,n=0;n<e;n++,r++)for(3==r&&(r=0),o=0,i=0;i<e;i++,o++)3==o&&(o=0),(i&n&1)+!(!o|!r)||z(i,n)||(p[i+n*e]^=1);break;case 6:for(r=0,n=0;n<e;n++,r++)for(3==r&&(r=0),o=0,i=0;i<e;i++,o++)3==o&&(o=0),(i&n&1)+(o&&o==r)&1||z(i,n)||(p[i+n*e]^=1);break;case 7:for(r=0,n=0;n<e;n++,r++)for(3==r&&(r=0),o=0,i=0;i<e;i++,o++)3==o&&(o=0),(o&&o==r)+(i+n&1)&1||z(i,n)||(p[i+n*e]^=1)}}function B(t){var e,i=0;for(e=0;e<=t;e++)v[e]>=5&&(i+=3+v[e]-5);for(e=3;e<t-1;e+=2)v[e-2]==v[e+2]&&v[e+2]==v[e-1]&&v[e-1]==v[e+1]&&3*v[e-1]==v[e]&&(0==v[e-3]||e+3>t||3*v[e-3]>=4*v[e]||3*v[e+3]>=4*v[e])&&(i+=40);return i}function I(){var t,i,n,o,r,s=0,a=0;for(i=0;i<e-1;i++)for(t=0;t<e-1;t++)(p[t+e*i]&&p[t+1+e*i]&&p[t+e*(i+1)]&&p[t+1+e*(i+1)]||!(p[t+e*i]||p[t+1+e*i]||p[t+e*(i+1)]||p[t+1+e*(i+1)]))&&(s+=3);for(i=0;i<e;i++){for(v[0]=0,n=o=t=0;t<e;t++)(r=p[t+e*i])==o?v[n]++:v[++n]=1,a+=(o=r)?1:-1;s+=B(n)}a<0&&(a=-a);var h=a,d=0;for(h+=h<<2,h<<=1;h>e*e;)h-=e*e,d++;for(s+=10*d,t=0;t<e;t++){for(v[0]=0,n=o=i=0;i<e;i++)(r=p[t+e*i])==o?v[n]++:v[++n]=1,o=r;s+=B(n)}return s}var k=null;return{api:{get ecclevel(){return y},set ecclevel(t){y=t},get size(){return _size},set size(t){_size=t},get canvas(){return k},set canvas(t){k=t},getFrame:function(v){return function(v){var B,k,P,W,R,O,T,L;W=v.length,t=0;do{if(t++,P=4*(y-1)+16*(t-1),i=d[P++],n=d[P++],o=d[P++],r=d[P],W<=(P=o*(i+n)+n-3+(t<=9)))break}while(t<40);for(e=17+4*t,R=o+(o+r)*(i+n)+n,W=0;W<R;W++)u[W]=0;for(f=v.slice(0),W=0;W<e*e;W++)p[W]=0;for(W=0;W<(e*(e+1)+1)/2;W++)g[W]=0;for(W=0;W<3;W++){for(P=0,k=0,1==W&&(P=e-7),2==W&&(k=e-7),p[k+3+e*(P+3)]=1,B=0;B<6;B++)p[k+B+e*P]=1,p[k+e*(P+B+1)]=1,p[k+6+e*(P+B)]=1,p[k+B+1+e*(P+6)]=1;for(B=1;B<5;B++)b(k+B,P+1),b(k+1,P+B+1),b(k+5,P+B),b(k+B+1,P+5);for(B=2;B<4;B++)p[k+B+e*(P+2)]=1,p[k+2+e*(P+B+1)]=1,p[k+4+e*(P+B)]=1,p[k+B+1+e*(P+4)]=1}if(t>1)for(W=s[t],k=e-7;;){for(B=e-7;B>W-3&&(x(B,k),!(B<W));)B-=W;if(k<=W+9)break;x(6,k-=W),x(k,6)}for(p[8+e*(e-8)]=1,k=0;k<7;k++)b(7,k),b(e-8,k),b(7,k+e-7);for(B=0;B<8;B++)b(B,7),b(B+e-8,7),b(B,e-8);for(B=0;B<9;B++)b(B,8);for(B=0;B<8;B++)b(B+e-8,8),b(8,B);for(k=0;k<7;k++)b(8,k+e-7);for(B=0;B<e-14;B++)1&B?(b(8+B,6),b(6,8+B)):(p[8+B+6*e]=1,p[6+e*(8+B)]=1);if(t>6)for(W=a[t-7],P=17,B=0;B<6;B++)for(k=0;k<3;k++,P--)1&(P>11?t>>P-12:W>>P)?(p[5-B+e*(2-k+e-11)]=1,p[2-k+e-11+e*(5-B)]=1):(b(5-B,2-k+e-11),b(2-k+e-11,5-B));for(k=0;k<e;k++)for(B=0;B<=k;B++)p[B+e*k]&&b(B,k);for(R=f.length,O=0;O<R;O++)u[O]=f.charCodeAt(O);if(f=u.slice(0),R>=(B=o*(i+n)+n)-2&&(R=B-2,t>9&&R--),O=R,t>9){for(f[O+2]=0,f[O+3]=0;O--;)W=f[O],f[O+3]|=255&W<<4,f[O+2]=W>>4;f[2]|=255&R<<4,f[1]=R>>4,f[0]=64|R>>12}else{for(f[O+1]=0,f[O+2]=0;O--;)W=f[O],f[O+2]|=255&W<<4,f[O+1]=W>>4;f[1]|=255&R<<4,f[0]=64|R>>4}for(O=R+3-(t<10);O<B;)f[O++]=236,f[O++]=17;for(w[0]=1,O=0;O<r;O++){for(w[O+1]=1,T=O;T>0;T--)w[T]=w[T]?w[T-1]^l[m(c[w[T]]+O)]:w[T-1];w[0]=l[m(c[w[0]]+O)]}for(O=0;O<=r;O++)w[O]=c[w[O]];for(P=B,k=0,O=0;O<i;O++)S(k,o,P,r),k+=o,P+=r;for(O=0;O<n;O++)S(k,o+1,P,r),k+=o+1,P+=r;for(k=0,O=0;O<o;O++){for(T=0;T<i;T++)u[k++]=f[O+T*o];for(T=0;T<n;T++)u[k++]=f[i*o+O+T*(o+1)]}for(T=0;T<n;T++)u[k++]=f[i*o+O+T*(o+1)];for(O=0;O<r;O++)for(T=0;T<i+n;T++)u[k++]=f[B+O+T*r];for(f=u,B=k=e-1,P=R=1,L=(o+r)*(i+n)+n,O=0;O<L;O++)for(W=f[O],T=0;T<8;T++,W<<=1){128&W&&(p[B+e*k]=1);do{R?B--:(B++,P?0!=k?k--:(P=!P,6==(B-=2)&&(B--,k=9)):k!=e-1?k++:(P=!P,6==(B-=2)&&(B--,k-=8))),R=!R}while(z(B,k))}for(f=p.slice(0),W=0,k=3e4,P=0;P<8&&(M(P),(B=I())<k&&(k=B,W=P),7!=W);P++)p=f.slice(0);for(W!=P&&M(W),k=h[W+(y-1<<3)],P=0;P<8;P++,k>>=1)1&k&&(p[e-1-P+8*e]=1,P<6?p[8+e*P]=1:p[8+e*(P+1)]=1);for(P=0;P<7;P++,k>>=1)1&k&&(p[8+e*(e-7+P)]=1,P?p[6-P+8*e]=1:p[7+8*e]=1);return p}(v)},utf16to8:function(t){var e,i,n,o;for(e="",n=t.length,i=0;i<n;i++)(o=t.charCodeAt(i))>=1&&o<=127?e+=t.charAt(i):o>2047?(e+=String.fromCharCode(224|o>>12&15),e+=String.fromCharCode(128|o>>6&63),e+=String.fromCharCode(128|o>>0&63)):(e+=String.fromCharCode(192|o>>6&31),e+=String.fromCharCode(128|o>>0&63));return e},draw:function(t,i,n,o,r){i.drawView(n,o);var s=i.ctx,a=n.contentSize,h=a.width,d=a.height,c=a.left,l=a.top;o.borderRadius,o.backgroundColor;var f=o.color,u=void 0===f?"#000000":f;o.border,n.contentSize.left,n.borderSize.left,n.contentSize.top,n.borderSize.top;if(y=r||y,s){s.save(),i.setOpacity(o),i.setTransform(n,o);var p=Math.min(h,d);t=this.utf16to8(t);var g=this.getFrame(t),v=p/e;s.setFillStyle(u);for(var b=0;b<e;b++)for(var x=0;x<e;x++)g[x*e+b]&&s.fillRect(c+v*b,l+v*x,v,v);s.restore(),i.setBorder(n,o)}else console.warn("No canvas provided to draw QR code in!")}}}}(),pt=b,gt=y,vt=x,yt=v,bt=c,xt=l,mt=f,wt=u,St=p,zt=g,Mt=function(){function t(t,e){var i,n=this;this.v="1.9.3.4",this.id=null,this.pixelRatio=1,this.width=0,this.height=0,this.sleep=1e3/30,this.count=0,this.isRate=!1,this.isDraw=!0,this.isCache=!0,this.fixed="",this.useCORS=!1,this.imageBus=[],this.createImage=function(t,e){return new Promise((function(i,o){var r=null;r=n.canvas.createImage?n.canvas.createImage():new Image,e&&r.setAttribute("crossOrigin","Anonymous"),r.src=t,r.onload=function(){i({width:r.naturalWidth||r.width,height:r.naturalHeight||r.height,path:r,src:this.src})},r.onerror=function(t){o(t)}}))},this.options=t,Object.assign(this,t),this.component=e,this.ctx=((i=t.context).setFonts=function(t){var e=t.fontFamily,n=void 0===e?"sans-serif":e,o=t.fontSize,r=void 0===o?14:o,a=t.fontWeight,h=void 0===a?"normal":a,d=t.fontStyle,c=void 0===d?"normal":d;T==s.MP_TOUTIAO&&(h="bold"==h?"bold":"",c="italic"==c?"italic":""),i.font="".concat(c," ").concat(h," ").concat(Math.round(r),"px ").concat(n)},i.draw&&i.setFillStyle?i:Object.assign(i,{setStrokeStyle:function(t){i.strokeStyle=t},setLineWidth:function(t){i.lineWidth=t},setLineCap:function(t){i.lineCap=t},setFillStyle:function(t){i.fillStyle=t},setFontSize:function(t){i.font="".concat(String(t),"px sans-serif")},setGlobalAlpha:function(t){i.globalAlpha=t},setLineJoin:function(t){i.lineJoin=t},setTextAlign:function(t){i.textAlign=t},setMiterLimit:function(t){i.miterLimit=t},setShadow:function(t,e,n,o){i.shadowOffsetX=t,i.shadowOffsetY=e,i.shadowBlur=n,i.shadowColor=o},setTextBaseline:function(t){i.textBaseline=t},createCircularGradient:function(){},draw:function(){}})),this.progress=0,this.root={width:t.width,height:t.height,fontSizeRate:1,fixedLine:null},this.size=this.root,this.init();var o=0;Object.defineProperty(this,"progress",{configurable:!0,set:function(t){o=t,n.lifecycle("onProgress",t/n.count)},get:function(){return o||0}})}return t.prototype.lifecycle=function(t,e){this.options.listen&&this.options.listen[t]&&this.options.listen[t](e)},t.prototype.init=function(t){t&&(this.ctx=t),(this.canvas.height||s.WEB==T)&&(this.canvas.height=this.size.height*this.pixelRatio,this.canvas.width=this.size.width*this.pixelRatio,this.ctx.scale(this.pixelRatio,this.pixelRatio))},t.prototype.clear=function(){this.ctx.clearRect(0,0,this.size.width,this.size.height)},t.prototype.clipPath=function(t,e,i,n,o,r,s){void 0===r&&(r=!1),void 0===s&&(s=!1);var a=this.ctx;if(/polygon/.test(o)){var h=o.match(/-?\d+(rpx|px|%)?\s+-?\d+(rpx|px|%)?/g)||[];a.beginPath(),h.map((function(o){var r=o.split(" "),s=r[0],a=r[1];return[j(s,i)+t,j(a,n)+e]})).forEach((function(t,e){0==e?a.moveTo(t[0],t[1]):a.lineTo(t[0],t[1])})),a.closePath(),s&&a.stroke(),r&&a.fill()}},t.prototype.roundRect=function(t,e,i,n,o,r,s){if(void 0===r&&(r=!1),void 0===s&&(s=!1),!(o<0)){var a=this.ctx;if(a.beginPath(),o){var h=o||{},d=h.borderTopLeftRadius,c=void 0===d?o||0:d,l=h.borderTopRightRadius,f=void 0===l?o||0:l,u=h.borderBottomRightRadius,p=void 0===u?o||0:u,g=h.borderBottomLeftRadius,v=void 0===g?o||0:g;a.arc(t+i-p,e+n-p,p,0,.5*Math.PI),a.lineTo(t+v,e+n),a.arc(t+v,e+n-v,v,.5*Math.PI,Math.PI),a.lineTo(t,e+c),a.arc(t+c,e+c,c,Math.PI,1.5*Math.PI),a.lineTo(t+i-f,e),a.arc(t+i-f,e+f,f,1.5*Math.PI,2*Math.PI),a.lineTo(t+i,e+n-p)}else a.rect(t,e,i,n);a.closePath(),s&&a.stroke(),r&&a.fill()}},t.prototype.setTransform=function(t,e){var i=e.transform,n=e.transformOrigin,o=this.ctx,r=i||{},s=r.scaleX,a=void 0===s?1:s,h=r.scaleY,d=void 0===h?1:h,c=r.translateX,l=void 0===c?0:c,f=r.translateY,u=void 0===f?0:f,p=r.rotate,g=void 0===p?0:p,v=r.skewX,y=void 0===v?0:v,b=r.skewY,x=void 0===b?0:b,m=t.left,w=t.top,S=t.width,z=t.height;l=j(l,S)||0,u=j(u,z)||0;var M={top:j("0%",1),center:j("50%",1),bottom:j("100%",1)},B={left:j("0%",1),center:j("50%",1),right:j("100%",1)};if(n=n.split(" ").filter((function(t,e){return e<2})).reduce((function(t,e){if(/\d+/.test(e)){var i=j(e,1)/(/px|rpx$/.test(e)?F(t.x)?z:S:1);return F(t.x)?Object.assign(t,{y:i}):Object.assign(t,{x:i})}return F(B[e])&&!F(t.x)?Object.assign(t,{x:B[e]}):Object.assign(t,{y:M[e]||.5})}),{}),(l||u)&&o.translate(l,u),(a||d)&&o.scale(a,d),g){var I=m+S*n.x,k=w+z*n.y;o.translate(I,k),o.rotate(g*Math.PI/180),o.translate(-I,-k)}(y||x)&&o.transform(1,Math.tan(x*Math.PI/180),Math.tan(y*Math.PI/180),1,0,0)},t.prototype.setBackground=function(t,e,i,n,o){var r=this.ctx;t&&t!=I?E(t)?H(t,e,i,n,o,r):r.setFillStyle(t):[s.MP_TOUTIAO,s.MP_BAIDU].includes(T)?r.setFillStyle("rgba(0,0,0,0)"):r.setFillStyle(I)},t.prototype.setShadow=function(t){var e=t.boxShadow,i=void 0===e?[]:e,n=this.ctx;if(i.length){var o=i[0],r=i[1],s=i[2],a=i[3];n.setShadow(o,r,s,a)}},t.prototype.setBorder=function(t,e){var i=this.ctx,n=t.width,o=t.height,r=t.left,s=t.top,a=e.border,h=e.borderBottom,d=e.borderTop,c=e.borderRight,l=e.borderLeft,f=e.borderRadius,u=e.lineCap,p=a||{},g=p.borderWidth,v=void 0===g?0:g,y=p.borderStyle,b=p.borderColor,x=h||{},m=x.borderBottomWidth,w=void 0===m?v:m,S=x.borderBottomStyle,z=void 0===S?y:S,M=x.borderBottomColor,B=void 0===M?b:M,I=d||{},k=I.borderTopWidth,P=void 0===k?v:k,W=I.borderTopStyle,R=void 0===W?y:W,O=I.borderTopColor,L=void 0===O?b:O,A=c||{},F=A.borderRightWidth,j=void 0===F?v:F,C=A.borderRightStyle,E=void 0===C?y:C,H=A.borderRightColor,U=void 0===H?b:H,Y=l||{},$=Y.borderLeftWidth,D=void 0===$?v:$,_=Y.borderLeftStyle,X=void 0===_?y:_,N=Y.borderLeftColor,V=void 0===N?b:N,G=f||{},q=G.borderTopLeftRadius,J=void 0===q?f||0:q,Q=G.borderTopRightRadius,Z=void 0===Q?f||0:Q,K=G.borderBottomRightRadius,tt=void 0===K?f||0:K,et=G.borderBottomLeftRadius,it=void 0===et?f||0:et;if(h||l||d||c||a){var nt=function(t,e,n){"dashed"==e?/mp/.test(T)?i.setLineDash([Math.ceil(4*t/3),Math.ceil(4*t/3)]):i.setLineDash([Math.ceil(6*t),Math.ceil(6*t)]):"dotted"==e&&i.setLineDash([t,t]),i.setStrokeStyle(n)},ot=function(t,e,n,o,r,s,a,h,d,c,l,f,p,g,v){i.save(),i.setLineCap(v?"square":u),i.setLineWidth(f),nt(f,p,g),i.beginPath(),i.arc(t,e,a,Math.PI*d,Math.PI*c),i.lineTo(n,o),i.arc(r,s,h,Math.PI*c,Math.PI*l),i.stroke(),i.restore()};if(i.save(),a&&!h&&!l&&!d&&!c)return i.setLineWidth(v),nt(v,y,b),this.roundRect(r,s,n,o,f,!1,!!b),void i.restore();w&&ot(r+n-tt,s+o-tt,r+it,s+o,r+it,s+o-it,tt,it,.25,.5,.75,w,z,B,D&&j),D&&ot(r+it,s+o-it,r,s+J,r+J,s+J,it,J,.75,1,1.25,D,X,V,P&&w),P&&ot(r+J,s+J,r+n-Z,s,r+n-Z,s+Z,J,Z,1.25,1.5,1.75,P,R,L,D&&j),j&&ot(r+n-Z,s+Z,r+n,s+o-tt,r+n-tt,s+o-tt,Z,tt,1.75,2,.25,j,E,U,P&&w)}},t.prototype.setOpacity=function(t){var e=t.opacity,i=void 0===e?1:e;this.ctx.setGlobalAlpha(i)},t.prototype.drawPattern=function(t,e,o){return i(this,void 0,void 0,(function(){var i=this;return n(this,(function(n){return[2,new Promise((function(n,r){i.drawView(e,o,!0,!1,!0);var s=i,a=s.ctx;s.canvas;var h=e.width,d=e.height,c=e.left,l=e.top,f=o||{},u=f.borderRadius,p=void 0===u?0:u,g=f.backgroundImage,v=f.backgroundRepeat,y=void 0===v?"repeat":v;g&&function(t){var r=a.createPattern(t.src,y);a.setFillStyle(r),i.roundRect(c,l,h,d,p,!0,!1),i.setBorder(e,o),n()}(t)}))]}))}))},t.prototype.drawView=function(t,e,i,n,o){void 0===i&&(i=!0),void 0===n&&(n=!0),void 0===o&&(o=!0);var r=this.ctx,s=t.width,a=t.height,h=t.left,d=t.top,c=e||{},l=c.borderRadius,f=void 0===l?0:l,u=c.backgroundColor,p=void 0===u?I:u,g=c.overflow;e.opacity&&this.setOpacity(e),this.setTransform(t,e),o&&(r.save(),this.setShadow(e)),i&&this.setBackground(p,s,a,h,d),e.clipPath?this.clipPath(h,d,s,a,e.clipPath,i,!1):this.roundRect(h,d,s,a,f,i,!1),o&&r.restore(),n&&this.setBorder(t,e),"hidden"==g&&r.clip()},t.prototype.drawImage=function(t,e,o,r){return void 0===e&&(e={}),void 0===o&&(o={}),void 0===r&&(r=!0),i(this,void 0,void 0,(function(){var a=this;return n(this,(function(h){switch(h.label){case 0:return[4,new Promise((function(h,d){return i(a,void 0,void 0,(function(){var i,a,d,c,l,f,u,p,g,v,y,b,x,m,w,S,z,M,B,P,W,R=this;return n(this,(function(n){return i=this.ctx,a=o.borderRadius,d=void 0===a?0:a,c=o.backgroundColor,l=void 0===c?I:c,f=o.objectFit,u=void 0===f?k:f,p=o.backgroundSize,g=void 0===p?k:p,v=o.objectPosition,y=o.backgroundPosition,b=o.boxShadow,o.backgroundImage&&(u=g,v=y),b&&this.drawView(e,Object.assign(o,{backgroundColor:l||b&&(l||"#ffffff")}),!0,!1,!0),x=e.width,m=e.height,w=e.left,S=e.top,i.save(),z=e.contentSize.left-e.borderSize.left,M=e.contentSize.top-e.borderSize.top,r||(this.setOpacity(o),this.setTransform(e,o),this.setBackground(l,x,m,w,S),this.roundRect(w,S,x,m,d,!!(d||!b&&l),!1)),w+=z,S+=M,i.clip(),B=function(t){if(u!==k){var n=function(t,e,i){var n=t.objectFit,o=t.objectPosition,r=e.width/e.height,s=i.width/i.height,a=1;"contain"==n&&r>=s||"cover"==n&&r<s?a=e.height/i.height:("contain"==n&&r<s||"cover"==n&&r>=s)&&(a=e.width/i.width);var h=i.width*a,d=i.height*a,c=o||[],l=c[0],f=c[1],u=/^\d+px|rpx$/.test(l)?j(l,e.width):(e.width-h)*(C(l)?j(l,1):{left:0,center:.5,right:1}[l||"center"]),p=/^\d+px|rpx$/.test(f)?j(f,e.height):(e.height-d)*(C(f)?j(f,1):{top:0,center:.5,bottom:1}[f||"center"]),g=function(t,e){return[(t-u)/a,(e-p)/a]},v=g(0,0),y=v[0],b=v[1],x=g(e.width,e.height),m=x[0],w=x[1];return{sx:Math.max(y,0),sy:Math.max(b,0),sw:Math.min(m-y,i.width),sh:Math.min(w-b,i.height),dx:Math.max(u,0),dy:Math.max(p,0),dw:Math.min(h,e.width),dh:Math.min(d,e.height)}}({objectFit:u,objectPosition:v},e.contentSize,t),o=n.sx,r=n.sy,a=n.sh,h=n.sw,d=n.dx,c=n.dy,l=n.dh,f=n.dw;T==s.MP_BAIDU?i.drawImage(t.src,d+w,c+S,f,l,o,r,h,a):i.drawImage(t.src,o,r,h,a,d+w,c+S,f,l)}else i.drawImage(t.src,w,S,x,m)},P=function(){i.restore(),R.drawView(e,o,!1,!0,!1),h(1)},W=function(t){B(t),P()},W(t),[2]}))}))}))];case 1:return h.sent(),[2]}}))}))},t.prototype.drawText=function(t,e,i,n){var o=this.ctx,r=e.borderSize,s=e.contentSize,a=e.left,h=e.top,d=s.width,c=s.height,l=s.left-r.left,f=s.top-r.top,u=i.color,p=void 0===u?"#000000":u,g=i.lineHeight,v=void 0===g?"1.4em":g,y=i.fontSize,b=void 0===y?14:y,x=i.fontWeight,m=i.fontFamily,w=i.fontStyle,S=i.textAlign,z=void 0===S?"left":S,M=i.verticalAlign,B=void 0===M?xt:M,I=i.backgroundColor,k=i.lineClamp,P=i.backgroundClip,W=i.textShadow,R=i.textDecoration;if(this.drawView(e,i,P!=gt),v=j(v,b),t){switch(o.save(),this.setShadow({boxShadow:W}),a+=l,h+=f,o.setFonts({fontFamily:m,fontSize:b,fontWeight:x,fontStyle:w}),o.setTextBaseline(xt),o.setTextAlign(z),P?this.setBackground(I,d,c,a,h):o.setFillStyle(p),z){case wt:break;case St:a+=.5*d;break;case zt:a+=d}var O=n.lines*v,T=Math.ceil((c-O)/2);switch(T<0&&(T=0),B){case bt:break;case xt:h+=T;break;case mt:h+=2*T}var L=n.fontHeight,A=n.descent,F=(v-L)/2,C=function(t){var e=o.measureText(t),i=e.actualBoundingBoxDescent,n=void 0===i?0:i,r=e.actualBoundingBoxAscent,s=void 0===r?0:r,a=n+s||.7*b+1;return B==bt?{fix:s,height:a,lineY:v-a}:B==xt?{fix:v/2+n/4,height:a,lineY:(v-a)/2}:B==mt?{fix:v-n,height:a,lineY:0}:{fix:0,height:0,lineY:0}},E=function(t,e,i){var r=t;switch(z){case wt:r+=i;break;case St:r=(t-=i/2)+i;break;case zt:r=t,t-=i}if(R){o.setLineWidth(b/13),o.beginPath();var s=.1*n.fontHeight;/\bunderline\b/.test(R)&&(A||(e+=F/2),o.moveTo(t,e+s),o.lineTo(r,e+s)),/\boverline\b/.test(R)&&(A||(e-=F/2),o.moveTo(t,e-n.fontHeight-s),o.lineTo(r,e-n.fontHeight-s)),/\bline-through\b/.test(R)&&(o.moveTo(t,e-.5*n.fontHeight),o.lineTo(r,e-.5*n.fontHeight)),o.closePath(),o.setStrokeStyle(p),o.stroke()}};if(!n.widths||1==n.widths.length&&n.widths[0].total<=s.width){var H=C(t),U=H.fix,Y=H.lineY;return o.fillText(t,a,h+U),E(a,(h+=v)-Y,n&&n.widths&&n.widths[0].total||n.text),o.restore(),void this.setBorder(e,i)}for(var $=t.split(""),D=h,_=a,X="",N=0,V=0;V<=$.length;V++){var G=$[V]||"",q="\n"===G,J=""==G,Q=X+(G=q?"":G),Z=o.measureText(Q).width;if(N>=k)break;if(_=a,Z>s.width||q||J){if(N++,X=J&&Z<=s.width?Q:X,N===k&&Z>d){for(;o.measureText("".concat(X,"...")).width>s.width&&!(X.length<=1);)X=X.substring(0,X.length-1);X+="..."}var K=C(X);U=K.fix,Y=K.lineY;if(o.fillText(X,_,h+U),E(_,(h+=v)-Y,Z),X=G,h>D+c)break}else X=Q}o.restore()}},t.prototype.source=function(t){var e;return i(this,void 0,void 0,(function(){var i,o,r,s=this;return n(this,(function(n){switch(n.label){case 0:if(this.node=null,i=+new Date,"{}"==JSON.stringify(t))return[2];if(!t.type)for(o in t.type=yt,t.css=t.css||{},t)["views","children","type","css"].includes(o)||(t.css[o]=t[o],delete t[o]);return(null===(e=t.css)||void 0===e?void 0:e.width)||t.css||(t.css={}),[4,this.create(t)];case 1:return r=n.sent(),this.size=(null==r?void 0:r.layout())||{},this.node=r,this.onEffectFinished().then((function(t){return s.lifecycle("onEffectSuccess",t)})).catch((function(t){return s.lifecycle("onEffectFail",t)})),console.log("布局用时："+(+new Date-i)+"ms"),[2,this.size]}}))}))},t.prototype.getImageInfo=function(t){return this.imageBus[t]||(this.imageBus[t]=this.createImage(t,this.useCORS)),this.imageBus[t]},t.prototype.create=function(t,o){var r,s;return i(this,void 0,void 0,(function(){var i,a,h,d,c,l,f,u,p,g,v,y,b,x,m,w,z;return n(this,(function(n){switch(n.label){case 0:if(i=t.type==pt,a=[gt,vt].includes(t.type),h=t.css||{},d=h.backgroundImage,c=h.display,i&&!t.src&&!t.url||a&&!t.text)return[2];if(c==S)return[2];if(a&&(t.text=String(t.text)),!(i||t.type==yt&&d))return[3,4];l=i?t.src:"",f=/url\((.+)\)/,d&&(null===(r=f.exec(d))||void 0===r?void 0:r[1])&&(l=(null===(s=f.exec(d))||void 0===s?void 0:s[1])||""),n.label=1;case 1:return n.trys.push([1,3,,4]),[4,this.getImageInfo(l)];case 2:return u=n.sent(),p=u.width,g=u.height,!(v=u.path)&&i?[2]:(v&&(t.attributes=Object.assign(t.attributes||{},{width:p,height:g,path:v,src:v,naturalSrc:l})),[3,4]);case 3:return y=n.sent(),t.type!=yt?[2]:(this.lifecycle("onEffectFail",e(e({},y),{src:l})),[3,4]);case 4:if(this.count+=1,b=new ft(t,o,this.root,this.ctx),!(x=t.views||t.children))return[3,8];m=0,n.label=5;case 5:return m<x.length?(w=x[m],[4,this.create(w,b)]):[3,8];case 6:(z=n.sent())&&b.add(z),n.label=7;case 7:return m++,[3,5];case 8:return[2,b]}}))}))},t.prototype.drawNode=function(t,e){return void 0===e&&(e=!1),i(this,void 0,void 0,(function(){var i,o,r,s,a,h,d,c,l,f,u,p,g,v,y,b,x,m,w,S;return n(this,(function(n){switch(n.label){case 0:return i=t.layoutBox,o=t.computedStyle,r=t.attributes,s=t.name,a=t.children,h=t.fixedLine,d=t.attributes,c=d.src,l=d.text,["fixed"].includes(o.position)&&!e?[2]:(this.ctx.save(),s!==yt?[3,7]:c?o.backgroundRepeat?[4,this.drawPattern(r,i,o)]:[3,2]:[3,5]);case 1:return n.sent(),[3,4];case 2:return[4,this.drawImage(r,i,o,!1)];case 3:n.sent(),n.label=4;case 4:return[3,6];case 5:this.drawView(i,o),n.label=6;case 6:return[3,10];case 7:return s===pt&&c?[4,this.drawImage(r,i,o,!1)]:[3,9];case 8:return n.sent(),[3,10];case 9:s===gt?this.drawText(l,i,o,r):s===vt&&ut.api&&ut.api.draw(l,this,i,o),n.label=10;case 10:if(this.progress+=1,u=(f=h||{}).beforeElements,p=f.afterElements,!u)return[3,14];g=0,v=u,n.label=11;case 11:return g<v.length?(S=v[g],[4,this.drawNode(S)]):[3,14];case 12:n.sent(),n.label=13;case 13:return g++,[3,11];case 14:if(!a)return[3,18];y=Object.values?Object.values(a):Object.keys(a).map((function(t){return a[t]})),b=0,x=y,n.label=15;case 15:return b<x.length?"absolute"===(S=x[b]).computedStyle.position?[3,17]:[4,this.drawNode(S)]:[3,18];case 16:n.sent(),n.label=17;case 17:return b++,[3,15];case 18:if(!p)return[3,22];m=0,w=p,n.label=19;case 19:return m<w.length?(S=w[m],[4,this.drawNode(S)]):[3,22];case 20:n.sent(),n.label=21;case 21:return m++,[3,19];case 22:return this.ctx.restore(),[2]}}))}))},t.prototype.render=function(t){var e=this;return void 0===t&&(t=30),new Promise((function(o,r){return i(e,void 0,void 0,(function(){var e,i,s,a,h,d,c,l,f,u;return n(this,(function(n){switch(n.label){case 0:return e=+new Date,this.init(),[4,(p=t,void 0===p&&(p=0),new Promise((function(t){return setTimeout(t,p)})))];case 1:n.sent(),n.label=2;case 2:if(n.trys.push([2,14,,15]),!this.node)return[3,12];if(i=this.root.fixedLine||{},s=i.beforeElements,a=i.afterElements,!s)return[3,6];h=0,d=s,n.label=3;case 3:return h<d.length?(f=d[h],[4,this.drawNode(f,!0)]):[3,6];case 4:n.sent(),n.label=5;case 5:return h++,[3,3];case 6:return[4,this.drawNode(this.node)];case 7:if(n.sent(),!a)return[3,11];c=0,l=a,n.label=8;case 8:return c<l.length?(f=l[c],[4,this.drawNode(f,!0)]):[3,11];case 9:n.sent(),n.label=10;case 10:return c++,[3,8];case 11:return o(this.node),[3,13];case 12:this.lifecycle("onEffectFail","node is empty"),n.label=13;case 13:return[3,15];case 14:return u=n.sent(),this.lifecycle("onEffectFail",u),r(u),[3,15];case 15:return console.log("渲染用时："+(+new Date-e-30)+"ms"),[2]}var p}))}))}))},t.prototype.onEffectFinished=function(){var t=this,e=Object.keys(this.imageBus).map((function(e){return t.imageBus[e]}));return Promise.all(e)},t.prototype.destroy=function(){this.node=[]},t.prototype.save=function(t){try{var e=t||{},i=e.fileType,n=void 0===i?"png":i,o=e.quality,r=void 0===o?1:o;return this.canvas.toDataURL("image/".concat(n),r)}catch(t){return this.lifecycle("onEffectFail","image cross domain"),t}},t}();s.WEB==T&&(window.Painter=Mt),t.Painter=Mt,t.default=Mt,Object.defineProperty(t,"__esModule",{value:!0})}));
diff --git a/uni_modules/lime-painter/static/uni.webview.1.5.3.js b/uni_modules/lime-painter/static/uni.webview.1.5.3.js
new file mode 100644
index 0000000..d6524fa
--- /dev/null
+++ b/uni_modules/lime-painter/static/uni.webview.1.5.3.js
@@ -0,0 +1 @@
+!function(e,n){"object"==typeof exports&&"undefined"!=typeof module?module.exports=n():"function"==typeof define&&define.amd?define(n):(e=e||self).uni=n()}(this,(function(){"use strict";try{var e={};Object.defineProperty(e,"passive",{get:function(){!0}}),window.addEventListener("test-passive",null,e)}catch(e){}var n=Object.prototype.hasOwnProperty;function i(e,i){return n.call(e,i)}var t=[];function o(){return window.__dcloud_weex_postMessage||window.__dcloud_weex_}var r=function(e,n){var i={options:{timestamp:+new Date},name:e,arg:n};if(o()){if("postMessage"===e){var r={data:[n]};return window.__dcloud_weex_postMessage?window.__dcloud_weex_postMessage(r):window.__dcloud_weex_.postMessage(JSON.stringify(r))}var a={type:"WEB_INVOKE_APPSERVICE",args:{data:i,webviewIds:t}};window.__dcloud_weex_postMessage?window.__dcloud_weex_postMessageToService(a):window.__dcloud_weex_.postMessageToService(JSON.stringify(a))}if(!window.plus)return window.parent.postMessage({type:"WEB_INVOKE_APPSERVICE",data:i,pageId:""},"*");if(0===t.length){var d=plus.webview.currentWebview();if(!d)throw new Error("plus.webview.currentWebview() is undefined");var s=d.parent(),w="";w=s?s.id:d.id,t.push(w)}if(plus.webview.getWebviewById("__uniapp__service"))plus.webview.postMessageToUniNView({type:"WEB_INVOKE_APPSERVICE",args:{data:i,webviewIds:t}},"__uniapp__service");else{var u=JSON.stringify(i);plus.webview.getLaunchWebview().evalJS('UniPlusBridge.subscribeHandler("'.concat("WEB_INVOKE_APPSERVICE",'",').concat(u,",").concat(JSON.stringify(t),");"))}},a={navigateTo:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;r("navigateTo",{url:encodeURI(n)})},navigateBack:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.delta;r("navigateBack",{delta:parseInt(n)||1})},switchTab:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;r("switchTab",{url:encodeURI(n)})},reLaunch:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;r("reLaunch",{url:encodeURI(n)})},redirectTo:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{},n=e.url;r("redirectTo",{url:encodeURI(n)})},getEnv:function(e){o()?e({nvue:!0}):window.plus?e({plus:!0}):e({h5:!0})},postMessage:function(){var e=arguments.length>0&&void 0!==arguments[0]?arguments[0]:{};r("postMessage",e.data||{})}},d=/uni-app/i.test(navigator.userAgent),s=/Html5Plus/i.test(navigator.userAgent),w=/complete|loaded|interactive/;var u=window.my&&navigator.userAgent.indexOf("AlipayClient")>-1;var g=window.swan&&window.swan.webView&&/swan/i.test(navigator.userAgent);var c=window.qq&&window.qq.miniProgram&&/QQ/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var v=window.tt&&window.tt.miniProgram&&/toutiaomicroapp/i.test(navigator.userAgent);var m=window.wx&&window.wx.miniProgram&&/micromessenger/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var p=window.qa&&/quickapp/i.test(navigator.userAgent);var f=window.ks&&window.ks.miniProgram&&/micromessenger/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);var l=window.tt&&window.tt.miniProgram&&/Lark|Feishu/i.test(navigator.userAgent);var _=window.jd&&window.jd.miniProgram&&/micromessenger/i.test(navigator.userAgent)&&/miniProgram/i.test(navigator.userAgent);for(var E,b=function(){window.UniAppJSBridge=!0,document.dispatchEvent(new CustomEvent("UniAppJSBridgeReady",{bubbles:!0,cancelable:!0}))},h=[function(e){if(d||s)return window.__dcloud_weex_postMessage||window.__dcloud_weex_?document.addEventListener("DOMContentLoaded",e):window.plus&&w.test(document.readyState)?setTimeout(e,0):document.addEventListener("plusready",e),a},function(e){if(m)return window.WeixinJSBridge&&window.WeixinJSBridge.invoke?setTimeout(e,0):document.addEventListener("WeixinJSBridgeReady",e),window.wx.miniProgram},function(e){if(c)return window.QQJSBridge&&window.QQJSBridge.invoke?setTimeout(e,0):document.addEventListener("QQJSBridgeReady",e),window.qq.miniProgram},function(e){if(u){document.addEventListener("DOMContentLoaded",e);var n=window.my;return{navigateTo:n.navigateTo,navigateBack:n.navigateBack,switchTab:n.switchTab,reLaunch:n.reLaunch,redirectTo:n.redirectTo,postMessage:n.postMessage,getEnv:n.getEnv}}},function(e){if(g)return document.addEventListener("DOMContentLoaded",e),window.swan.webView},function(e){if(v)return document.addEventListener("DOMContentLoaded",e),window.tt.miniProgram},function(e){if(p){window.QaJSBridge&&window.QaJSBridge.invoke?setTimeout(e,0):document.addEventListener("QaJSBridgeReady",e);var n=window.qa;return{navigateTo:n.navigateTo,navigateBack:n.navigateBack,switchTab:n.switchTab,reLaunch:n.reLaunch,redirectTo:n.redirectTo,postMessage:n.postMessage,getEnv:n.getEnv}}},function(e){if(f)return window.WeixinJSBridge&&window.WeixinJSBridge.invoke?setTimeout(e,0):document.addEventListener("WeixinJSBridgeReady",e),window.ks.miniProgram},function(e){if(l)return document.addEventListener("DOMContentLoaded",e),window.tt.miniProgram},function(e){if(_)return window.JDJSBridgeReady&&window.JDJSBridgeReady.invoke?setTimeout(e,0):document.addEventListener("JDJSBridgeReady",e),window.jd.miniProgram},function(e){return document.addEventListener("DOMContentLoaded",e),a}],y=0;y<h.length&&!(E=h[y](b));y++);E||(E={});var B="undefined"!=typeof uni?uni:{};if(!B.navigateTo)for(var S in E)i(E,S)&&(B[S]=E[S]);return B.webView=E,B}));
diff --git a/uni_modules/mumu-recorder/changelog.md b/uni_modules/mumu-recorder/changelog.md
new file mode 100644
index 0000000..eb2c332
--- /dev/null
+++ b/uni_modules/mumu-recorder/changelog.md
@@ -0,0 +1,4 @@
+## 1.0.1（2022-06-11）
+修复苹果手机在微信中无法获取音频长度问题
+## 1.0.0（2022-06-10）
+版本上线
diff --git a/uni_modules/mumu-recorder/components/mumu-recorder/mumu-recorder.vue b/uni_modules/mumu-recorder/components/mumu-recorder/mumu-recorder.vue
new file mode 100644
index 0000000..b25a83e
--- /dev/null
+++ b/uni_modules/mumu-recorder/components/mumu-recorder/mumu-recorder.vue
@@ -0,0 +1,120 @@
+<template>
+	<view class="recorder">
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				isUserMedia: false,
+				stream: null,
+				audio: null,
+				recorder: null,
+				chunks: [],
+				startTime: 0
+			}
+		},
+		mounted() {
+			/**
+			 * 	error 事件的返回状态
+			 * 	100: 请在HTTPS环境中使用
+			 * 	101: 浏览器不支持
+			 *  201: 用户拒绝授权
+			 *  500: 未知错误
+			 * */
+			if (origin.indexOf('https') === -1) {
+				this.$emit('error', '100')
+				throw '请在 https 环境中使用本插件。'
+			}
+			if (!navigator.mediaDevices || !window.MediaRecorder) {
+				this.$emit('error', '101')
+				throw '当前浏览器不支持'
+			}
+			this.getRecorderManager()
+		},
+		methods: {
+			getRecorderManager() {
+				this.audio = document.createElement('audio')
+				navigator.mediaDevices.getUserMedia({
+					audio: true
+				}).then(stream => {
+					this.isUserMedia = true
+					stream.getTracks().forEach((track) => {
+						track.stop()
+					})
+				}).catch(err => {
+					this.onErrorHandler(err)
+				})
+			},
+			start() {
+				if (!this.isUserMedia) return console.log('设备不支持')
+
+				navigator.mediaDevices.getUserMedia({
+					audio: true
+				}).then(stream => {
+					this.startTime = new Date().getTime()
+					this.stream = stream
+					this.recorder = new MediaRecorder(stream)
+					this.recorder.ondataavailable = this.getRecordingData
+					this.recorder.onstop = this.saveRecordingData
+					this.recorder.start()
+				}).catch(err => {
+					this.onErrorHandler(err)
+				})
+			},
+			stop() {
+				this.recorder.stop()
+				this.stream.getTracks().forEach((track) => {
+					track.stop()
+				})
+			},
+			getRecordingData(e) {
+				this.chunks.push(e.data)
+			},
+			saveRecordingData() {
+				const blob = new Blob(this.chunks, {
+						'type': 'audio/mpeg'
+					}),
+					localUrl = URL.createObjectURL(blob)
+
+				const endTime = new Date().getTime()
+
+				let duration = (endTime - this.startTime).toString().split('')
+				duration.splice(duration.length - 2)
+				duration.splice(duration.length - 1, 0, '.')
+				duration = parseFloat(duration.join(''))
+
+				const recorder = {
+					data: blob,
+					duration: duration,
+					localUrl: localUrl
+				}
+				this.$emit('success', recorder)
+			},
+			onErrorHandler(err) {
+				console.log(err, '========onErrorHandler')
+				if (err.name === 'NotAllowedError') {
+					this.$emit('error', '201')
+					throw '用户拒绝了当前的浏览器实例的访问请求'
+				}
+
+				if (err.name === 'NotReadableError') {
+					this.$emit('error', '101')
+					throw '当前浏览器不支持'
+				}
+
+				this.$emit('error', '500')
+				throw '调用失败，原因不详'
+
+			}
+		},
+		destroyed() {
+			this.stop()
+		},
+		clear() {
+		}
+	}
+</script>
+<style>
+</style>
\ No newline at end of file
diff --git a/uni_modules/mumu-recorder/package.json b/uni_modules/mumu-recorder/package.json
new file mode 100644
index 0000000..00d5e90
--- /dev/null
+++ b/uni_modules/mumu-recorder/package.json
@@ -0,0 +1,87 @@
+{
+  "id": "mumu-recorder",
+  "displayName": "h5录音组件，调用H5原生功能使用麦克风进行录音",
+  "version": "1.0.1",
+  "description": "演示案例中模仿了微信的长按发送语音，与普通录音demo。",
+  "keywords": [
+    "录音",
+    "麦克风",
+    "模仿微信"
+],
+  "repository": "",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "category": [
+        "前端组件",
+        "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "麦克风"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "y",
+          "vue3": "y"
+        },
+        "App": {
+          "app-vue": "n",
+          "app-nvue": "n"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "n",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "u",
+          "阿里": "u",
+          "百度": "u",
+          "字节跳动": "u",
+          "QQ": "u",
+          "钉钉": "u",
+          "快手": "u",
+          "飞书": "u",
+          "京东": "u",
+          "小红书": "u"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/mumu-recorder/readme.md b/uni_modules/mumu-recorder/readme.md
new file mode 100644
index 0000000..1f888e5
--- /dev/null
+++ b/uni_modules/mumu-recorder/readme.md
@@ -0,0 +1,117 @@
+## 插件简绍
+
+### 实现原理
+
+> 通过 navigator.mediaDevices.getUserMedia(需要https环境) 这个api调用麦克风，获取到到音频流数据。
+>
+> 通过 MediaRecorder 这个构造函数对音频流进行接收，完成录制后会返回一个存储`Blob`内容的录制数据。
+
+
+### 使用环境
+
+需要https环境才能使用，本地测试可以在 manifest.json  中点击源码展示，找到h5 ，添加："devServer" : { "https" : true}
+
+**请勿使用 UC浏览器 与 夸克等阿里旗下的浏览器，发现他们使用的内核都较低，无法正常获取音频流，并且都有对接音频流截取的插件，导致无法正常获取音频流的数据。在微信中可以正常使用，推荐在微信内打开演示案例 **
+
+需要https环境才能使用！！！
+
+需要https环境才能使用！！！
+
+需要https环境才能使用！！！
+
+### 插件使用
+
+**插件已支持 uni_modules 支持组件easycom，以下代码演示的是普通使用**
+
+``` html
+<!-- HTML -->
+	<view>
+    <audio :src='recorder.localUrl' v-if='recorder' name='本地录音' controls="true"></audio>
+    <view @click='handlerOnCahnger'>
+			{{!status?'开始录音':'结束录音'}}
+		</view>
+		<mumu-recorder ref='recorder' @success='handlerSuccess' @error='handlerError'></mumu-recorder>
+	</view>
+```
+
+``` javascript
+// js
+	import MumuRecorder from '@/uni_modules/mumu-recorder/components/mumu-recorder/mumu-recorder.vue'
+	export default {
+		components: { MumuRecorder },
+		data() {
+			return {
+				status: false,
+				recorder: null
+			}
+		},
+		onLoad() {
+
+		},
+		methods: {
+			handlerSave() {
+				let tag = document.createElement('a')
+				tag.href = this.recorder.localUrl
+				tag.download = '录音'
+				tag.click()
+			},
+			handlerOnCahnger() {
+				if (this.status) {
+					this.$refs.recorder.stop()
+				} else {
+					this.$refs.recorder.start()
+				}
+				this.status = !this.status
+			},
+			handlerSuccess(res) {
+				console.log(res)
+				this.recorder = res
+			},
+			handlerError(code) {
+				switch (code) {
+					case '101':
+						uni.showModal({
+							content: '当前浏览器版本较低，请更换浏览器使用，推荐在微信中打开。'
+						})
+						break;
+					case '201':
+						uni.showModal({
+							content: '麦克风权限被拒绝，请刷新页面后授权麦克风权限。'
+						})
+						break
+					default:
+						uni.showModal({
+							content: '未知错误，请刷新页面重试'
+						})
+						break
+				}
+			}
+		}
+	}
+```
+
+### 相关API
+
+##### 组件内部方法（$refs 调用）
+
+| 方法名 | 说明     | 参数 |
+| ------ | -------- | ---- |
+| start  | 开始录音 | 无   |
+| stop   | 结束录音 | 无   |
+
+
+
+##### 事件（Events）
+
+| 事件名  | 说明                 | 回调参数                                                     |
+| ------- | -------------------- | ------------------------------------------------------------ |
+| success | 停止录音后调用此事件 | 返回录音数据，是一个对象<br />{ data: 音频的 blob 数据，上传请使用这个			<br />duration: 当前音频长度<br/>localUrl: 当前音频的本地链接，可直接通过 audio 标签进行播放 } |
+| error   | 组件内部发生错误     | 错误码：<100 当前不是https环境> <101 浏览器不支持> <201 麦克风权限被拒绝> <500  未知错误> |
+
+### 案例演示
+
+![enter description here](https://h5plugin.mumudev.top/public/recorder/qrcode.png)
+
+## 支持作者
+
+![支持作者](https://student.mumudev.top/wxMP.jpg)
\ No newline at end of file
diff --git a/uni_modules/uni-popup/changelog.md b/uni_modules/uni-popup/changelog.md
new file mode 100644
index 0000000..b4bfd61
--- /dev/null
+++ b/uni_modules/uni-popup/changelog.md
@@ -0,0 +1,78 @@
+## 1.8.8（2024-02-20）
+- 修复 uni-popup 在微信小程序下出现文字向上闪动的bug
+## 1.8.7（2024-02-02）
+- 新增 uni-popup-dialog 新增属性focus：input模式下，是否自动自动聚焦
+## 1.8.6（2024-01-30）
+- 新增 uni-popup-dialog 新增属性maxLength:限制输入框字数
+## 1.8.5（2024-01-26）
+- 新增 uni-popup-dialog 新增属性showClose:控制关闭按钮的显示
+## 1.8.4（2023-11-15）
+- 新增 uni-popup 支持uni-app-x 注意暂时仅支持 `maskClick` `@open` `@close`
+## 1.8.3（2023-04-17）
+- 修复 uni-popup 重复打开时的 bug
+## 1.8.2（2023-02-02）
+- uni-popup-dialog 组件新增 inputType 属性
+## 1.8.1（2022-12-01）
+- 修复 nvue 下 v-show 报错
+## 1.8.0（2022-11-29）
+- 优化 主题样式
+## 1.7.9（2022-04-02）
+- 修复 弹出层内部无法滚动的bug
+## 1.7.8（2022-03-28）
+- 修复 小程序中高度错误的bug
+## 1.7.7（2022-03-17）
+- 修复 快速调用open出现问题的Bug
+## 1.7.6（2022-02-14）
+- 修复 safeArea 属性不能设置为false的bug
+## 1.7.5（2022-01-19）
+- 修复 isMaskClick 失效的bug
+## 1.7.4（2022-01-19）
+- 新增 cancelText \ confirmText 属性 ，可自定义文本
+- 新增 maskBackgroundColor 属性 ，可以修改蒙版颜色
+- 优化 maskClick属性 更新为 isMaskClick ，解决微信小程序警告的问题
+## 1.7.3（2022-01-13）
+- 修复 设置 safeArea 属性不生效的bug
+## 1.7.2（2021-11-26）
+- 优化 组件示例
+## 1.7.1（2021-11-26）
+- 修复 vuedoc 文字错误
+## 1.7.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-popup](https://uniapp.dcloud.io/component/uniui/uni-popup)
+## 1.6.2（2021-08-24）
+- 新增 支持国际化
+## 1.6.1（2021-07-30）
+- 优化 vue3下事件警告的问题
+## 1.6.0（2021-07-13）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.5.0（2021-06-23）
+- 新增 mask-click 遮罩层点击事件
+## 1.4.5（2021-06-22）
+- 修复 nvue 平台中间弹出后，点击内容，再点击遮罩无法关闭的Bug
+## 1.4.4（2021-06-18）
+- 修复 H5平台中间弹出后，点击内容，再点击遮罩无法关闭的Bug
+## 1.4.3（2021-06-08）
+- 修复 错误的 watch 字段
+- 修复 safeArea 属性不生效的问题
+- 修复 点击内容，再点击遮罩无法关闭的Bug
+## 1.4.2（2021-05-12）
+- 新增 组件示例地址
+## 1.4.1（2021-04-29）
+- 修复 组件内放置 input 、textarea 组件，无法聚焦的问题
+## 1.4.0 （2021-04-29）
+- 新增 type 属性的 left\right 值，支持左右弹出
+- 新增 open(String:type) 方法参数 ，可以省略 type 属性 ，直接传入类型打开指定弹窗
+- 新增 backgroundColor 属性，可定义主窗口背景色,默认不显示背景色
+- 新增 safeArea 属性，是否适配底部安全区
+- 修复 App\h5\微信小程序底部安全区占位不对的Bug
+- 修复 App 端弹出等待的Bug
+- 优化 提升低配设备性能，优化动画卡顿问题
+- 优化 更简单的组件自定义方式
+## 1.2.9（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+## 1.2.8（2021-02-05）
+- 调整为uni_modules目录规范
+## 1.2.7（2021-02-05）
+- 调整为uni_modules目录规范
+- 新增 支持 PC 端
+- 新增 uni-popup-message 、uni-popup-dialog扩展组件支持 PC 端
diff --git a/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js b/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js
new file mode 100644
index 0000000..6ef26a2
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup-dialog/keypress.js
@@ -0,0 +1,45 @@
+// #ifdef H5
+export default {
+  name: 'Keypress',
+  props: {
+    disable: {
+      type: Boolean,
+      default: false
+    }
+  },
+  mounted () {
+    const keyNames = {
+      esc: ['Esc', 'Escape'],
+      tab: 'Tab',
+      enter: 'Enter',
+      space: [' ', 'Spacebar'],
+      up: ['Up', 'ArrowUp'],
+      left: ['Left', 'ArrowLeft'],
+      right: ['Right', 'ArrowRight'],
+      down: ['Down', 'ArrowDown'],
+      delete: ['Backspace', 'Delete', 'Del']
+    }
+    const listener = ($event) => {
+      if (this.disable) {
+        return
+      }
+      const keyName = Object.keys(keyNames).find(key => {
+        const keyName = $event.key
+        const value = keyNames[key]
+        return value === keyName || (Array.isArray(value) && value.includes(keyName))
+      })
+      if (keyName) {
+        // 避免和其他按键事件冲突
+        setTimeout(() => {
+          this.$emit(keyName, {})
+        }, 0)
+      }
+    }
+    document.addEventListener('keyup', listener)
+    this.$once('hook:beforeDestroy', () => {
+      document.removeEventListener('keyup', listener)
+    })
+  },
+	render: () => {}
+}
+// #endif
diff --git a/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
new file mode 100644
index 0000000..68a1ce2
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup-dialog/uni-popup-dialog.vue
@@ -0,0 +1,294 @@
+<template>
+	<view class="uni-popup-dialog">
+		<view class="uni-dialog-title">
+			<text class="uni-dialog-title-text" :class="['uni-popup__'+dialogType]">{{titleText}}</text>
+		</view>
+		<view v-if="mode === 'base'" class="uni-dialog-content">
+			<slot>
+				<text class="uni-dialog-content-text">{{content}}</text>
+			</slot>
+		</view>
+		<view v-else class="uni-dialog-content">
+			<slot>
+				<input class="uni-dialog-input" :maxlength="maxlength" v-model="val" :type="inputType"
+					:placeholder="placeholderText" :focus="focus">
+			</slot>
+		</view>
+		<view class="uni-dialog-button-group">
+			<view class="uni-dialog-button" v-if="showClose" @click="closeDialog">
+				<text class="uni-dialog-button-text">{{closeText}}</text>
+			</view>
+			<view class="uni-dialog-button uni-border-left" @click="onOk">
+				<text class="uni-dialog-button-text uni-button-color">{{okText}}</text>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import popup from '../uni-popup/popup.js'
+	import {
+		initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from '../uni-popup/i18n/index.js'
+	const {
+		t
+	} = initVueI18n(messages)
+	/**
+	 * PopUp 弹出层-对话框样式
+	 * @description 弹出层-对话框样式
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} value input 模式下的默认值
+	 * @property {String} placeholder input 模式下输入提示
+	 * @property {Boolean} focus input模式下是否自动聚焦，默认为true
+	 * @property {String} type = [success|warning|info|error] 主题样式
+	 *  @value success 成功
+	 * 	@value warning 提示
+	 * 	@value info 消息
+	 * 	@value error 错误
+	 * @property {String} mode = [base|input] 模式、
+	 * 	@value base 基础对话框
+	 * 	@value input 可输入对话框
+	 * @showClose {Boolean} 是否显示关闭按钮
+	 * @property {String} content 对话框内容
+	 * @property {Boolean} beforeClose 是否拦截取消事件
+	 * @property {Number} maxlength 输入
+	 * @event {Function} confirm 点击确认按钮触发
+	 * @event {Function} close 点击取消按钮触发
+	 */
+
+	export default {
+		name: "uniPopupDialog",
+		mixins: [popup],
+		emits: ['confirm', 'close'],
+		props: {
+			inputType: {
+				type: String,
+				default: 'text'
+			},
+			showClose: {
+				type: Boolean,
+				default: true
+			},
+			value: {
+				type: [String, Number],
+				default: ''
+			},
+			placeholder: {
+				type: [String, Number],
+				default: ''
+			},
+			type: {
+				type: String,
+				default: 'error'
+			},
+			mode: {
+				type: String,
+				default: 'base'
+			},
+			title: {
+				type: String,
+				default: ''
+			},
+			content: {
+				type: String,
+				default: ''
+			},
+			beforeClose: {
+				type: Boolean,
+				default: false
+			},
+			cancelText: {
+				type: String,
+				default: ''
+			},
+			confirmText: {
+				type: String,
+				default: ''
+			},
+			maxlength: {
+				type: Number,
+				default: -1,
+			},
+			focus:{
+				type: Boolean,
+				default: true,
+			}
+		},
+		data() {
+			return {
+				dialogType: 'error',
+				val: ""
+			}
+		},
+		computed: {
+			okText() {
+				return this.confirmText || t("uni-popup.ok")
+			},
+			closeText() {
+				return this.cancelText || t("uni-popup.cancel")
+			},
+			placeholderText() {
+				return this.placeholder || t("uni-popup.placeholder")
+			},
+			titleText() {
+				return this.title || t("uni-popup.title")
+			}
+		},
+		watch: {
+			type(val) {
+				this.dialogType = val
+			},
+			mode(val) {
+				if (val === 'input') {
+					this.dialogType = 'info'
+				}
+			},
+			value(val) {
+				if (this.maxlength != -1 && this.mode === 'input') {
+					this.val = val.slice(0, this.maxlength);
+				} else {
+					this.val = val
+				}
+			}
+		},
+		created() {
+			// 对话框遮罩不可点击
+			this.popup.disableMask()
+			// this.popup.closeMask()
+			if (this.mode === 'input') {
+				this.dialogType = 'info'
+				this.val = this.value
+			} else {
+				this.dialogType = this.type
+			}
+		},
+		methods: {
+			/**
+			 * 点击确认按钮
+			 */
+			onOk() {
+				if (this.mode === 'input') {
+					this.$emit('confirm', this.val)
+				} else {
+					this.$emit('confirm')
+				}
+				this.$emit("input",this.val);
+				if (this.beforeClose) return
+				this.popup.close()
+			},
+			/**
+			 * 点击取消按钮
+			 */
+			closeDialog() {
+				this.$emit('close')
+				if (this.beforeClose) return
+				this.popup.close()
+			},
+			close() {
+				this.popup.close()
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.uni-popup-dialog {
+		width: 300px;
+		border-radius: 11px;
+		background-color: #fff;
+	}
+
+	.uni-dialog-title {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		padding-top: 25px;
+	}
+
+	.uni-dialog-title-text {
+		font-size: 16px;
+		font-weight: 500;
+	}
+
+	.uni-dialog-content {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		padding: 20px;
+	}
+
+	.uni-dialog-content-text {
+		font-size: 14px;
+		color: #6C6C6C;
+	}
+
+	.uni-dialog-button-group {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		border-top-color: #f5f5f5;
+		border-top-style: solid;
+		border-top-width: 1px;
+	}
+
+	.uni-dialog-button {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+
+		flex: 1;
+		flex-direction: row;
+		justify-content: center;
+		align-items: center;
+		height: 45px;
+	}
+
+	.uni-border-left {
+		border-left-color: #f0f0f0;
+		border-left-style: solid;
+		border-left-width: 1px;
+	}
+
+	.uni-dialog-button-text {
+		font-size: 16px;
+		color: #333;
+	}
+
+	.uni-button-color {
+		color: #007aff;
+	}
+
+	.uni-dialog-input {
+		flex: 1;
+		font-size: 14px;
+		border: 1px #eee solid;
+		height: 40px;
+		padding: 0 10px;
+		border-radius: 5px;
+		color: #555;
+	}
+
+	.uni-popup__success {
+		color: #4cd964;
+	}
+
+	.uni-popup__warn {
+		color: #f0ad4e;
+	}
+
+	.uni-popup__error {
+		color: #dd524d;
+	}
+
+	.uni-popup__info {
+		color: #909399;
+	}
+</style>
diff --git a/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue b/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue
new file mode 100644
index 0000000..91370a8
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup-message/uni-popup-message.vue
@@ -0,0 +1,143 @@
+<template>
+	<view class="uni-popup-message">
+		<view class="uni-popup-message__box fixforpc-width" :class="'uni-popup__'+type">
+			<slot>
+				<text class="uni-popup-message-text" :class="'uni-popup__'+type+'-text'">{{message}}</text>
+			</slot>
+		</view>
+	</view>
+</template>
+
+<script>
+	import popup from '../uni-popup/popup.js'
+	/**
+	 * PopUp 弹出层-消息提示
+	 * @description 弹出层-消息提示
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} type = [success|warning|info|error] 主题样式
+	 *  @value success 成功
+	 * 	@value warning 提示
+	 * 	@value info 消息
+	 * 	@value error 错误
+	 * @property {String} message 消息提示文字
+	 * @property {String} duration 显示时间，设置为 0 则不会自动关闭
+	 */
+
+	export default {
+		name: 'uniPopupMessage',
+		mixins:[popup],
+		props: {
+			/**
+			 * 主题 success/warning/info/error	  默认 success
+			 */
+			type: {
+				type: String,
+				default: 'success'
+			},
+			/**
+			 * 消息文字
+			 */
+			message: {
+				type: String,
+				default: ''
+			},
+			/**
+			 * 显示时间，设置为 0 则不会自动关闭
+			 */
+			duration: {
+				type: Number,
+				default: 3000
+			},
+			maskShow:{
+				type:Boolean,
+				default:false
+			}
+		},
+		data() {
+			return {}
+		},
+		created() {
+			this.popup.maskShow = this.maskShow
+			this.popup.messageChild = this
+		},
+		methods: {
+			timerClose(){
+				if(this.duration === 0) return
+				clearTimeout(this.timer) 
+				this.timer = setTimeout(()=>{
+					this.popup.close()
+				},this.duration)
+			}
+		}
+	}
+</script>
+<style lang="scss" >
+	.uni-popup-message {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+	}
+
+	.uni-popup-message__box {
+		background-color: #e1f3d8;
+		padding: 10px 15px;
+		border-color: #eee;
+		border-style: solid;
+		border-width: 1px;
+		flex: 1;
+	}
+
+	@media screen and (min-width: 500px) {
+		.fixforpc-width {
+			margin-top: 20px;
+			border-radius: 4px;
+			flex: none;
+			min-width: 380px;
+			/* #ifndef APP-NVUE */
+			max-width: 50%;
+			/* #endif */
+			/* #ifdef APP-NVUE */
+			max-width: 500px;
+			/* #endif */
+		}
+	}
+
+	.uni-popup-message-text {
+		font-size: 14px;
+		padding: 0;
+	}
+
+	.uni-popup__success {
+		background-color: #e1f3d8;
+	}
+
+	.uni-popup__success-text {
+		color: #67C23A;
+	}
+
+	.uni-popup__warn {
+		background-color: #faecd8;
+	}
+
+	.uni-popup__warn-text {
+		color: #E6A23C;
+	}
+
+	.uni-popup__error {
+		background-color: #fde2e2;
+	}
+
+	.uni-popup__error-text {
+		color: #F56C6C;
+	}
+
+	.uni-popup__info {
+		background-color: #F2F6FC;
+	}
+
+	.uni-popup__info-text {
+		color: #909399;
+	}
+</style>
diff --git a/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
new file mode 100644
index 0000000..f7e667c
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup-share/uni-popup-share.vue
@@ -0,0 +1,187 @@
+<template>
+	<view class="uni-popup-share">
+		<view class="uni-share-title"><text class="uni-share-title-text">{{shareTitleText}}</text></view>
+		<view class="uni-share-content">
+			<view class="uni-share-content-box">
+				<view class="uni-share-content-item" v-for="(item,index) in bottomData" :key="index" @click.stop="select(item,index)">
+					<image class="uni-share-image" :src="item.icon" mode="aspectFill"></image>
+					<text class="uni-share-text">{{item.text}}</text>
+				</view>
+
+			</view>
+		</view>
+		<view class="uni-share-button-box">
+			<button class="uni-share-button" @click="close">{{cancelText}}</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import popup from '../uni-popup/popup.js'
+	import {
+	initVueI18n
+	} from '@dcloudio/uni-i18n'
+	import messages from '../uni-popup/i18n/index.js'
+	const {	t	} = initVueI18n(messages)
+	export default {
+		name: 'UniPopupShare',
+		mixins:[popup],
+		emits:['select'],
+		props: {
+			title: {
+				type: String,
+				default: ''
+			},
+			beforeClose: {
+				type: Boolean,
+				default: false
+			}
+		},
+		data() {
+			return {
+				bottomData: [{
+						text: '微信',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/c2b17470-50be-11eb-b680-7980c8a877b8.png',
+						name: 'wx'
+					},
+					{
+						text: '支付宝',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/d684ae40-50be-11eb-8ff1-d5dcf8779628.png',
+						name: 'ali'
+					},
+					{
+						text: 'QQ',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/e7a79520-50be-11eb-b997-9918a5dda011.png',
+						name: 'qq'
+					},
+					{
+						text: '新浪',
+						icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/0dacdbe0-50bf-11eb-8ff1-d5dcf8779628.png',
+						name: 'sina'
+					},
+					// {
+					// 	text: '百度',
+					// 	icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/1ec6e920-50bf-11eb-8a36-ebb87efcf8c0.png',
+					// 	name: 'copy'
+					// },
+					// {
+					// 	text: '其他',
+					// 	icon: 'https://vkceyugu.cdn.bspapp.com/VKCEYUGU-dc-site/2e0fdfe0-50bf-11eb-b997-9918a5dda011.png',
+					// 	name: 'more'
+					// }
+				]
+			}
+		},
+		created() {},
+		computed: {
+			cancelText() {
+				return t("uni-popup.cancel")
+			},
+		shareTitleText() {
+				return this.title || t("uni-popup.shareTitle")
+			}
+		},
+		methods: {
+			/**
+			 * 选择内容
+			 */
+			select(item, index) {
+				this.$emit('select', {
+					item,
+					index
+				})
+				this.close()
+
+			},
+			/**
+			 * 关闭窗口
+			 */
+			close() {
+				if(this.beforeClose) return
+				this.popup.close()
+			}
+		}
+	}
+</script>
+<style lang="scss" >
+	.uni-popup-share {
+		background-color: #fff;
+		border-top-left-radius: 11px;
+		border-top-right-radius: 11px;
+	}
+	.uni-share-title {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		height: 40px;
+	}
+	.uni-share-title-text {
+		font-size: 14px;
+		color: #666;
+	}
+	.uni-share-content {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		justify-content: center;
+		padding-top: 10px;
+	}
+
+	.uni-share-content-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		flex-wrap: wrap;
+		width: 360px;
+	}
+
+	.uni-share-content-item {
+		width: 90px;
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: center;
+		padding: 10px 0;
+		align-items: center;
+	}
+
+	.uni-share-content-item:active {
+		background-color: #f5f5f5;
+	}
+
+	.uni-share-image {
+		width: 30px;
+		height: 30px;
+	}
+
+	.uni-share-text {
+		margin-top: 10px;
+		font-size: 14px;
+		color: #3B4144;
+	}
+
+	.uni-share-button-box {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		padding: 10px 15px;
+	}
+
+	.uni-share-button {
+		flex: 1;
+		border-radius: 50px;
+		color: #666;
+		font-size: 16px;
+	}
+
+	.uni-share-button::after {
+		border-radius: 50px;
+	}
+</style>
diff --git a/uni_modules/uni-popup/components/uni-popup/i18n/en.json b/uni_modules/uni-popup/components/uni-popup/i18n/en.json
new file mode 100644
index 0000000..7f1bd06
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/en.json
@@ -0,0 +1,7 @@
+{
+	"uni-popup.cancel": "cancel",
+	"uni-popup.ok": "ok",
+	"uni-popup.placeholder": "pleace enter",
+	"uni-popup.title": "Hint",
+	"uni-popup.shareTitle": "Share to"
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/i18n/index.js b/uni_modules/uni-popup/components/uni-popup/i18n/index.js
new file mode 100644
index 0000000..de7509c
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/index.js
@@ -0,0 +1,8 @@
+import en from './en.json'
+import zhHans from './zh-Hans.json'
+import zhHant from './zh-Hant.json'
+export default {
+	en,
+	'zh-Hans': zhHans,
+	'zh-Hant': zhHant
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json
new file mode 100644
index 0000000..5e3003c
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hans.json
@@ -0,0 +1,7 @@
+{
+	"uni-popup.cancel": "取消",
+	"uni-popup.ok": "确定",
+	"uni-popup.placeholder": "请输入",
+		"uni-popup.title": "提示",
+		"uni-popup.shareTitle": "分享到"
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json
new file mode 100644
index 0000000..13e39eb
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/i18n/zh-Hant.json
@@ -0,0 +1,7 @@
+{
+	"uni-popup.cancel": "取消",
+	"uni-popup.ok": "確定",
+	"uni-popup.placeholder": "請輸入",
+	"uni-popup.title": "提示",
+	"uni-popup.shareTitle": "分享到"
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/keypress.js b/uni_modules/uni-popup/components/uni-popup/keypress.js
new file mode 100644
index 0000000..62dda46
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/keypress.js
@@ -0,0 +1,45 @@
+// #ifdef H5
+export default {
+  name: 'Keypress',
+  props: {
+    disable: {
+      type: Boolean,
+      default: false
+    }
+  },
+  mounted () {
+    const keyNames = {
+      esc: ['Esc', 'Escape'],
+      tab: 'Tab',
+      enter: 'Enter',
+      space: [' ', 'Spacebar'],
+      up: ['Up', 'ArrowUp'],
+      left: ['Left', 'ArrowLeft'],
+      right: ['Right', 'ArrowRight'],
+      down: ['Down', 'ArrowDown'],
+      delete: ['Backspace', 'Delete', 'Del']
+    }
+    const listener = ($event) => {
+      if (this.disable) {
+        return
+      }
+      const keyName = Object.keys(keyNames).find(key => {
+        const keyName = $event.key
+        const value = keyNames[key]
+        return value === keyName || (Array.isArray(value) && value.includes(keyName))
+      })
+      if (keyName) {
+        // 避免和其他按键事件冲突
+        setTimeout(() => {
+          this.$emit(keyName, {})
+        }, 0)
+      }
+    }
+    document.addEventListener('keyup', listener)
+    // this.$once('hook:beforeDestroy', () => {
+    //   document.removeEventListener('keyup', listener)
+    // })
+  },
+	render: () => {}
+}
+// #endif
diff --git a/uni_modules/uni-popup/components/uni-popup/popup.js b/uni_modules/uni-popup/components/uni-popup/popup.js
new file mode 100644
index 0000000..c4e5781
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/popup.js
@@ -0,0 +1,26 @@
+
+export default {
+	data() {
+		return {
+			
+		}
+	},
+	created(){
+		this.popup = this.getParent()
+	},
+	methods:{
+		/**
+		 * 获取父元素实例
+		 */
+		getParent(name = 'uniPopup') {
+			let parent = this.$parent;
+			let parentName = parent.$options.name;
+			while (parentName !== name) {
+				parent = parent.$parent;
+				if (!parent) return false
+				parentName = parent.$options.name;
+			}
+			return parent;
+		},
+	}
+}
diff --git a/uni_modules/uni-popup/components/uni-popup/uni-popup.uvue b/uni_modules/uni-popup/components/uni-popup/uni-popup.uvue
new file mode 100644
index 0000000..5eb8d5b
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/uni-popup.uvue
@@ -0,0 +1,90 @@
+<template>
+  <view class="popup-root" v-if="isOpen" v-show="isShow" @click="clickMask">
+    <view @click.stop>
+      <slot></slot>
+    </view>
+  </view>
+</template>
+
+<script>
+  type CloseCallBack = ()=> void;
+  let closeCallBack:CloseCallBack = () :void => {};
+  export default {
+    emits:["close","clickMask"],
+    data() {
+      return {
+        isShow:false,
+        isOpen:false
+      }
+    },
+    props: {
+      maskClick: {
+        type: Boolean,
+        default: true
+      },
+    },
+    watch: {
+      // 设置show = true 时，如果没有 open 需要设置为 open
+      isShow:{
+        handler(isShow) {
+          // console.log("isShow",isShow)
+          if(isShow && this.isOpen == false){
+            this.isOpen = true
+          }
+        },
+        immediate:true
+      },
+      // 设置isOpen = true 时，如果没有 isShow 需要设置为 isShow
+      isOpen:{
+        handler(isOpen) {
+          // console.log("isOpen",isOpen)
+          if(isOpen && this.isShow == false){
+            this.isShow = true
+          }
+        },
+        immediate:true
+      }
+    },
+    methods:{
+      open(){
+        // ...funs : CloseCallBack[]
+        // if(funs.length > 0){
+        //   closeCallBack = funs[0]
+        // }
+        this.isOpen = true;
+      },
+      clickMask(){
+        if(this.maskClick == true){
+          this.$emit('clickMask')
+          this.close()
+        }
+      },
+      close(): void{
+        this.isOpen = false;
+        this.$emit('close')
+        closeCallBack()
+      },
+      hiden(){
+        this.isShow = false
+      },
+      show(){
+        this.isShow = true
+      }
+    }
+  }
+</script>
+
+<style>
+.popup-root {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 750rpx;
+  height: 100%;
+  flex: 1;
+  background-color: rgba(0, 0, 0, 0.3);
+  justify-content: center;
+  align-items: center;
+  z-index: 99;
+}
+</style>
\ No newline at end of file
diff --git a/uni_modules/uni-popup/components/uni-popup/uni-popup.vue b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
new file mode 100644
index 0000000..5d9e9d2
--- /dev/null
+++ b/uni_modules/uni-popup/components/uni-popup/uni-popup.vue
@@ -0,0 +1,479 @@
+<template>
+	<view v-if="showPopup" class="uni-popup" :class="[popupstyle, isDesktop ? 'fixforpc-z-index' : '']">
+		<view @touchstart="touchstart">
+			<uni-transition key="1" v-if="maskShow" name="mask" mode-class="fade" :styles="maskClass"
+				:duration="duration" :show="showTrans" @click="onTap" />
+			<uni-transition key="2" :mode-class="ani" name="content" :styles="transClass" :duration="duration"
+				:show="showTrans" @click="onTap">
+				<view class="uni-popup__wrapper" :style="{ backgroundColor: bg }" :class="[popupstyle]" @click="clear">
+					<slot />
+				</view>
+			</uni-transition>
+		</view>
+		<!-- #ifdef H5 -->
+		<keypress v-if="maskShow" @esc="onTap" />
+		<!-- #endif -->
+	</view>
+</template>
+
+<script>
+	// #ifdef H5
+	import keypress from './keypress.js'
+	// #endif
+
+	/**
+	 * PopUp 弹出层
+	 * @description 弹出层组件，为了解决遮罩弹层的问题
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=329
+	 * @property {String} type = [top|center|bottom|left|right|message|dialog|share] 弹出方式
+	 * 	@value top 顶部弹出
+	 * 	@value center 中间弹出
+	 * 	@value bottom 底部弹出
+	 * 	@value left		左侧弹出
+	 * 	@value right  右侧弹出
+	 * 	@value message 消息提示
+	 * 	@value dialog 对话框
+	 * 	@value share 底部分享示例
+	 * @property {Boolean} animation = [true|false] 是否开启动画
+	 * @property {Boolean} maskClick = [true|false] 蒙版点击是否关闭弹窗(废弃)
+	 * @property {Boolean} isMaskClick = [true|false] 蒙版点击是否关闭弹窗
+	 * @property {String}  backgroundColor 主窗口背景色
+	 * @property {String}  maskBackgroundColor 蒙版颜色
+	 * @property {Boolean} safeArea		   是否适配底部安全区
+	 * @event {Function} change 打开关闭弹窗触发，e={show: false}
+	 * @event {Function} maskClick 点击遮罩触发
+	 */
+
+	export default {
+		name: 'uniPopup',
+		components: {
+			// #ifdef H5
+			keypress
+			// #endif
+		},
+		emits: ['change', 'maskClick'],
+		props: {
+			// 开启动画
+			animation: {
+				type: Boolean,
+				default: true
+			},
+			// 弹出层类型，可选值，top: 顶部弹出层；bottom：底部弹出层；center：全屏弹出层
+			// message: 消息提示 ; dialog : 对话框
+			type: {
+				type: String,
+				default: 'center'
+			},
+			// maskClick
+			isMaskClick: {
+				type: Boolean,
+				default: null
+			},
+			// TODO 2 个版本后废弃属性 ，使用 isMaskClick
+			maskClick: {
+				type: Boolean,
+				default: null
+			},
+			backgroundColor: {
+				type: String,
+				default: 'none'
+			},
+			safeArea: {
+				type: Boolean,
+				default: true
+			},
+			maskBackgroundColor: {
+				type: String,
+				default: 'rgba(0, 0, 0, 0.4)'
+			},
+		},
+
+		watch: {
+			/**
+			 * 监听type类型
+			 */
+			type: {
+				handler: function(type) {
+					if (!this.config[type]) return
+					this[this.config[type]](true)
+				},
+				immediate: true
+			},
+			isDesktop: {
+				handler: function(newVal) {
+					if (!this.config[newVal]) return
+					this[this.config[this.type]](true)
+				},
+				immediate: true
+			},
+			/**
+			 * 监听遮罩是否可点击
+			 * @param {Object} val
+			 */
+			maskClick: {
+				handler: function(val) {
+					this.mkclick = val
+				},
+				immediate: true
+			},
+			isMaskClick: {
+				handler: function(val) {
+					this.mkclick = val
+				},
+				immediate: true
+			},
+			// H5 下禁止底部滚动
+			showPopup(show) {
+				// #ifdef H5
+				// fix by mehaotian 处理 h5 滚动穿透的问题
+				document.getElementsByTagName('body')[0].style.overflow = show ? 'hidden' : 'visible'
+				// #endif
+			}
+		},
+		data() {
+			return {
+				duration: 300,
+				ani: [],
+				showPopup: false,
+				showTrans: false,
+				popupWidth: 0,
+				popupHeight: 0,
+				config: {
+					top: 'top',
+					bottom: 'bottom',
+					center: 'center',
+					left: 'left',
+					right: 'right',
+					message: 'top',
+					dialog: 'center',
+					share: 'bottom'
+				},
+				maskClass: {
+					position: 'fixed',
+					bottom: 0,
+					top: 0,
+					left: 0,
+					right: 0,
+					backgroundColor: 'rgba(0, 0, 0, 0.4)'
+				},
+				transClass: {
+					position: 'fixed',
+					left: 0,
+					right: 0
+				},
+				maskShow: true,
+				mkclick: true,
+				popupstyle: 'top'
+			}
+		},
+		computed: {
+			isDesktop() {
+				return this.popupWidth >= 500 && this.popupHeight >= 500
+			},
+			bg() {
+				if (this.backgroundColor === '' || this.backgroundColor === 'none') {
+					return 'transparent'
+				}
+				return this.backgroundColor
+			}
+		},
+		mounted() {
+			const fixSize = () => {
+				const {
+					windowWidth,
+					windowHeight,
+					windowTop,
+					safeArea,
+					screenHeight,
+					safeAreaInsets
+				} = uni.getSystemInfoSync()
+				this.popupWidth = windowWidth
+				this.popupHeight = windowHeight + (windowTop || 0)
+				// TODO fix by mehaotian 是否适配底部安全区 ,目前微信ios 、和 app ios 计算有差异，需要框架修复
+				if (safeArea && this.safeArea) {
+					// #ifdef MP-WEIXIN
+					this.safeAreaInsets = screenHeight - safeArea.bottom
+					// #endif
+					// #ifndef MP-WEIXIN
+					this.safeAreaInsets = safeAreaInsets.bottom
+					// #endif
+				} else {
+					this.safeAreaInsets = 0
+				}
+			}
+			fixSize()
+			// #ifdef H5
+			// window.addEventListener('resize', fixSize)
+			// this.$once('hook:beforeDestroy', () => {
+			// 	window.removeEventListener('resize', fixSize)
+			// })
+			// #endif
+		},
+		// #ifndef VUE3
+		// TODO vue2
+		destroyed() {
+			this.setH5Visible()
+		},
+		// #endif
+		// #ifdef VUE3
+		// TODO vue3
+		unmounted() {
+			this.setH5Visible()
+		},
+		// #endif
+		created() {
+			// this.mkclick =  this.isMaskClick || this.maskClick
+			if (this.isMaskClick === null && this.maskClick === null) {
+				this.mkclick = true
+			} else {
+				this.mkclick = this.isMaskClick !== null ? this.isMaskClick : this.maskClick
+			}
+			if (this.animation) {
+				this.duration = 300
+			} else {
+				this.duration = 0
+			}
+			// TODO 处理 message 组件生命周期异常的问题
+			this.messageChild = null
+			// TODO 解决头条冒泡的问题
+			this.clearPropagation = false
+			this.maskClass.backgroundColor = this.maskBackgroundColor
+		},
+		methods: {
+			setH5Visible() {
+				// #ifdef H5
+				// fix by mehaotian 处理 h5 滚动穿透的问题
+				document.getElementsByTagName('body')[0].style.overflow = 'visible'
+				// #endif
+			},
+			/**
+			 * 公用方法，不显示遮罩层
+			 */
+			closeMask() {
+				this.maskShow = false
+			},
+			/**
+			 * 公用方法，遮罩层禁止点击
+			 */
+			disableMask() {
+				this.mkclick = false
+			},
+			// TODO nvue 取消冒泡
+			clear(e) {
+				// #ifndef APP-NVUE
+				e.stopPropagation()
+				// #endif
+				this.clearPropagation = true
+			},
+
+			open(direction) {
+				// fix by mehaotian 处理快速打开关闭的情况
+				if (this.showPopup) {
+					return
+				}
+				let innerType = ['top', 'center', 'bottom', 'left', 'right', 'message', 'dialog', 'share']
+				if (!(direction && innerType.indexOf(direction) !== -1)) {
+					direction = this.type
+				}
+				if (!this.config[direction]) {
+					console.error('缺少类型：', direction)
+					return
+				}
+				this[this.config[direction]]()
+				this.$emit('change', {
+					show: true,
+					type: direction
+				})
+			},
+			close(type) {
+				this.showTrans = false
+				this.$emit('change', {
+					show: false,
+					type: this.type
+				})
+				clearTimeout(this.timer)
+				// // 自定义关闭事件
+				// this.customOpen && this.customClose()
+				this.timer = setTimeout(() => {
+					this.showPopup = false
+				}, 300)
+			},
+			// TODO 处理冒泡事件，头条的冒泡事件有问题 ，先这样兼容
+			touchstart() {
+				this.clearPropagation = false
+			},
+
+			onTap() {
+				if (this.clearPropagation) {
+					// fix by mehaotian 兼容 nvue
+					this.clearPropagation = false
+					return
+				}
+				this.$emit('maskClick')
+				if (!this.mkclick) return
+				this.close()
+			},
+			/**
+			 * 顶部弹出样式处理
+			 */
+			top(type) {
+				this.popupstyle = this.isDesktop ? 'fixforpc-top' : 'top'
+				this.ani = ['slide-top']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					right: 0,
+					backgroundColor: this.bg
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+				this.$nextTick(() => {
+					if (this.messageChild && this.type === 'message') {
+						this.messageChild.timerClose()
+					}
+				})
+			},
+			/**
+			 * 底部弹出样式处理
+			 */
+			bottom(type) {
+				this.popupstyle = 'bottom'
+				this.ani = ['slide-bottom']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					right: 0,
+					bottom: 0,
+					paddingBottom: this.safeAreaInsets + 'px',
+					backgroundColor: this.bg
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			},
+			/**
+			 * 中间弹出样式处理
+			 */
+			center(type) {
+				this.popupstyle = 'center'
+				//微信小程序下，组合动画会出现文字向上闪动问题，再此做特殊处理
+				// #ifdef MP-WEIXIN
+					this.ani = ['fade']
+				// #endif
+				// #ifndef MP-WEIXIN
+					this.ani = ['zoom-out', 'fade']
+				// #endif
+				this.transClass = {
+					position: 'fixed',
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column',
+					/* #endif */
+					bottom: 0,
+					left: 0,
+					right: 0,
+					top: 0,
+					justifyContent: 'center',
+					alignItems: 'center'
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			},
+			left(type) {
+				this.popupstyle = 'left'
+				this.ani = ['slide-left']
+				this.transClass = {
+					position: 'fixed',
+					left: 0,
+					bottom: 0,
+					top: 0,
+					backgroundColor: this.bg,
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column'
+					/* #endif */
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			},
+			right(type) {
+				this.popupstyle = 'right'
+				this.ani = ['slide-right']
+				this.transClass = {
+					position: 'fixed',
+					bottom: 0,
+					right: 0,
+					top: 0,
+					backgroundColor: this.bg,
+					/* #ifndef APP-NVUE */
+					display: 'flex',
+					flexDirection: 'column'
+					/* #endif */
+				}
+				// TODO 兼容 type 属性 ，后续会废弃
+				if (type) return
+				this.showPopup = true
+				this.showTrans = true
+			}
+		}
+	}
+</script>
+<style lang="scss">
+	.uni-popup {
+		position: fixed;
+		/* #ifndef APP-NVUE */
+		z-index: 99;
+
+		/* #endif */
+		&.top,
+		&.left,
+		&.right {
+			/* #ifdef H5 */
+			top: var(--window-top);
+			/* #endif */
+			/* #ifndef H5 */
+			top: 0;
+			/* #endif */
+		}
+
+		.uni-popup__wrapper {
+			/* #ifndef APP-NVUE */
+			display: block;
+			/* #endif */
+			position: relative;
+
+			/* iphonex 等安全区设置，底部安全区适配 */
+			/* #ifndef APP-NVUE */
+			// padding-bottom: constant(safe-area-inset-bottom);
+			// padding-bottom: env(safe-area-inset-bottom);
+			/* #endif */
+			&.left,
+			&.right {
+				/* #ifdef H5 */
+				padding-top: var(--window-top);
+				/* #endif */
+				/* #ifndef H5 */
+				padding-top: 0;
+				/* #endif */
+				flex: 1;
+			}
+		}
+	}
+
+	.fixforpc-z-index {
+		/* #ifndef APP-NVUE */
+		z-index: 999;
+		/* #endif */
+	}
+
+	.fixforpc-top {
+		top: 0;
+	}
+</style>
diff --git a/uni_modules/uni-popup/package.json b/uni_modules/uni-popup/package.json
new file mode 100644
index 0000000..6427510
--- /dev/null
+++ b/uni_modules/uni-popup/package.json
@@ -0,0 +1,87 @@
+{
+	"id": "uni-popup",
+	"displayName": "uni-popup 弹出层",
+	"version": "1.8.8",
+	"description": " Popup 组件，提供常用的弹层",
+	"keywords": [
+        "uni-ui",
+        "弹出层",
+        "弹窗",
+        "popup",
+        "弹框"
+    ],
+	"repository": "https://github.com/dcloudio/uni-ui",
+	"engines": {
+		"HBuilderX": ""
+	},
+	"directories": {
+		"example": "../../temps/example_temps"
+	},
+    "dcloudext": {
+        "sale": {
+			"regular": {
+				"price": "0.00"
+			},
+			"sourcecode": {
+				"price": "0.00"
+			}
+		},
+		"contact": {
+			"qq": ""
+		},
+		"declaration": {
+			"ads": "无",
+			"data": "无",
+			"permissions": "无"
+		},
+        "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+        "type": "component-vue"
+	},
+	"uni_modules": {
+		"dependencies": [
+			"uni-scss",
+			"uni-transition"
+		],
+		"encrypt": [],
+		"platforms": {
+			"cloud": {
+				"tcb": "y",
+				"aliyun": "y"
+			},
+			"client": {
+				"App": {
+					"app-vue": "y",
+					"app-nvue": "y"
+				},
+				"H5-mobile": {
+					"Safari": "y",
+					"Android Browser": "y",
+					"微信浏览器(Android)": "y",
+					"QQ浏览器(Android)": "y"
+				},
+				"H5-pc": {
+					"Chrome": "y",
+					"IE": "y",
+					"Edge": "y",
+					"Firefox": "y",
+					"Safari": "y"
+				},
+				"小程序": {
+					"微信": "y",
+					"阿里": "y",
+					"百度": "y",
+					"字节跳动": "y",
+					"QQ": "y"
+				},
+				"快应用": {
+					"华为": "u",
+					"联盟": "u"
+                },
+                "Vue": {
+                    "vue2": "y",
+                    "vue3": "y"
+                }
+			}
+		}
+	}
+}
diff --git a/uni_modules/uni-popup/readme.md b/uni_modules/uni-popup/readme.md
new file mode 100644
index 0000000..fdad4b3
--- /dev/null
+++ b/uni_modules/uni-popup/readme.md
@@ -0,0 +1,17 @@
+
+
+## Popup 弹出层
+> **组件名：uni-popup**
+> 代码块： `uPopup`
+> 关联组件：`uni-transition`
+
+
+弹出层组件，在应用中弹出一个消息提示窗口、提示框等
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-popup)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
+
+
+
diff --git a/uni_modules/uni-scss/changelog.md b/uni_modules/uni-scss/changelog.md
new file mode 100644
index 0000000..b863bb0
--- /dev/null
+++ b/uni_modules/uni-scss/changelog.md
@@ -0,0 +1,8 @@
+## 1.0.3（2022-01-21）
+- 优化 组件示例
+## 1.0.2（2021-11-22）
+- 修复 / 符号在 vue 不同版本兼容问题引起的报错问题
+## 1.0.1（2021-11-22）
+- 修复 vue3中scss语法兼容问题
+## 1.0.0（2021-11-18）
+- init
diff --git a/uni_modules/uni-scss/index.scss b/uni_modules/uni-scss/index.scss
new file mode 100644
index 0000000..1744a5f
--- /dev/null
+++ b/uni_modules/uni-scss/index.scss
@@ -0,0 +1 @@
+@import './styles/index.scss';
diff --git a/uni_modules/uni-scss/package.json b/uni_modules/uni-scss/package.json
new file mode 100644
index 0000000..7cc0ccb
--- /dev/null
+++ b/uni_modules/uni-scss/package.json
@@ -0,0 +1,82 @@
+{
+  "id": "uni-scss",
+  "displayName": "uni-scss 辅助样式",
+  "version": "1.0.3",
+  "description": "uni-sass是uni-ui提供的一套全局样式 ，通过一些简单的类名和sass变量，实现简单的页面布局操作，比如颜色、边距、圆角等。",
+  "keywords": [
+    "uni-scss",
+    "uni-ui",
+    "辅助样式"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "category": [
+        "JS SDK",
+        "通用 SDK"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "n",
+          "联盟": "n"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
diff --git a/uni_modules/uni-scss/readme.md b/uni_modules/uni-scss/readme.md
new file mode 100644
index 0000000..b7d1c25
--- /dev/null
+++ b/uni_modules/uni-scss/readme.md
@@ -0,0 +1,4 @@
+`uni-sass` 是 `uni-ui`提供的一套全局样式 ，通过一些简单的类名和`sass`变量，实现简单的页面布局操作，比如颜色、边距、圆角等。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-sass)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/uni-scss/styles/index.scss b/uni_modules/uni-scss/styles/index.scss
new file mode 100644
index 0000000..ffac4fe
--- /dev/null
+++ b/uni_modules/uni-scss/styles/index.scss
@@ -0,0 +1,7 @@
+@import './setting/_variables.scss';
+@import './setting/_border.scss';
+@import './setting/_color.scss';
+@import './setting/_space.scss';
+@import './setting/_radius.scss';
+@import './setting/_text.scss';
+@import './setting/_styles.scss';
diff --git a/uni_modules/uni-scss/styles/setting/_border.scss b/uni_modules/uni-scss/styles/setting/_border.scss
new file mode 100644
index 0000000..12a11c3
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_border.scss
@@ -0,0 +1,3 @@
+.uni-border {
+	border: 1px $uni-border-1 solid;
+}
\ No newline at end of file
diff --git a/uni_modules/uni-scss/styles/setting/_color.scss b/uni_modules/uni-scss/styles/setting/_color.scss
new file mode 100644
index 0000000..1ededd9
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_color.scss
@@ -0,0 +1,66 @@
+
+// TODO 暂时不需要 class ，需要用户使用变量实现 ，如果使用类名其实并不推荐
+// @mixin get-styles($k,$c) {
+// 	@if $k == size or $k == weight{
+// 		font-#{$k}:#{$c}
+// 	}@else{
+// 		#{$k}:#{$c}
+// 	}
+// }
+$uni-ui-color:(
+	// 主色
+	primary: $uni-primary,
+	primary-disable: $uni-primary-disable,
+	primary-light: $uni-primary-light,
+	// 辅助色
+	success: $uni-success,
+	success-disable: $uni-success-disable,
+	success-light: $uni-success-light,
+	warning: $uni-warning,
+	warning-disable: $uni-warning-disable,
+	warning-light: $uni-warning-light,
+	error: $uni-error,
+	error-disable: $uni-error-disable,
+	error-light: $uni-error-light,
+	info: $uni-info,
+	info-disable: $uni-info-disable,
+	info-light: $uni-info-light,
+	// 中性色
+	main-color: $uni-main-color,
+	base-color: $uni-base-color,
+	secondary-color: $uni-secondary-color,
+	extra-color: $uni-extra-color,
+	// 背景色
+	bg-color: $uni-bg-color,
+	// 边框颜色
+	border-1: $uni-border-1,
+	border-2: $uni-border-2,
+	border-3: $uni-border-3,
+	border-4: $uni-border-4,
+	// 黑色
+	black:$uni-black,
+	// 白色
+	white:$uni-white,
+	// 透明
+	transparent:$uni-transparent
+) !default;
+@each $key, $child in $uni-ui-color {
+	.uni-#{"" + $key} {
+		color: $child;
+	}
+	.uni-#{"" + $key}-bg {
+		background-color: $child;
+	}
+}
+.uni-shadow-sm {
+	box-shadow: $uni-shadow-sm;
+}
+.uni-shadow-base {
+	box-shadow: $uni-shadow-base;
+}
+.uni-shadow-lg {
+	box-shadow: $uni-shadow-lg;
+}
+.uni-mask {
+	background-color:$uni-mask;
+}
diff --git a/uni_modules/uni-scss/styles/setting/_radius.scss b/uni_modules/uni-scss/styles/setting/_radius.scss
new file mode 100644
index 0000000..9a0428b
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_radius.scss
@@ -0,0 +1,55 @@
+@mixin radius($r,$d:null ,$important: false){
+  $radius-value:map-get($uni-radius, $r) if($important, !important, null);
+  // Key exists within the $uni-radius variable
+  @if (map-has-key($uni-radius, $r) and  $d){
+		@if $d == t {
+				border-top-left-radius:$radius-value;
+				border-top-right-radius:$radius-value;
+		}@else if $d == r {
+				border-top-right-radius:$radius-value;
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == b {
+				border-bottom-left-radius:$radius-value;
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == l {
+				border-top-left-radius:$radius-value;
+				border-bottom-left-radius:$radius-value;
+		}@else if $d == tl {
+				border-top-left-radius:$radius-value;
+		}@else if $d == tr {
+				border-top-right-radius:$radius-value;
+		}@else if $d == br {
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == bl {
+				border-bottom-left-radius:$radius-value;
+		}
+  }@else{
+		border-radius:$radius-value;
+  }
+}
+
+@each $key, $child in $uni-radius {
+	@if($key){
+		.uni-radius-#{"" + $key} {
+				@include radius($key)
+		}
+	}@else{
+		.uni-radius {
+				@include radius($key)
+		}
+	}
+}
+
+@each $direction in t, r, b, l,tl, tr, br, bl {
+	@each $key, $child in $uni-radius {
+		@if($key){
+			.uni-radius-#{"" + $direction}-#{"" + $key} {
+				@include radius($key,$direction,false)
+			}
+		}@else{
+			.uni-radius-#{$direction} {
+				@include radius($key,$direction,false)
+			}
+		}
+	}
+}
diff --git a/uni_modules/uni-scss/styles/setting/_space.scss b/uni_modules/uni-scss/styles/setting/_space.scss
new file mode 100644
index 0000000..3c89528
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_space.scss
@@ -0,0 +1,56 @@
+
+@mixin fn($space,$direction,$size,$n) {
+	@if $n {
+		#{$space}-#{$direction}: #{$size*$uni-space-root}px
+	} @else {
+		 #{$space}-#{$direction}: #{-$size*$uni-space-root}px
+	}
+}
+@mixin get-styles($direction,$i,$space,$n){
+	@if $direction == t {
+		@include fn($space, top,$i,$n);
+	} 
+	@if $direction == r {
+		@include fn($space, right,$i,$n);
+	} 
+	@if $direction == b {
+		@include fn($space, bottom,$i,$n);
+	} 
+	@if $direction == l {
+	 @include fn($space, left,$i,$n);
+	} 
+	@if $direction == x {
+		@include fn($space, left,$i,$n);
+		@include fn($space, right,$i,$n);
+	} 
+	@if $direction == y {
+		@include fn($space, top,$i,$n);
+		@include fn($space, bottom,$i,$n);
+	} 
+	@if $direction == a {
+		@if $n {
+			#{$space}:#{$i*$uni-space-root}px;
+		} @else {
+			#{$space}:#{-$i*$uni-space-root}px;
+		}
+	} 
+}
+
+@each $orientation in m,p {
+	$space: margin;
+	@if $orientation == m {
+		$space: margin;
+	} @else {
+		$space: padding;
+	}
+	@for $i from 0 through 16 {
+		@each $direction in t, r, b, l, x, y, a {
+			.uni-#{$orientation}#{$direction}-#{$i} { 
+				@include  get-styles($direction,$i,$space,true);
+			} 
+			.uni-#{$orientation}#{$direction}-n#{$i} { 
+				@include  get-styles($direction,$i,$space,false);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/uni_modules/uni-scss/styles/setting/_styles.scss b/uni_modules/uni-scss/styles/setting/_styles.scss
new file mode 100644
index 0000000..689afec
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_styles.scss
@@ -0,0 +1,167 @@
+/* #ifndef APP-NVUE */
+
+$-color-white:#fff;
+$-color-black:#000;
+@mixin base-style($color) {
+	color: #fff;
+	background-color: $color;
+	border-color: mix($-color-black, $color, 8%);
+	&:not([hover-class]):active {
+		background: mix($-color-black, $color, 10%);
+		border-color: mix($-color-black, $color, 20%);
+		color: $-color-white;
+		outline: none;
+	}
+}
+@mixin is-color($color) {
+	@include base-style($color);
+	&[loading] {
+		@include base-style($color);
+		&::before {
+			margin-right:5px;
+		}
+	}
+	&[disabled] {
+	  &,
+		&[loading],
+	  &:not([hover-class]):active {
+	    color: $-color-white;
+			border-color: mix(darken($color,10%), $-color-white);
+	    background-color: mix($color, $-color-white);
+	  }
+	}
+
+}
+@mixin base-plain-style($color) {
+	color:$color;
+	background-color: mix($-color-white, $color, 90%);
+	border-color: mix($-color-white, $color, 70%);
+	&:not([hover-class]):active {
+	  background: mix($-color-white, $color, 80%);
+	  color: $color;
+	  outline: none;
+		border-color: mix($-color-white, $color, 50%);
+	}
+}
+@mixin is-plain($color){
+	&[plain] {
+		@include base-plain-style($color);
+		&[loading] {
+			@include base-plain-style($color);
+			&::before {
+				margin-right:5px;
+			}
+		}
+		&[disabled] {
+		  &,
+		  &:active {
+		    color: mix($-color-white, $color, 40%);
+		    background-color: mix($-color-white, $color, 90%);
+				border-color: mix($-color-white, $color, 80%);
+		  }
+		}
+	}
+}
+
+
+.uni-btn {
+	margin: 5px;
+	color: #393939;
+	border:1px solid #ccc;
+	font-size: 16px;
+	font-weight: 200;
+	background-color: #F9F9F9;
+	// TODO 暂时处理边框隐藏一边的问题
+	overflow: visible;
+	&::after{
+		border: none;
+	}
+
+	&:not([type]),&[type=default] {
+		color: #999;
+		&[loading] {
+			background: none;
+			&::before {
+				margin-right:5px;
+			}
+		}
+
+
+
+		&[disabled]{
+			color: mix($-color-white, #999, 60%);
+		  &,
+			&[loading],
+		  &:active {
+				color: mix($-color-white, #999, 60%);
+		    background-color: mix($-color-white,$-color-black , 98%);
+				border-color: mix($-color-white,  #999, 85%);
+		  }
+		}
+
+		&[plain] {
+			color: #999;
+			background: none;
+			border-color: $uni-border-1;
+			&:not([hover-class]):active {
+				background: none;
+			  color: mix($-color-white, $-color-black, 80%);
+				border-color: mix($-color-white, $-color-black, 90%);
+			  outline: none;
+			}
+			&[disabled]{
+			  &,
+				&[loading],
+			  &:active {
+			    background: none;
+					color: mix($-color-white, #999, 60%);
+					border-color: mix($-color-white,  #999, 85%);
+			  }
+			}
+		}
+	}
+
+	&:not([hover-class]):active {
+	  color: mix($-color-white, $-color-black, 50%);
+	}
+
+	&[size=mini] {
+		font-size: 16px;
+		font-weight: 200;
+		border-radius: 8px;
+	}
+
+
+
+	&.uni-btn-small {
+		font-size: 14px;
+	}
+	&.uni-btn-mini {
+		font-size: 12px;
+	}
+
+	&.uni-btn-radius {
+		border-radius: 999px;
+	}
+	&[type=primary] {
+		@include is-color($uni-primary);
+		@include is-plain($uni-primary)
+	}
+	&[type=success] {
+		@include is-color($uni-success);
+		@include is-plain($uni-success)
+	}
+	&[type=error] {
+		@include is-color($uni-error);
+		@include is-plain($uni-error)
+	}
+	&[type=warning] {
+		@include is-color($uni-warning);
+		@include is-plain($uni-warning)
+	}
+	&[type=info] {
+		@include is-color($uni-info);
+		@include is-plain($uni-info)
+	}
+}
+/* #endif */
diff --git a/uni_modules/uni-scss/styles/setting/_text.scss b/uni_modules/uni-scss/styles/setting/_text.scss
new file mode 100644
index 0000000..a34d08f
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_text.scss
@@ -0,0 +1,24 @@
+@mixin get-styles($k,$c) {
+	@if $k == size or $k == weight{
+		font-#{$k}:#{$c}
+	}@else{
+		#{$k}:#{$c}
+	}
+}
+
+@each $key, $child in $uni-headings {
+	/* #ifndef APP-NVUE */
+	.uni-#{$key} {
+		@each $k, $c in $child {
+			@include get-styles($k,$c)
+		}
+	}
+	/* #endif */
+	/* #ifdef APP-NVUE */
+	.container .uni-#{$key} {
+		@each $k, $c in $child {
+			@include get-styles($k,$c)
+		}
+	}
+	/* #endif */
+}
diff --git a/uni_modules/uni-scss/styles/setting/_variables.scss b/uni_modules/uni-scss/styles/setting/_variables.scss
new file mode 100644
index 0000000..557d3d7
--- /dev/null
+++ b/uni_modules/uni-scss/styles/setting/_variables.scss
@@ -0,0 +1,146 @@
+// @use "sass:math";
+@import  '../tools/functions.scss';
+// 间距基础倍数
+$uni-space-root: 2 !default;
+// 边框半径默认值
+$uni-radius-root:5px !default;
+$uni-radius: () !default;
+// 边框半径断点
+$uni-radius: map-deep-merge(
+  (
+    0: 0,
+		// TODO 当前版本暂时不支持 sm 属性
+    // 'sm': math.div($uni-radius-root, 2),
+    null: $uni-radius-root,
+    'lg': $uni-radius-root * 2,
+    'xl': $uni-radius-root * 6,
+    'pill': 9999px,
+    'circle': 50%
+  ),
+  $uni-radius
+);
+// 字体家族
+$body-font-family: 'Roboto', sans-serif !default;
+// 文本
+$heading-font-family: $body-font-family !default;
+$uni-headings: () !default;
+$letterSpacing: -0.01562em;
+$uni-headings: map-deep-merge(
+  (
+    'h1': (
+      size: 32px,
+			weight: 300,
+			line-height: 50px,
+			// letter-spacing:-0.01562em
+    ),
+    'h2': (
+      size: 28px,
+      weight: 300,
+      line-height: 40px,
+      // letter-spacing: -0.00833em
+    ),
+    'h3': (
+      size: 24px,
+      weight: 400,
+      line-height: 32px,
+      // letter-spacing: normal
+    ),
+    'h4': (
+      size: 20px,
+      weight: 400,
+      line-height: 30px,
+      // letter-spacing: 0.00735em
+    ),
+    'h5': (
+      size: 16px,
+      weight: 400,
+      line-height: 24px,
+      // letter-spacing: normal
+    ),
+    'h6': (
+      size: 14px,
+      weight: 500,
+      line-height: 18px,
+      // letter-spacing: 0.0125em
+    ),
+    'subtitle': (
+      size: 12px,
+      weight: 400,
+      line-height: 20px,
+      // letter-spacing: 0.00937em
+    ),
+    'body': (
+      font-size: 14px,
+			font-weight: 400,
+			line-height: 22px,
+			// letter-spacing: 0.03125em
+    ),
+    'caption': (
+      'size': 12px,
+      'weight': 400,
+      'line-height': 20px,
+      // 'letter-spacing': 0.03333em,
+      // 'text-transform': false
+    )
+  ),
+  $uni-headings
+);
+
+
+
+// 主色
+$uni-primary: #2979ff !default;
+$uni-primary-disable:lighten($uni-primary,20%) !default;
+$uni-primary-light: lighten($uni-primary,25%) !default;
+
+// 辅助色
+// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。
+$uni-success: #18bc37 !default;
+$uni-success-disable:lighten($uni-success,20%) !default;
+$uni-success-light: lighten($uni-success,25%) !default;
+
+$uni-warning: #f3a73f !default;
+$uni-warning-disable:lighten($uni-warning,20%) !default;
+$uni-warning-light: lighten($uni-warning,25%) !default;
+
+$uni-error: #e43d33 !default;
+$uni-error-disable:lighten($uni-error,20%) !default;
+$uni-error-light: lighten($uni-error,25%) !default;
+
+$uni-info: #8f939c !default;
+$uni-info-disable:lighten($uni-info,20%) !default;
+$uni-info-light: lighten($uni-info,25%) !default;
+
+// 中性色
+// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。
+$uni-main-color: #3a3a3a !default; 			// 主要文字
+$uni-base-color: #6a6a6a !default;			// 常规文字
+$uni-secondary-color: #909399 !default;	// 次要文字
+$uni-extra-color: #c7c7c7 !default;			// 辅助说明
+
+// 边框颜色
+$uni-border-1: #F0F0F0 !default;
+$uni-border-2: #EDEDED !default;
+$uni-border-3: #DCDCDC !default;
+$uni-border-4: #B9B9B9 !default;
+
+// 常规色
+$uni-black: #000000 !default;
+$uni-white: #ffffff !default;
+$uni-transparent: rgba($color: #000000, $alpha: 0) !default;
+
+// 背景色
+$uni-bg-color: #f7f7f7 !default;
+
+/* 水平间距 */
+$uni-spacing-sm: 8px !default;
+$uni-spacing-base: 15px !default;
+$uni-spacing-lg: 30px !default;
+
+// 阴影
+$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5) !default;
+$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2) !default;
+$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5) !default;
+
+// 蒙版
+$uni-mask: rgba($color: #000000, $alpha: 0.4) !default;
diff --git a/uni_modules/uni-scss/styles/tools/functions.scss b/uni_modules/uni-scss/styles/tools/functions.scss
new file mode 100644
index 0000000..ac6f63e
--- /dev/null
+++ b/uni_modules/uni-scss/styles/tools/functions.scss
@@ -0,0 +1,19 @@
+// 合并 map
+@function map-deep-merge($parent-map, $child-map){
+	$result: $parent-map;
+	@each $key, $child in $child-map {
+		$parent-has-key: map-has-key($result, $key);
+		$parent-value: map-get($result, $key);
+		$parent-type: type-of($parent-value);
+		$child-type: type-of($child);
+		$parent-is-map: $parent-type == map;
+		$child-is-map: $child-type == map;
+			
+		@if (not $parent-has-key) or ($parent-type != $child-type) or (not ($parent-is-map and $child-is-map)){
+			$result: map-merge($result, ( $key: $child ));
+		}@else {
+			$result: map-merge($result, ( $key: map-deep-merge($parent-value, $child) ));
+		}
+	}
+	@return $result;
+};
diff --git a/uni_modules/uni-scss/theme.scss b/uni_modules/uni-scss/theme.scss
new file mode 100644
index 0000000..80ee62f
--- /dev/null
+++ b/uni_modules/uni-scss/theme.scss
@@ -0,0 +1,31 @@
+// 间距基础倍数
+$uni-space-root: 2;
+// 边框半径默认值
+$uni-radius-root:5px;
+// 主色
+$uni-primary: #2979ff;
+// 辅助色
+$uni-success: #4cd964;
+// 警告色
+$uni-warning: #f0ad4e;
+// 错误色
+$uni-error: #dd524d;
+// 描述色
+$uni-info: #909399;
+// 中性色
+$uni-main-color: #303133;
+$uni-base-color: #606266;
+$uni-secondary-color: #909399;
+$uni-extra-color: #C0C4CC;
+// 背景色
+$uni-bg-color: #f5f5f5;
+// 边框颜色
+$uni-border-1: #DCDFE6;
+$uni-border-2: #E4E7ED;
+$uni-border-3: #EBEEF5;
+$uni-border-4: #F2F6FC;
+
+// 常规色
+$uni-black: #000000;
+$uni-white: #ffffff;
+$uni-transparent: rgba($color: #000000, $alpha: 0);
diff --git a/uni_modules/uni-scss/variables.scss b/uni_modules/uni-scss/variables.scss
new file mode 100644
index 0000000..1c062d4
--- /dev/null
+++ b/uni_modules/uni-scss/variables.scss
@@ -0,0 +1,62 @@
+@import './styles/setting/_variables.scss';
+// 间距基础倍数
+$uni-space-root: 2;
+// 边框半径默认值
+$uni-radius-root:5px;
+
+// 主色
+$uni-primary: #2979ff;
+$uni-primary-disable:mix(#fff,$uni-primary,50%);
+$uni-primary-light: mix(#fff,$uni-primary,80%);
+
+// 辅助色
+// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。
+$uni-success: #18bc37;
+$uni-success-disable:mix(#fff,$uni-success,50%);
+$uni-success-light: mix(#fff,$uni-success,80%);
+
+$uni-warning: #f3a73f;
+$uni-warning-disable:mix(#fff,$uni-warning,50%);
+$uni-warning-light: mix(#fff,$uni-warning,80%);
+
+$uni-error: #e43d33;
+$uni-error-disable:mix(#fff,$uni-error,50%);
+$uni-error-light: mix(#fff,$uni-error,80%);
+
+$uni-info: #8f939c;
+$uni-info-disable:mix(#fff,$uni-info,50%);
+$uni-info-light: mix(#fff,$uni-info,80%);
+
+// 中性色
+// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。
+$uni-main-color: #3a3a3a; 			// 主要文字
+$uni-base-color: #6a6a6a;			// 常规文字
+$uni-secondary-color: #909399;	// 次要文字
+$uni-extra-color: #c7c7c7;			// 辅助说明
+
+// 边框颜色
+$uni-border-1: #F0F0F0;
+$uni-border-2: #EDEDED;
+$uni-border-3: #DCDCDC;
+$uni-border-4: #B9B9B9;
+
+// 常规色
+$uni-black: #000000;
+$uni-white: #ffffff;
+$uni-transparent: rgba($color: #000000, $alpha: 0);
+
+// 背景色
+$uni-bg-color: #f7f7f7;
+
+/* 水平间距 */
+$uni-spacing-sm: 8px;
+$uni-spacing-base: 15px;
+$uni-spacing-lg: 30px;
+
+// 阴影
+$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5);
+$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2);
+$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5);
+
+// 蒙版
+$uni-mask: rgba($color: #000000, $alpha: 0.4);
diff --git a/uni_modules/uni-transition/changelog.md b/uni_modules/uni-transition/changelog.md
new file mode 100644
index 0000000..70c1cd4
--- /dev/null
+++ b/uni_modules/uni-transition/changelog.md
@@ -0,0 +1,22 @@
+## 1.3.2（2023-05-04）
+- 修复 NVUE 平台报错的问题
+## 1.3.1（2021-11-23）
+- 修复 init 方法初始化问题
+## 1.3.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-transition](https://uniapp.dcloud.io/component/uniui/uni-transition)
+## 1.2.1（2021-09-27）
+- 修复 init 方法不生效的 Bug
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建 vue3 项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.1（2021-05-12）
+- 新增 示例地址
+- 修复 示例项目缺少组件的 Bug
+## 1.1.0（2021-04-22）
+- 新增 通过方法自定义动画
+- 新增 custom-class 非 NVUE 平台支持自定义 class 定制样式
+- 优化 动画触发逻辑，使动画更流畅
+- 优化 支持单独的动画类型
+- 优化 文档示例
+## 1.0.2（2021-02-05）
+- 调整为 uni_modules 目录规范
diff --git a/uni_modules/uni-transition/components/uni-transition/createAnimation.js b/uni_modules/uni-transition/components/uni-transition/createAnimation.js
new file mode 100644
index 0000000..8f89b18
--- /dev/null
+++ b/uni_modules/uni-transition/components/uni-transition/createAnimation.js
@@ -0,0 +1,131 @@
+// const defaultOption = {
+// 	duration: 300,
+// 	timingFunction: 'linear',
+// 	delay: 0,
+// 	transformOrigin: '50% 50% 0'
+// }
+// #ifdef APP-NVUE
+const nvueAnimation = uni.requireNativePlugin('animation')
+// #endif
+class MPAnimation {
+	constructor(options, _this) {
+		this.options = options
+		// 在iOS10+QQ小程序平台下，传给原生的对象一定是个普通对象而不是Proxy对象，否则会报parameter should be Object instead of ProxyObject的错误
+		this.animation = uni.createAnimation({
+			...options
+		})
+		this.currentStepAnimates = {}
+		this.next = 0
+		this.$ = _this
+
+	}
+
+	_nvuePushAnimates(type, args) {
+		let aniObj = this.currentStepAnimates[this.next]
+		let styles = {}
+		if (!aniObj) {
+			styles = {
+				styles: {},
+				config: {}
+			}
+		} else {
+			styles = aniObj
+		}
+		if (animateTypes1.includes(type)) {
+			if (!styles.styles.transform) {
+				styles.styles.transform = ''
+			}
+			let unit = ''
+			if(type === 'rotate'){
+				unit = 'deg'
+			}
+			styles.styles.transform += `${type}(${args+unit}) `
+		} else {
+			styles.styles[type] = `${args}`
+		}
+		this.currentStepAnimates[this.next] = styles
+	}
+	_animateRun(styles = {}, config = {}) {
+		let ref = this.$.$refs['ani'].ref
+		if (!ref) return
+		return new Promise((resolve, reject) => {
+			nvueAnimation.transition(ref, {
+				styles,
+				...config
+			}, res => {
+				resolve()
+			})
+		})
+	}
+
+	_nvueNextAnimate(animates, step = 0, fn) {
+		let obj = animates[step]
+		if (obj) {
+			let {
+				styles,
+				config
+			} = obj
+			this._animateRun(styles, config).then(() => {
+				step += 1
+				this._nvueNextAnimate(animates, step, fn)
+			})
+		} else {
+			this.currentStepAnimates = {}
+			typeof fn === 'function' && fn()
+			this.isEnd = true
+		}
+	}
+
+	step(config = {}) {
+		// #ifndef APP-NVUE
+		this.animation.step(config)
+		// #endif
+		// #ifdef APP-NVUE
+		this.currentStepAnimates[this.next].config = Object.assign({}, this.options, config)
+		this.currentStepAnimates[this.next].styles.transformOrigin = this.currentStepAnimates[this.next].config.transformOrigin
+		this.next++
+		// #endif
+		return this
+	}
+
+	run(fn) {
+		// #ifndef APP-NVUE
+		this.$.animationData = this.animation.export()
+		this.$.timer = setTimeout(() => {
+			typeof fn === 'function' && fn()
+		}, this.$.durationTime)
+		// #endif
+		// #ifdef APP-NVUE
+		this.isEnd = false
+		let ref = this.$.$refs['ani'] && this.$.$refs['ani'].ref
+		if(!ref) return
+		this._nvueNextAnimate(this.currentStepAnimates, 0, fn)
+		this.next = 0
+		// #endif
+	}
+}
+
+
+const animateTypes1 = ['matrix', 'matrix3d', 'rotate', 'rotate3d', 'rotateX', 'rotateY', 'rotateZ', 'scale', 'scale3d',
+	'scaleX', 'scaleY', 'scaleZ', 'skew', 'skewX', 'skewY', 'translate', 'translate3d', 'translateX', 'translateY',
+	'translateZ'
+]
+const animateTypes2 = ['opacity', 'backgroundColor']
+const animateTypes3 = ['width', 'height', 'left', 'right', 'top', 'bottom']
+animateTypes1.concat(animateTypes2, animateTypes3).forEach(type => {
+	MPAnimation.prototype[type] = function(...args) {
+		// #ifndef APP-NVUE
+		this.animation[type](...args)
+		// #endif
+		// #ifdef APP-NVUE
+		this._nvuePushAnimates(type, args)
+		// #endif
+		return this
+	}
+})
+
+export function createAnimation(option, _this) {
+	if(!_this) return
+	clearTimeout(_this.timer)
+	return new MPAnimation(option, _this)
+}
diff --git a/uni_modules/uni-transition/components/uni-transition/uni-transition.vue b/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
new file mode 100644
index 0000000..bfbba93
--- /dev/null
+++ b/uni_modules/uni-transition/components/uni-transition/uni-transition.vue
@@ -0,0 +1,286 @@
+<template>
+  <!-- #ifndef APP-NVUE -->
+  <view v-show="isShow" ref="ani" :animation="animationData" :class="customClass" :style="transformStyles" @click="onClick"><slot></slot></view>
+  <!-- #endif -->
+  <!-- #ifdef APP-NVUE -->
+  <view v-if="isShow" ref="ani" :animation="animationData" :class="customClass" :style="transformStyles" @click="onClick"><slot></slot></view>
+  <!-- #endif -->
+</template>
+
+<script>
+import { createAnimation } from './createAnimation'
+
+/**
+ * Transition 过渡动画
+ * @description 简单过渡动画组件
+ * @tutorial https://ext.dcloud.net.cn/plugin?id=985
+ * @property {Boolean} show = [false|true] 控制组件显示或隐藏
+ * @property {Array|String} modeClass = [fade|slide-top|slide-right|slide-bottom|slide-left|zoom-in|zoom-out] 过渡动画类型
+ *  @value fade 渐隐渐出过渡
+ *  @value slide-top 由上至下过渡
+ *  @value slide-right 由右至左过渡
+ *  @value slide-bottom 由下至上过渡
+ *  @value slide-left 由左至右过渡
+ *  @value zoom-in 由小到大过渡
+ *  @value zoom-out 由大到小过渡
+ * @property {Number} duration 过渡动画持续时间
+ * @property {Object} styles 组件样式，同 css 样式，注意带’-‘连接符的属性需要使用小驼峰写法如：`backgroundColor:red`
+ */
+export default {
+	name: 'uniTransition',
+	emits:['click','change'],
+	props: {
+		show: {
+			type: Boolean,
+			default: false
+		},
+		modeClass: {
+			type: [Array, String],
+			default() {
+				return 'fade'
+			}
+		},
+		duration: {
+			type: Number,
+			default: 300
+		},
+		styles: {
+			type: Object,
+			default() {
+				return {}
+			}
+		},
+		customClass:{
+			type: String,
+			default: ''
+		},
+		onceRender:{
+			type:Boolean,
+			default:false
+		},
+	},
+	data() {
+		return {
+			isShow: false,
+			transform: '',
+			opacity: 1,
+			animationData: {},
+			durationTime: 300,
+			config: {}
+		}
+	},
+	watch: {
+		show: {
+			handler(newVal) {
+				if (newVal) {
+					this.open()
+				} else {
+					// 避免上来就执行 close,导致动画错乱
+					if (this.isShow) {
+						this.close()
+					}
+				}
+			},
+			immediate: true
+		}
+	},
+	computed: {
+		// 生成样式数据
+		stylesObject() {
+			let styles = {
+				...this.styles,
+				'transition-duration': this.duration / 1000 + 's'
+			}
+			let transform = ''
+			for (let i in styles) {
+				let line = this.toLine(i)
+				transform += line + ':' + styles[i] + ';'
+			}
+			return transform
+		},
+		// 初始化动画条件
+		transformStyles() {
+			return 'transform:' + this.transform + ';' + 'opacity:' + this.opacity + ';' + this.stylesObject
+		}
+	},
+	created() {
+		// 动画默认配置
+		this.config = {
+			duration: this.duration,
+			timingFunction: 'ease',
+			transformOrigin: '50% 50%',
+			delay: 0
+		}
+		this.durationTime = this.duration
+	},
+	methods: {
+		/**
+		 *  ref 触发 初始化动画
+		 */
+		init(obj = {}) {
+			if (obj.duration) {
+				this.durationTime = obj.duration
+			}
+			this.animation = createAnimation(Object.assign(this.config, obj),this)
+		},
+		/**
+		 * 点击组件触发回调
+		 */
+		onClick() {
+			this.$emit('click', {
+				detail: this.isShow
+			})
+		},
+		/**
+		 * ref 触发 动画分组
+		 * @param {Object} obj
+		 */
+		step(obj, config = {}) {
+			if (!this.animation) return
+			for (let i in obj) {
+				try {
+					if(typeof obj[i] === 'object'){
+						this.animation[i](...obj[i])
+					}else{
+						this.animation[i](obj[i])
+					}
+				} catch (e) {
+					console.error(`方法 ${i} 不存在`)
+				}
+			}
+			this.animation.step(config)
+			return this
+		},
+		/**
+		 *  ref 触发 执行动画
+		 */
+		run(fn) {
+			if (!this.animation) return
+			this.animation.run(fn)
+		},
+		// 开始过度动画
+		open() {
+			clearTimeout(this.timer)
+			this.transform = ''
+			this.isShow = true
+			let { opacity, transform } = this.styleInit(false)
+			if (typeof opacity !== 'undefined') {
+				this.opacity = opacity
+			}
+			this.transform = transform
+			// 确保动态样式已经生效后，执行动画，如果不加 nextTick ，会导致 wx 动画执行异常
+			this.$nextTick(() => {
+				// TODO 定时器保证动画完全执行，目前有些问题，后面会取消定时器
+				this.timer = setTimeout(() => {
+					this.animation = createAnimation(this.config, this)
+					this.tranfromInit(false).step()
+					this.animation.run()
+					this.$emit('change', {
+						detail: this.isShow
+					})
+				}, 20)
+			})
+		},
+		// 关闭过度动画
+		close(type) {
+			if (!this.animation) return
+			this.tranfromInit(true)
+				.step()
+				.run(() => {
+					this.isShow = false
+					this.animationData = null
+					this.animation = null
+					let { opacity, transform } = this.styleInit(false)
+					this.opacity = opacity || 1
+					this.transform = transform
+					this.$emit('change', {
+						detail: this.isShow
+					})
+				})
+		},
+		// 处理动画开始前的默认样式
+		styleInit(type) {
+			let styles = {
+				transform: ''
+			}
+			let buildStyle = (type, mode) => {
+				if (mode === 'fade') {
+					styles.opacity = this.animationType(type)[mode]
+				} else {
+					styles.transform += this.animationType(type)[mode] + ' '
+				}
+			}
+			if (typeof this.modeClass === 'string') {
+				buildStyle(type, this.modeClass)
+			} else {
+				this.modeClass.forEach(mode => {
+					buildStyle(type, mode)
+				})
+			}
+			return styles
+		},
+		// 处理内置组合动画
+		tranfromInit(type) {
+			let buildTranfrom = (type, mode) => {
+				let aniNum = null
+				if (mode === 'fade') {
+					aniNum = type ? 0 : 1
+				} else {
+					aniNum = type ? '-100%' : '0'
+					if (mode === 'zoom-in') {
+						aniNum = type ? 0.8 : 1
+					}
+					if (mode === 'zoom-out') {
+						aniNum = type ? 1.2 : 1
+					}
+					if (mode === 'slide-right') {
+						aniNum = type ? '100%' : '0'
+					}
+					if (mode === 'slide-bottom') {
+						aniNum = type ? '100%' : '0'
+					}
+				}
+				this.animation[this.animationMode()[mode]](aniNum)
+			}
+			if (typeof this.modeClass === 'string') {
+				buildTranfrom(type, this.modeClass)
+			} else {
+				this.modeClass.forEach(mode => {
+					buildTranfrom(type, mode)
+				})
+			}
+
+			return this.animation
+		},
+		animationType(type) {
+			return {
+				fade: type ? 1 : 0,
+				'slide-top': `translateY(${type ? '0' : '-100%'})`,
+				'slide-right': `translateX(${type ? '0' : '100%'})`,
+				'slide-bottom': `translateY(${type ? '0' : '100%'})`,
+				'slide-left': `translateX(${type ? '0' : '-100%'})`,
+				'zoom-in': `scaleX(${type ? 1 : 0.8}) scaleY(${type ? 1 : 0.8})`,
+				'zoom-out': `scaleX(${type ? 1 : 1.2}) scaleY(${type ? 1 : 1.2})`
+			}
+		},
+		// 内置动画类型与实际动画对应字典
+		animationMode() {
+			return {
+				fade: 'opacity',
+				'slide-top': 'translateY',
+				'slide-right': 'translateX',
+				'slide-bottom': 'translateY',
+				'slide-left': 'translateX',
+				'zoom-in': 'scale',
+				'zoom-out': 'scale'
+			}
+		},
+		// 驼峰转中横线
+		toLine(name) {
+			return name.replace(/([A-Z])/g, '-$1').toLowerCase()
+		}
+	}
+}
+</script>
+
+<style></style>
diff --git a/uni_modules/uni-transition/package.json b/uni_modules/uni-transition/package.json
new file mode 100644
index 0000000..ea995a2
--- /dev/null
+++ b/uni_modules/uni-transition/package.json
@@ -0,0 +1,84 @@
+{
+  "id": "uni-transition",
+  "displayName": "uni-transition 过渡动画",
+  "version": "1.3.2",
+  "description": "元素的简单过渡动画",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "动画",
+    "过渡",
+    "过渡动画"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+"dcloudext": {
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui",
+    "type": "component-vue"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/uni-transition/readme.md b/uni_modules/uni-transition/readme.md
new file mode 100644
index 0000000..2f8a77e
--- /dev/null
+++ b/uni_modules/uni-transition/readme.md
@@ -0,0 +1,11 @@
+
+
+## Transition 过渡动画
+> **组件名：uni-transition**
+> 代码块： `uTransition`
+
+
+元素过渡动画
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-transition)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/uni_modules/v-sign/changelog.md b/uni_modules/v-sign/changelog.md
new file mode 100644
index 0000000..17deb52
--- /dev/null
+++ b/uni_modules/v-sign/changelog.md
@@ -0,0 +1,48 @@
+## 0.5.2（2022-06-10）
+- canvas 默认设置 disable-scroll 属性为true,  当在 canvas 中移动时且有绑定手势事件时，禁止屏幕滚动以及下拉刷新
+## 0.5.1（2022-05-27）
+- 取消属性 width, height 默认值
+## 0.5.0（2022-05-27）
+- 新增 v-sgin 组件获取坐标信息数组方法 `getLineData`
+- 新增 v-sign 组件事件触发 @clear, @revoke, @end
+- 修复撤销操作重设背景色导致线条消失问题
+## 0.4.0（2022-05-15）
+- 新增属性 bgColor 设置画布背景色，修复导出图片无背景色问题
+## 0.3.4（2022-03-30）
+修复 v-sign-action 子组件 svg 加载报错
+## 0.3.3（2022-03-30）
+修复 v-sign-action 子组件 svg 加载报错
+## 0.3.2（2022-01-12）
+- 修复多组件共存绘制问题
+## 0.3.1（2021-12-14）
+-  【新增】保存 png 图片方法 saveImage;
+- 【修改】 控件子组件保存按钮动作由保存为临时文件路径改为保存图片
+## 0.3.0（2021-12-11）
+- 添加颜色选择器组件
+## 0.2.0（2021-12-10）
+- 修改为 uni_modules 规范
+## 0.1.7 (2021-12-09)
+
+- 画笔组件优化
+
+## 0.1.6 (2021-12-08)
+
+- 画笔样式优化
+
+## 0.1.5 (2021-12-08)
+
+- 画笔子组件样式修改，支持circle、line 两种样式
+
+## 0.1.4 (2021-12-08)
+
+- 添加画笔子组件
+
+## 0.1.3 (2021-12-02)
+
+- 添加按钮控件子组件
+
+## 0.1.0 (2021-11-28)
+
+- 支持线宽、颜色自定义，自定义画布样式
+- 支持画布清空、撤回、保存图片
+- 事件 init 暴露清空、撤回、保存图片方法
\ No newline at end of file
diff --git a/uni_modules/v-sign/components/v-sign-action/v-sign-action.vue b/uni_modules/v-sign/components/v-sign-action/v-sign-action.vue
new file mode 100644
index 0000000..e8760d2
--- /dev/null
+++ b/uni_modules/v-sign/components/v-sign-action/v-sign-action.vue
@@ -0,0 +1,168 @@
+<template>
+	<view class="v-sign-action" :style="[customStyle]">
+		<view v-for="item in btns" :key="item.label" :class="['btn', { border: border }]"
+			:style="[{ 'margin-right': formatSize(space) }]" @click="onBtnClick(item)">
+			<image v-if="item.icon" :class="['icon', 'icon-' + item.action]" :src="item.icon"></image>
+			<text class="text">{{ item.label }}</text>
+		</view>
+	</view>
+</template>
+
+<script>
+	/**
+	 * v-sign-action 控制按钮组（v-sign 子组件）
+	 * @description 控制 v-sign 组件的一些按钮
+	 * @tutorial
+	 * @property {Array} actions 按钮配置 所有值： 清空（clear）, 撤回（prev） 保存图片（save）
+	 * @property {Boolean} border 按钮是否有边框
+	 * @property {String/Number} space 按钮间隔
+	 * @property {Object} customStyle 根元素自定义样式
+	 * @event {Function} 点击对应类型按钮触发对应事件， 例如点击 clear 则触发 clear 事件
+	 * @example 示例
+	 **/
+	import {
+		formatSize
+	} from '../../utils'
+
+	// v-sign 父组件提供的接口
+	let vSignInterface
+	// 按钮类型
+	const btn_type = {
+		CLEAR: 'clear', // 清空
+		PREV: 'prev', // 撤回/上一步
+		// NEXT: 'next',
+		SAVE: 'save' // 保存临时图片
+	}
+	const all_action = Object.values(btn_type)
+	const btnsConf = [{
+			label: '清空',
+			action: btn_type.CLEAR,
+			icon: require('../../static/image/clear.svg')
+		},
+		{
+			label: '撤回',
+			action: btn_type.PREV,
+			icon: require('../../static/image/prev.svg')
+		},
+		// ,{
+		// 	label: '取消撤回',
+		// 	action: btn_type.NEXT,
+		// 	icon: '/uni_modules/v-sign/static/image/next.svg'
+		// },
+		{
+			label: '保存',
+			action: btn_type.SAVE,
+			icon: require('../../static/image/save.svg')
+		}
+	]
+	export default {
+		name: 'v-sign-action',
+		props: {
+			// 按钮配置
+			actions: {
+				type: Array,
+				default: () => all_action
+			},
+			// 按钮是否有边框
+			border: {
+				type: Boolean,
+				default: true
+			},
+			// 按钮间隔
+			space: {
+				type: [String, Number],
+				default: 12
+			},
+			// 根元素自定义样式
+			customStyle: {
+				type: Object,
+				default: () => ({})
+			}
+		},
+		inject: ['getSignInterface'],
+		data() {
+			return {
+				formatSize
+			}
+		},
+		computed: {
+			btns() {
+				return btnsConf.filter(item => this.actions.includes(item.action))
+			}
+		},
+		mounted() {
+			vSignInterface = this.getSignInterface()
+		},
+		methods: {
+			async onBtnClick(btn) {
+				let emit_result
+				switch (btn.action) {
+					case btn_type.CLEAR:
+						vSignInterface.clear()
+						break
+					case btn_type.PREV:
+						vSignInterface.revoke()
+						break
+						// case btn_type.NEXT:
+						// 	console.log('next')
+						// 	break
+					case btn_type.SAVE:
+						emit_result = await vSignInterface.saveImage()
+						break
+					default:
+						break
+				}
+				// console.log(btn.action, emit_result);
+				// 触发按钮对应类型事件
+				this.$emit(btn.action, emit_result)
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.v-sign-action {
+		display: flex;
+		flex-wrap: wrap;
+
+		.btn {
+			display: flex;
+			align-items: center;
+			padding: 0 12rpx;
+			min-width: 88rpx;
+			white-space: nowrap;
+
+			&:last-child {
+				margin-right: 0;
+			}
+
+			&:active {
+				transition: transform 0.3s;
+				transform: scale(1.1);
+			}
+
+			&.border {
+				border: 2rpx solid #333;
+				border-radius: 12rpx;
+			}
+
+			.icon {
+				width: 28rpx;
+				height: 28rpx;
+
+				&.icon-clear,
+				&.icon-prev,
+				&.icon-next {
+					margin-right: 4rpx;
+				}
+
+				&.icon-save {}
+			}
+
+			.text {
+				color: #333;
+				font-size: 28rpx;
+			}
+		}
+	}
+</style>
diff --git a/uni_modules/v-sign/components/v-sign-color/v-sign-color.vue b/uni_modules/v-sign/components/v-sign-color/v-sign-color.vue
new file mode 100644
index 0000000..f335349
--- /dev/null
+++ b/uni_modules/v-sign/components/v-sign-color/v-sign-color.vue
@@ -0,0 +1,212 @@
+<template>
+	<view class="v-sign-color">
+		<view class="options">
+			<view
+				class="option-item"
+				v-for="(color, index) in options"
+				:key="color"
+				:style="[optionStyle(color, index)]"
+				@click="onSelect(color, index)"
+			>
+				<view class="option-inner" :style="[optionInnerStyle(color, index)]">
+					{{ tick && currentIndex === index ? '✓' : '' }}
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+/**
+ * v-sign-color 颜色选择器（v-sign 子组件）
+ * @description 设置 v-sign 画笔的颜色
+ * @tutorial
+ * @property {String} type 选项样式，可选 SQUARE \ CIRCLE
+ * @property {String} color 默认颜色
+ * @property {Array} options 备选色
+ * @property {Number/String} size 圆/方形大小
+ * @property {Boolean} tick 是否选中打勾
+ * @property {Number/String} tickSize 勾大小
+ * @property {String} borderColor 边框颜色
+ * @property {Boolean} border 是否有边框
+ * @property {Number/String} space 选项间隙
+ * @event {Function} change 改变颜色时触发
+ * @example 示例
+ **/
+import { formatSize } from '../../utils'
+// 选项样式
+const type_style = {
+	CIRCLE: 'circle',
+	SQUARE: 'square'
+}
+// v-sign 父组件提供的接口
+let vSignInterface
+
+export default {
+	name: 'v-sign-color',
+	props: {
+		// 选项样式
+		type: {
+			type: String,
+			default: type_style.SQUARE
+		},
+		// 默认色，需在备选中
+		color: {
+			type: String
+		},
+		// 备选色
+		options: {
+			type: Array,
+			default: () => ['#333', '#f44236', '#3f51b5', '#2195f3', '#ffeb3b', '#ff9900']
+		},
+		// 圆/方形大小
+		size: {
+			type: [Number, String],
+			default: 44
+		},
+		// 是否选中打勾
+		tick: {
+			type: Boolean,
+			default: true
+		},
+		// 勾大小
+		tickSize: {
+			type: [Number, String],
+			default: 24
+		},
+		// 边框颜色
+		borderColor: {
+			type: String,
+			default: '#fff'
+		},
+		// 是否有边框
+		border: {
+			type: Boolean,
+			default: false
+		},
+		// 选项间隙
+		space: {
+			type: [Number, String],
+			default: 16
+		}
+	},
+	inject: ['getSignInterface'],
+	data() {
+		return {
+			formatSize,
+			currentIndex: null
+		}
+	},
+	watch: {
+		color: {
+			handler(val) {
+				if (!val) {
+					this.currentIndex = 0
+					return
+				}
+				const index = this.options.findIndex(item => item === this.color)
+				if (index > 0) {
+					this.currentIndex = index
+				}
+			},
+			immediate: true
+		}
+	},
+	computed: {
+		currentColor() {
+			return this.options[this.currentIndex]
+		}
+	},
+	mounted() {
+		vSignInterface = this.getSignInterface()
+		this.setLineColor()
+	},
+	methods: {
+		onSelect(color, index) {
+			this.currentIndex = index
+			this.$emit('change', color)
+			this.setLineColor()
+		},
+		setLineColor() {
+			vSignInterface.setLineColor(this.currentColor)
+		},
+		optionStyle(color, index) {
+			const size = formatSize(this.size)
+			let style = {
+				marginRight: formatSize(this.space),
+				width: size,
+				height: size,
+				lineHeight: size,
+				border:
+					this.border && this.currentIndex === index
+						? `4rpx solid ${this.borderColor}`
+						: '',
+				padding: this.currentIndex === index ? 0 : this.border ? '4rpx' : ''
+			}
+			switch (this.type) {
+				case type_style.SQUARE:
+					style = {
+						...style,
+						borderRadius: this.currentIndex === index ? '8rpx' : 0
+					}
+					break
+				case type_style.CIRCLE:
+					style = {
+						...style,
+						borderRadius: '50%'
+					}
+					break
+			}
+			return style
+		},
+		optionInnerStyle(color, index) {
+			let style = {
+				background: color,
+				fontSize: formatSize(this.tickSize)
+			}
+			switch (this.type) {
+				case type_style.SQUARE:
+					style = {
+						...style,
+						borderRadius: this.currentIndex === index ? 0 : '8rpx'
+					}
+					break
+				case type_style.CIRCLE:
+					style = {
+						...style,
+						borderRadius: '50%'
+					}
+					break
+			}
+			return style
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.options {
+	padding: 8rpx;
+	display: flex;
+	flex-wrap: wrap;
+}
+
+.option-item {
+	overflow: hidden;
+	&:last-child {
+		margin-right: 0;
+	}
+	&:active {
+		transition: transform 0.3s;
+		transform: scale(1.1);
+	}
+}
+
+.option-inner {
+	width: 100%;
+	height: 100%;
+	text-align: center;
+	font-weight: bold;
+	color: #fff;
+}
+</style>
diff --git a/uni_modules/v-sign/components/v-sign-pen/v-sign-pen.vue b/uni_modules/v-sign/components/v-sign-pen/v-sign-pen.vue
new file mode 100644
index 0000000..41786a3
--- /dev/null
+++ b/uni_modules/v-sign/components/v-sign-pen/v-sign-pen.vue
@@ -0,0 +1,215 @@
+<template>
+	<view class="v-sign-pen">
+		<view class="label" v-if="label">{{ label }}</view>
+		<view class="options">
+			<view
+				class="opt-item"
+				:style="{
+					minHeight: minWrapHeight,
+					marginRight: space + 'rpx'
+				}"
+				v-for="item in csizes"
+				:key="item.size"
+				@click="onItemClick(item)"
+			>
+				<view
+					:class="type"
+					:style="{
+						border:
+							border && currentSelect.size === item.size
+								? `${borderWidth}rpx solid ${activeColor}`
+								: ''
+					}"
+				>
+					<view class="inner" :style="[defaultInnerStyle(item)]"></view>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+/**
+ * v-sign-pen 画笔（v-sign 子组件）
+ * @description 设置 v-sign 画笔的线宽
+ * @tutorial
+ * @property {String} type 选项样式 line / circle
+ * @property {String} label 标签
+ * @property {Array}  sizes 画笔大小数组，单位 px
+ * @property {String} color 选项颜色
+ * @property {String} activeColor 选中项颜色
+ * @property {Boolean} border 选中项是否有边框
+ * @property {Number} borderWidth 边框大小，单位 rpx
+ * @property {String} space 选项间隙，单位 rpx
+ * @property {Number} bigger 圆点变大变粗倍数
+ * @property {Number} minSize 圆点最小大小，单位 px
+ * @event {Function} change 选择画笔大小时触发
+ * @example
+ **/
+// v-sign 父组件提供的接口
+let vSignInterface
+// 选项样式
+const type_style = {
+	CIRCLE: 'circle',
+	LINE: 'line'
+}
+export default {
+	name: 'v-sign-pen',
+	props: {
+		// 选项样式
+		type: {
+			type: String,
+			default: type_style.CIRCLE
+		},
+		label: {
+			type: String
+		},
+		// 画笔大小数组，单位是px
+		sizes: {
+			type: Array,
+			default: () => [2, 4, 6, 8, 10]
+		},
+		// 选项颜色
+		color: {
+			type: String,
+			default: '#333'
+		},
+		// 选中项颜色
+		activeColor: {
+			type: String,
+			default: '#333'
+		},
+		// 选中项是否有边框
+		border: {
+			type: Boolean,
+			default: true
+		},
+		// 边框大小, 单位 rpx
+		borderWidth: {
+			type: Number,
+			default: 4
+		},
+		// 选项间隙, 单位 rpx
+		space: {
+			type: Number,
+			default: 20
+		},
+		// 圆点变大变粗倍数
+		bigger: {
+			type: Number,
+			default: 2
+		},
+		// 圆点最小大小，单位 px
+		minSize: {
+			type: Number,
+			default: 4
+		}
+	},
+	inject: ['getSignInterface'],
+	data() {
+		return {
+			type_style,
+			currentSelect: null,
+			csizes: [],
+			maxSize: 0,
+			maxCsize: 0
+		}
+	},
+	computed: {
+		minWrapHeight() {
+			let height
+			switch (this.type) {
+				case type_style.CIRCLE:
+					height = this.maxCsize + 10 + 'px'
+					break
+				case type_style.LINE:
+					height = this.maxSize + 4 + 'px'
+					break
+			}
+			return height
+		}
+	},
+	created() {
+		this.csizes = this.sizes.map((size, index) => {
+			const csize = (index + 1) * this.bigger + this.minSize
+			this.maxSize = csize > this.maxSize ? csize : this.maxSize
+			this.maxCsize = csize > this.maxCsize ? csize : this.maxCsize
+			return {
+				size,
+				csize
+			}
+		})
+		this.currentSelect = this.csizes[0]
+	},
+	mounted() {
+		vSignInterface = this.getSignInterface()
+		this.setLineWidth()
+	},
+	methods: {
+		onItemClick(opt) {
+			this.currentSelect = opt
+			this.setLineWidth()
+			this.$emit('change', opt.size)
+		},
+		setLineWidth() {
+			vSignInterface.setLineWidth(this.currentSelect.size)
+		},
+		defaultInnerStyle(item) {
+			let width
+			let height
+			switch (this.type) {
+				case type_style.CIRCLE:
+					width = `${item.csize}px`
+					height = `${item.csize}px`
+					break
+				case type_style.LINE:
+					width = '20px'
+					height = `${item.size}px`
+					break
+			}
+			const background = this.currentSelect.size === item.size ? this.activeColor : this.color
+			return {
+				width,
+				height,
+				background
+			}
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.v-sign-pen {
+	padding: 12rpx;
+	.label {
+		font-size: 28rpx;
+		color: #333;
+	}
+	.options {
+		display: flex;
+		align-items: flex-end;
+		.opt-item {
+			display: flex;
+			align-items: flex-end;
+			justify-content: center;
+			&:last-child {
+				margin-right: 0;
+			}
+			&:active {
+				transition: transform 0.3s;
+				transform: scale(1.1);
+			}
+			.circle {
+				border-radius: 50%;
+				padding: 4rpx;
+				.inner {
+					border-radius: 50%;
+				}
+			}
+			.line {
+				padding: 4rpx;
+			}
+		}
+	}
+}
+</style>
diff --git a/uni_modules/v-sign/components/v-sign/v-sign.vue b/uni_modules/v-sign/components/v-sign/v-sign.vue
new file mode 100644
index 0000000..0d2d529
--- /dev/null
+++ b/uni_modules/v-sign/components/v-sign/v-sign.vue
@@ -0,0 +1,326 @@
+<template>
+	<view class="signature-wrap">
+		<canvas
+			:canvas-id="cid"
+			:id="cid"
+			@touchstart="onTouchStart"
+			@touchmove="onTouchMove"
+			@touchend="onTouchEnd"
+			disable-scroll
+			:style="[
+				{
+					width: width && formatSize(width),
+					height: height && formatSize(height)
+				},
+				customStyle
+			]"
+		></canvas>
+		<slot />
+	</view>
+</template>
+
+<script>
+/**
+ * sign canvas 手写签名
+ * @description 设置线条宽度、颜色，撤回，清空
+ * @tutorial
+ * @property {String} cid canvas id 不设置则默认为 v-sign-时间戳
+ * @property {String, Number} width canvas 宽度
+ * @property {String, Number} height canvas 高度
+ * @property {bgColor} bgColor 画布背景颜色
+ * @property {Object} customStyle canvas 自定义样式
+ * @property {String} lineWidth 画笔大小，权重小于 v-sign-pen 组件设置的画笔大小
+ * @property {Number} lineColor 画笔颜色，权重小于 v-sign-pen 组件设置的画笔大小
+ * @event {Function} init 当创建完 canvas 实例后触发，向外提供 canvas实例，撤回，清空方法
+ * @example <v-sign @init="signInit"></v-sign>
+ */
+import { formatSize } from '../../utils'
+
+export default {
+	name: 'v-sign',
+	props: {
+		// canvas id
+		cid: {
+			type: String,
+			default: `v-sign-${Date.now()}`
+			// required: true
+		},
+		// canvas 宽度
+		width: {
+			type: [String, Number]
+		},
+		// canvas 高度
+		height: {
+			type: [String, Number]
+		},
+		// 画笔大小，权重小于 v-sign-pen 组件设置的画笔大小 penLineWidth
+		lineWidth: {
+			type: Number,
+			default: 4
+		},
+		// 线颜色，权重小于 v-sign-color 组件设置的画笔颜色 penLineColor
+		lineColor: {
+			type: String,
+			default: '#333'
+		},
+		// 画布背景颜色
+		bgColor: {
+			type: String,
+			default: '#fff'
+		},
+		// canvas自定义样式
+		customStyle: {
+			type: Object,
+			default: () => ({})
+		}
+	},
+	provide() {
+		return {
+			getSignInterface: this.provideSignInterface
+		}
+	},
+	data() {
+		return {
+			formatSize,
+			lineData: [],
+			winWidth: 0,
+			winHeight: 0,
+			penLineWidth: null, // v-sign-pen 组件设置的画笔大小
+			penLineColor: null // v-sign-color 组件设置的颜色
+		}
+	},
+	created() {
+		// 获取窗口宽高
+		const { windowWidth, windowHeight } = uni.getSystemInfoSync()
+		this.winWidth = windowWidth
+		this.winHeight = windowHeight
+	},
+	onReady() {
+		// 获取窗口宽高
+		const { windowWidth, windowHeight } = uni.getSystemInfoSync()
+		this.winWidth = windowWidth
+		this.winHeight = windowHeight
+	},
+	mounted() {
+		this.canvasCtx = uni.createCanvasContext(this.cid, this)
+		// h5 需延迟绘制，否则绘制失败
+		// #ifdef H5
+		setTimeout(() => {
+			// #endif
+			this.setBackgroundColor(this.bgColor)
+			// #ifdef H5
+		}, 10)
+		// #endif
+		// 初始化完成，触发 init 事件
+		this.$emit('init', this.provideSignInterface())
+	},
+	methods: {
+		onTouchStart(e) {
+			const pos = e.touches[0]
+			this.lineData.push({
+				style: {
+					color: this.penLineColor || this.lineColor,
+					width: this.penLineWidth || this.lineWidth
+				},
+				// 屏幕坐标
+				coordinates: [
+					{
+						type: e.type,
+						x: pos.x,
+						y: pos.y
+					}
+				]
+			})
+			this.drawLine()
+		},
+		onTouchMove(e) {
+			const pos = e.touches[0]
+			this.lineData[this.lineData.length - 1].coordinates.push({
+				type: e.type,
+				x: pos.x,
+				y: pos.y
+			})
+			this.drawLine()
+		},
+		onTouchEnd(e) {
+			this.$emit('end', this.lineData)
+		},
+		// 清空画布
+		clear() {
+			this.lineData = []
+			this.canvasCtx.clearRect(0, 0, this.winWidth, this.winHeight)
+			this.canvasCtx.draw()
+			this.setBackgroundColor(this.bgColor)
+			this.$emit('clear')
+		},
+		// 撤销
+		revoke() {
+			this.setBackgroundColor(this.bgColor)
+			this.lineData.pop()
+			this.lineData.forEach((item, index) => {
+				this.canvasCtx.beginPath()
+				this.canvasCtx.setLineCap('round')
+				this.canvasCtx.setStrokeStyle(item.style.color)
+				this.canvasCtx.setLineWidth(item.style.width)
+				if (item.coordinates.length < 2) {
+					const pos = item.coordinates[0]
+					this.canvasCtx.moveTo(pos.x, pos.y)
+					this.canvasCtx.lineTo(pos.x + 1, pos.y)
+				} else {
+					item.coordinates.forEach(pos => {
+						if (pos.type == 'touchstart') {
+							this.canvasCtx.moveTo(pos.x, pos.y)
+						} else {
+							this.canvasCtx.lineTo(pos.x, pos.y)
+						}
+					})
+				}
+				this.canvasCtx.stroke()
+			})
+			this.canvasCtx.draw(true)
+			this.$emit('revoke', this.lineData)
+		},
+		// 绘制线条
+		drawLine() {
+			const lineDataLen = this.lineData.length
+			if (!lineDataLen) return
+			const currentLineData = this.lineData[lineDataLen - 1]
+			const coordinates = currentLineData.coordinates
+			const coordinatesLen = coordinates.length
+			if (!coordinatesLen) return
+			let startPos
+			let endPos
+			if (coordinatesLen < 2) {
+				// only start, no move event
+				startPos = coordinates[coordinatesLen - 1]
+				endPos = {
+					x: startPos.x + 1,
+					y: startPos.y
+				}
+			} else {
+				startPos = coordinates[coordinatesLen - 2]
+				endPos = coordinates[coordinatesLen - 1]
+			}
+
+			const style = currentLineData.style
+			this.canvasCtx.beginPath()
+			this.canvasCtx.setLineCap('round')
+			this.canvasCtx.setStrokeStyle(style.color)
+			this.canvasCtx.setLineWidth(style.width)
+			this.canvasCtx.moveTo(startPos.x, startPos.y)
+			this.canvasCtx.lineTo(endPos.x, endPos.y)
+			// const P1 = this.caculateBezier(startPos, endPos, centerPos)
+			// console.log(P1.x, P1.y)
+			// this.canvasCtx.moveTo(startPos.x, startPos.y)
+			// this.canvasCtx.quadraticCurveTo(P1.x, P1.y, endPos.x, endPos.y)
+			this.canvasCtx.stroke()
+			this.canvasCtx.draw(true)
+		},
+		// 保存png图片，文件名配置 filename 仅支持 h5
+		async saveImage(filename = '签名') {
+			const tempFilePath = await this.canvasToTempFilePath()
+			return new Promise((resolve, reject) => {
+				// #ifdef H5
+				try {
+					const a = document.createElement('a')
+					a.href = tempFilePath
+					a.download = filename
+					document.body.appendChild(a)
+					a.click()
+					a.remove()
+					resolve({
+						errMsg: 'saveImageH5:ok'
+					})
+				} catch (e) {
+					console.error(e)
+					reject(e)
+				}
+				// #endif
+				// #ifndef H5
+				uni.saveImageToPhotosAlbum({
+					filePath: tempFilePath,
+					success(resObj) {
+						resolve(resObj)
+					},
+					fail(err) {
+						reject(err)
+					}
+				})
+				// #endif
+			})
+		},
+		// canvas 保存为临时图片路径，h5返回 base64
+		canvasToTempFilePath(conf = {}) {
+			return new Promise((resolve, reject) => {
+				uni.canvasToTempFilePath(
+					{
+						canvasId: this.cid,
+						...conf,
+						success: res => {
+							resolve(res.tempFilePath)
+						},
+						fail: err => {
+							console.log('fail', err)
+							reject(err)
+						}
+					},
+					this
+				)
+			})
+		},
+		setBackgroundColor(color = '#fff') {
+			this.canvasCtx.beginPath()
+			this.canvasCtx.setFillStyle(color)
+			this.canvasCtx.fillRect(0, 0, this.winWidth, this.winHeight)
+			this.canvasCtx.fill()
+			this.canvasCtx.draw(true)
+		},
+		setLineWidth(numberVal) {
+			this.penLineWidth = numberVal
+		},
+		setLineColor(strValue) {
+			this.penLineColor = strValue
+		},
+		// 向外暴露内部方法
+		provideSignInterface() {
+			return {
+				cid: this.cid,
+				ctx: this.canvasCtx,
+				clear: this.clear,
+				revoke: this.revoke,
+				saveImage: this.saveImage,
+				canvasToTempFilePath: this.canvasToTempFilePath,
+				setLineWidth: this.setLineWidth,
+				setLineColor: this.setLineColor,
+				setBackgroundColor: this.setBackgroundColor,
+				getLineData: () => this.lineData
+			}
+		},
+		/**
+		 * 计算二次贝塞尔曲线 控制点 P1
+		 * 起点 P0(x0,y0)、控制点P1(x1, y1)、P2(x2, y2)、曲线上任意点B(x, y)
+		 * 二次贝塞尔公式：B(t) = (1-t)²P0 + 2t(1-t)P1 + t²P2
+		 * 代入坐标得：
+		 * x = (1-t)²*x0 + 2t(1-t)*x1 + t²*x2
+		 * y = (1-t)²*y0 + 2t(1-t)*y1 + t²*y2
+		 */
+		caculateBezier(P0, P2, B, t = 0.5) {
+			const { x: x0, y: y0 } = P0
+			const { x: x2, y: y2 } = P2
+			const { x, y } = B
+			let x1 = (x - (1 - t) * (1 - t) * x0 - t * t * x2) / (2 * t * (1 - t))
+			let y1 = (y - (1 - t) * (1 - t) * y0 - t * t * y2) / (2 * t * (1 - t))
+			return {
+				x: x1,
+				y: y1
+			}
+		}
+	}
+}
+</script>
+
+<style lang="scss" scoped>
+.signature-wrap {
+	position: relative;
+}
+</style>
diff --git a/uni_modules/v-sign/package.json b/uni_modules/v-sign/package.json
new file mode 100644
index 0000000..18e537c
--- /dev/null
+++ b/uni_modules/v-sign/package.json
@@ -0,0 +1,84 @@
+{
+  "id": "v-sign",
+  "displayName": "canvas 手写 签名 签字 画板组件",
+  "version": "0.5.2",
+  "description": "基于 canvas 实现；1. 支持线条自定义样式；2. 支持撤回、清空、导出图片等功能；3. 内置按钮、画笔等子组件。",
+  "keywords": [
+    "canvas",
+    "签名",
+    "签字",
+    "电子签名",
+    "signature"
+],
+  "repository": "https://github.com/jizai1125/v-sign",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "category": [
+        "前端组件",
+        "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "插件不采集任何数据",
+      "permissions": "无"
+    },
+    "npmurl": ""
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "Vue": {
+          "vue2": "y",
+          "vue3": "n"
+        },
+        "App": {
+          "app-vue": "u",
+          "app-nvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/uni_modules/v-sign/readme.md b/uni_modules/v-sign/readme.md
new file mode 100644
index 0000000..696e33d
--- /dev/null
+++ b/uni_modules/v-sign/readme.md
@@ -0,0 +1,245 @@
+# v-sign 手写签名
+
+**如有问题或者建议，欢迎留言或加群联系我（群号：736123963）！！！将保持维护！！！**
+
+<img src="https://i.loli.net/2021/12/02/bgsfnDmCzXGq8ct.png" alt="uniapp 交流群群聊二维码" style="zoom: 80%;" />
+
+## 快速使用
+
+基础示例，具体说明见下方 API，**若需要使用内置子组件，见下方子组件说明。**
+
+```html
+<template>
+	<v-sign :width="winWidth + 'px'" @init="onSignInit"></v-sign>
+	<button @click="clear">清空<button>
+</template>
+<script>
+  export default {
+    data() {
+      return {
+        winWidth: 0
+      }
+    },
+    created() {
+      // 宽度设为可使用窗口宽度
+      const { windowWidth } = uni.getSystemInfoSync()
+      this.winWidth = windowWidth
+    },
+    methods: {
+      onSignInit(signCtx) {
+        this.signCtx = signCtx
+      },
+      // 清空
+      clear() {
+        this.signCtx.clear()
+      }
+    }
+  }
+</script>
+```
+
+## API
+
+### 属性 (Props)
+
+|   属性名    |     类型      |    默认值     |             说明             |
+| :---------: | :-----------: | :-----------: | :--------------------------: |
+|     cid     |    String     | v-sign-时间戳 |          canvas id           |
+|    width    | String/Number |       -       | canvas 宽度，Number 单位 rpx |
+|   height    | String/Number |       -       | canvas 高度，Number 单位 rpx |
+| customStyle |    Object     |       -       |      canvas 自定义样式       |
+|  lineWidth  |    Number     |       4       |        线宽，单位 px         |
+|  lineColor  |    String     |     #333      |            线颜色            |
+|   bgColor   |    String     |     #fff      |         画布背景颜色         |
+
+### 事件（Events）
+
+| 事件称名 |                              说明                              |               返回值               |
+| :------: | :------------------------------------------------------------: | :--------------------------------: |
+|  @init   | 创建完 canvas 实例后触发，向外提供 canvas 实例，撤回，清空方法 | Object：具体见下方事件回调参数说明 |
+|  @clear  |                         清空画布后触发                         |                 -                  |
+| @revoke  |                         撤销操作后触发                         |            坐标信息数组            |
+|   @end   |                       每次绘制结束后触发                       |            坐标信息数组            |
+
+### 事件回调参数说明
+
+#### **`init(ctx: SignContext)`**
+
+可以通过该事件回调暴露的 clear、revoke 等方法操作画布。
+
+```java
+interface SignContext {
+  // canvas 实例
+	ctx: object;
+	// 清空画布
+	clear(): void;
+	// 撤回
+	revoke(): void;
+  // 保存 png 图片，文件名 filename 配置仅支持 h5
+  saveImage(filename: string): Promise<object>;
+  // 返回图片临时文件路径，config 参数同 uni.canvasToTempFilePath方法，内部只是做了 Promise 化处理而已
+  canvasToTempFilePath(config: object): Promise<object>;
+  // 设置画布背景色
+  setBackgroundColor(color: string): void;
+  setLineWidth(value: number): void;
+  setLineColor(value: string): void;
+  // 获取坐标信息数组
+  getLineData(): Array<object>;
+}
+```
+
+示例：
+
+```html
+<template>
+	<v-sign @init="onSignInit"></v-sign>
+	<button @click="clear">清空<button>
+	<button @click="revoke">撤回<button>
+    <button @click="saveTempFilePath">保存临时图片路径<button>
+    <button @click="saveImage">保存图片<button>
+</template>
+<script>
+  export default {
+    methods: {
+      onSignInit(signCtx) {
+          this.signCtx = signCtx
+      },
+      // 清空
+      clear() {
+          this.signCtx.clear()
+      },
+      // 撤回
+      revoke() {
+          this.signCtx.revoke()
+      },
+      // 保存为临时图片路径，h5返回 base64
+      saveTempFilePath() {
+          this.signCtx.canvasToTempFilePath()
+      },
+      // 保存 png 图片
+      saveImage() {
+          this.signCtx.saveImage()
+      }
+    }
+  }
+</script>
+```
+
+# 子组件
+
+子组件需要包裹在 `v-sign` 组件内使用！！！
+
+## 按钮控件（v-sign-action）
+
+### 示例
+
+```html
+<template>
+  <v-sign>
+    <v-sign-action @save="save" @clear="clear" @prev="revoke"></v-sign-action>
+  </v-sign>
+</template>
+<script>
+  export default {
+    methods: {
+      save(tempFilePath) {
+        console.log(tempFilePath);
+      },
+    },
+  };
+</script>
+```
+
+### API
+
+### 属性 (Props)
+
+|   属性名    |     类型      |          默认值           |                          说明                          |
+| :---------: | :-----------: | :-----------------------: | :----------------------------------------------------: |
+|   actions   |     Array     | ["clear", "prev", "save"] | 按钮配置；清空（clear）, 撤回（prev） 保存图片（save） |
+|   border    |    Boolean    |           true            |                     按钮是否有边框                     |
+|    space    | String/Number |            12             |               按钮间隔，Number 单位 rpx                |
+| customStyle |    Object     |             -             |                    根元素自定义样式                    |
+
+### 事件（Events）
+
+点击对应类型按钮触发对应事件， 例如：配置了清空（clear）按钮，点击则触发 clear 事件。
+
+---
+
+## 画笔组件（v-sign-pen）
+
+### 示例
+
+```html
+<template>
+  <v-sign>
+    <v-sign-pen></v-sign-pen>
+  </v-sign>
+</template>
+<script>
+  export default {};
+</script>
+```
+
+### API
+
+### 属性 (Props)
+
+|   属性名    |  类型   |      默认值      |             说明             |
+| :---------: | :-----: | :--------------: | :--------------------------: |
+|    type     | String  |      circle      | 选项样式，可选 circle \ line |
+|    label    | String  |        -         |             标签             |
+|    sizes    |  Array  | [2, 4, 6, 8, 10] |    画笔尺寸数组，单位 px     |
+|    color    | String  |       #333       |           选项颜色           |
+| activeColor | String  |       #333       |          选中项颜色          |
+|   border    | Boolean |       true       |       选中项是否有边框       |
+| borderWidth | Number  |        4         |      边框大小，单位 rpx      |
+|    space    | Number  |        20        |      选项间隙，单位 rpx      |
+|   bigger    | Number  |        2         |       圆点变大变粗倍数       |
+|   minSize   | Number  |        4         |    圆点最小尺寸，单位 px     |
+
+### 事件（Events）
+
+| 事件称名 |        说明        |       返回值       |
+| :------: | :----------------: | :----------------: |
+| @change  | 选择画笔大小时触发 | size：画笔尺寸大小 |
+
+---
+
+## 颜色选择器组件（v-sign-color）
+
+### 示例
+
+```html
+<template>
+  <v-sign>
+    <v-sign-color></v-sign-color>
+  </v-sign>
+</template>
+<script>
+  export default {};
+</script>
+```
+
+### API
+
+### 属性 (Props)
+
+|   属性名    |     类型      |                             默认值                              |         说明          |
+| :---------: | :-----------: | :-------------------------------------------------------------: | :-------------------: |
+|    type     |    String     |                             square                              | 选项样式，可选 circle |
+|    color    |    String     |                                -                                |       默认颜色        |
+|   options   |     Array     | ['#333', '#f44236', '#3f51b5', '#2195f3', '#ffeb3b', '#ff9900'] |        备选色         |
+|    size     | Number/String |                               44                                | 圆/方形大小，单位 rpx |
+|    tick     |    Boolean    |                              true                               |     是否选中打勾      |
+|  tickSize   | Number/String |                               24                                |        勾大小         |
+| borderColor |    String     |                              #fff                               |       边框颜色        |
+|   border    |    Boolean    |                              false                              |      是否有边框       |
+|    space    | Number/String |                               16                                |       选项间隙        |
+
+### 事件（Events）
+
+| 事件称名 |      说明      | 返回值 |
+| :------: | :------------: | :----: |
+| @change  | 选择颜色时触发 | color  |
diff --git a/uni_modules/v-sign/static/image/clear.png b/uni_modules/v-sign/static/image/clear.png
new file mode 100644
index 0000000..032e7aa
Binary files /dev/null and b/uni_modules/v-sign/static/image/clear.png differ
diff --git a/uni_modules/v-sign/static/image/clear.svg b/uni_modules/v-sign/static/image/clear.svg
new file mode 100644
index 0000000..0285fbe
--- /dev/null
+++ b/uni_modules/v-sign/static/image/clear.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1639214313546" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="827" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M274.56 798.997333l19.434667-25.130666-33.792 68.565333a18.133333 18.133333 0 0 0 11.562666 25.536l59.733334 16a18.133333 18.133333 0 0 0 17.28-4.48c20.522667-19.818667 35.626667-35.989333 45.290666-48.469333l19.456-25.130667-33.813333 68.565333a18.133333 18.133333 0 0 0 11.562667 25.536l84.48 22.634667a18.133333 18.133333 0 0 0 17.28-4.48c20.522667-19.84 35.626667-35.989333 45.269333-48.469333l19.456-25.130667-33.813333 68.565333A18.133333 18.133333 0 0 0 535.530667 938.666667l72.106666 19.328a18.133333 18.133333 0 0 0 17.28-4.48c20.522667-19.84 35.626667-36.010667 45.269334-48.490667l19.456-25.130667-33.813334 68.586667a18.133333 18.133333 0 0 0 11.584 25.514667l86.421334 23.338666 3.84-0.213333c13.269333-0.704 29.056-5.034667 43.84-12.8 29.781333-15.701333 48.170667-43.2 52.181333-78.250667 2.133333-18.517333 4.778667-38.549333 8.405333-63.530666 1.642667-11.221333 2.944-20.010667 6.229334-41.834667 11.050667-73.322667 14.634667-101.034667 17.130666-133.674667l0.938667-12.373333 2.837333-2.922667 12.330667-1.344a41.813333 41.813333 0 0 0 24.810667-11.221333c10.730667-10.24 14.805333-25.386667 11.093333-42.197333l-37.546667-171.584c-3.029333-13.696-11.264-27.946667-23.146666-39.829334-11.648-11.626667-25.92-20.138667-39.893334-23.893333L723.626667 331.306667l-2.261334-3.925334L774.250667 130.133333c8.32-31.061333-11.754667-63.744-44.970667-72.64l-79.509333-21.312c-33.194667-8.896-66.922667 9.365333-75.264 40.426667l-52.842667 197.269333-3.925333 2.261334-118.101334-31.637334c-13.994667-3.754667-30.634667-3.498667-46.506666 0.746667-16.256 4.352-30.506667 12.586667-39.957334 22.933333l-118.314666 129.792c-11.605333 12.714667-15.658667 27.84-11.52 42.090667 4.16 14.229333 15.850667 25.194667 32.896 30.528l13.610666 4.266667 2.133334 3.882666-3.626667 13.802667c-21.12 79.850667-52.885333 136.917333-85.717333 150.890667-47.530667 20.202667-72.938667 49.429333-78.421334 85.034666-5.034667 32.682667 9.28 67.114667 37.589334 91.541334l22.037333 8.341333 74.666667 20.010667a42.666667 42.666667 0 0 0 41.216-11.050667c15.274667-15.274667 26.88-28.032 34.837333-38.293333z m551.381333-396.565333c14.144 3.797333 29.952 19.2 32.768 32l34.56 157.781333a10.666667 10.666667 0 0 1-13.184 12.586667L240.64 433.493333a10.666667 10.666667 0 0 1-5.12-17.493333l108.8-119.36c8.832-9.685333 30.229333-15.146667 44.373333-11.349333l141.333334 37.866666a21.333333 21.333333 0 0 0 26.133333-15.082666l58.304-217.642667a21.333333 21.333333 0 0 1 26.133333-15.082667l77.056 20.650667a21.333333 21.333333 0 0 1 15.082667 26.133333l-58.325333 217.642667a21.333333 21.333333 0 0 0 15.082666 26.112l136.448 36.565333zM315.456 701.568c-33.664 45.141333-64.597333 79.082667-92.8 101.802667l-5.909333 4.778666-2.837334 0.597334-88.106666-24.106667-2.922667-3.2c-13.034667-14.165333-19.370667-31.04-16.981333-46.592 3.285333-21.333333 22.058667-39.338667 53.205333-52.586667 31.722667-13.482667 59.818667-47.104 82.922667-99.904 10.026667-22.954667 18.88-48.725333 26.389333-76.586666l3.882667-14.4 3.904-2.261334 566.165333 151.701334 2.346667 3.306666-0.789334 12.224c-1.984 30.592-30.336 229.397333-32.128 244.906667-2.346667 20.416-11.306667 34.986667-27.605333 44.394667a73.237333 73.237333 0 0 1-21.397333 8.106666l-5.013334 0.725334-60.373333-16.170667 11.242667-20.288c8.277333-14.976 22.656-43.84 43.093333-86.613333a21.12 21.12 0 0 0-9.962667-28.16l-3.136-1.493334a21.333333 21.333333 0 0 0-26.261333 6.485334c-33.642667 45.056-64.533333 78.912-92.672 101.546666l-5.909333 4.757334-2.837334 0.597333-52.544-14.08 11.114667-20.266667c3.562667-6.485333 7.04-13.013333 10.453333-19.626666 7.04-13.504 17.898667-35.797333 32.597334-66.816a21.290667 21.290667 0 0 0-9.984-28.309334l-3.029334-1.450666a21.333333 21.333333 0 0 0-26.368 6.442666c-33.6 45.013333-64.469333 78.826667-92.608 101.482667l-5.909333 4.757333-2.837333 0.597334-52.138667-13.973334 11.114667-20.266666c3.242667-5.888 6.72-12.416 10.453333-19.626667 6.997333-13.461333 17.962667-35.946667 32.896-67.434667a20.970667 20.970667 0 0 0-10.112-28.010666l-3.328-1.536a21.333333 21.333333 0 0 0-26.069333 6.613333c-33.642667 45.056-64.554667 78.976-92.778667 101.696l-5.909333 4.757333-2.837334 0.597334-32.64-8.746667 11.093334-20.245333c3.541333-6.506667 7.04-13.034667 10.453333-19.626667 6.976-13.482667 17.941333-35.968 32.874667-67.456a21.056 21.056 0 0 0-10.069334-28.074667l-3.242666-1.514666a21.333333 21.333333 0 0 0-26.154667 6.549333z" fill="#333333" p-id="828"></path></svg>
\ No newline at end of file
diff --git a/uni_modules/v-sign/static/image/next.png b/uni_modules/v-sign/static/image/next.png
new file mode 100644
index 0000000..20cbf6c
Binary files /dev/null and b/uni_modules/v-sign/static/image/next.png differ
diff --git a/uni_modules/v-sign/static/image/next.svg b/uni_modules/v-sign/static/image/next.svg
new file mode 100644
index 0000000..36e2445
--- /dev/null
+++ b/uni_modules/v-sign/static/image/next.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1639214327673" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1119" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M588.8 934.4c-17.066667-4.266667-25.6-21.333333-25.6-38.4v-204.8c-68.266667-8.533333-128-4.266667-192 12.8-76.8 21.333333-170.666667 93.866667-273.066667 213.333333-12.8 17.066667-34.133333 21.333333-51.2 12.8-17.066667-8.533333-29.866667-25.6-25.6-42.666666 17.066667-162.133333 76.8-298.666667 187.733334-405.333334 98.133333-98.133333 213.333333-153.6 349.866666-166.4V128c0-17.066667 8.533333-34.133333 25.6-38.4 17.066667-8.533333 34.133333-4.266667 46.933334 8.533333l358.4 375.466667c17.066667 17.066667 17.066667 42.666667 0 59.733333l-358.4 392.533334c-8.533333 8.533333-21.333333 12.8-29.866667 12.8-4.266667 0-8.533333 0-12.8-4.266667z m55.466667-699.733333v123.733333c0 21.333333-17.066667 42.666667-42.666667 42.666667-132.266667 0-243.2 46.933333-337.066667 140.8-59.733333 59.733333-102.4 128-128 204.8 72.533333-68.266667 145.066667-110.933333 209.066667-128 85.333333-21.333333 166.4-25.6 260.266667-8.533334 21.333333 4.266667 34.133333 21.333333 34.133333 42.666667v132.266667l256-281.6-251.733333-268.8z" fill="#333333" p-id="1120"></path></svg>
\ No newline at end of file
diff --git a/uni_modules/v-sign/static/image/prev.png b/uni_modules/v-sign/static/image/prev.png
new file mode 100644
index 0000000..e81d3b9
Binary files /dev/null and b/uni_modules/v-sign/static/image/prev.png differ
diff --git a/uni_modules/v-sign/static/image/prev.svg b/uni_modules/v-sign/static/image/prev.svg
new file mode 100644
index 0000000..5a67586
--- /dev/null
+++ b/uni_modules/v-sign/static/image/prev.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1639214320974" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="973" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M422.4 938.666667c-12.8 0-21.333333-4.266667-29.866667-12.8L34.133333 533.333333c-17.066667-17.066667-12.8-42.666667 0-59.733333l358.4-375.466667c8.533333-12.8 25.6-17.066667 42.666667-8.533333s25.6 21.333333 25.6 38.4v187.733333c136.533333 8.533333 256 64 354.133333 166.4 106.666667 106.666667 170.666667 243.2 187.733334 405.333334 0 17.066667-8.533333 38.4-25.6 42.666666-17.066667 8.533333-38.4 4.266667-51.2-12.8-98.133333-119.466667-192-196.266667-273.066667-213.333333-64-17.066667-123.733333-21.333333-192-12.8V896c0 17.066667-12.8 34.133333-25.6 38.4-4.266667 4.266667-8.533333 4.266667-12.8 4.266667z m-298.666667-435.2l256 281.6v-132.266667c0-21.333333 17.066667-38.4 34.133334-42.666667 93.866667-17.066667 174.933333-12.8 260.266666 8.533334 64 17.066667 136.533333 59.733333 209.066667 128-25.6-76.8-72.533333-149.333333-128-204.8-93.866667-93.866667-204.8-140.8-337.066667-140.8-21.333333 0-42.666667-21.333333-42.666666-42.666667V234.666667l-251.733334 268.8z" fill="#333333" p-id="974"></path></svg>
\ No newline at end of file
diff --git a/uni_modules/v-sign/static/image/save.png b/uni_modules/v-sign/static/image/save.png
new file mode 100644
index 0000000..5269210
Binary files /dev/null and b/uni_modules/v-sign/static/image/save.png differ
diff --git a/uni_modules/v-sign/static/image/save.svg b/uni_modules/v-sign/static/image/save.svg
new file mode 100644
index 0000000..e97dcf7
--- /dev/null
+++ b/uni_modules/v-sign/static/image/save.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1639214153477" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="861" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M62.848 60.992h704v64h-704zM62.848 640.832h543.936v64H62.848z" fill="#333333" p-id="862"></path><path d="M702.848 60.992h64v320h-64zM62.848 113.536h64v527.296h-64z" fill="#333333" p-id="863"></path><path d="M70.528 498.304l218.24-117.312 30.4 56.32-218.304 117.376z" fill="#333333" p-id="864"></path><path d="M298.432 375.04l144.896 274.176-56.576 29.888L241.92 404.928zM512 194.176h126.592v127.168H512zM663.296 448.448h128v320h-128z" fill="#333333" p-id="865"></path><path d="M599.36 764.992l127.936 128 128.064-128z" fill="#333333" p-id="866"></path></svg>
\ No newline at end of file
diff --git a/uni_modules/v-sign/utils/index.js b/uni_modules/v-sign/utils/index.js
new file mode 100644
index 0000000..270dcf7
--- /dev/null
+++ b/uni_modules/v-sign/utils/index.js
@@ -0,0 +1,15 @@
+/**
+ * 判断是否未数值
+ * @param {Object} val
+ */
+export function isNumber(val) {
+	return !isNaN(Number(val))
+}
+
+/**
+ * 处理大小单位
+ * @param {Object} val
+ */
+export function formatSize(val, unit = 'rpx') {
+	return isNumber(val) ? `${val}${unit}` : val
+}
diff --git a/user/pages/address/edit.vue b/user/pages/address/edit.vue
new file mode 100644
index 0000000..423d8e4
--- /dev/null
+++ b/user/pages/address/edit.vue
@@ -0,0 +1,305 @@
+<template>
+	<view class="apply-pages" v-if="isLoad">
+		<view class="apply-form pl-lg pr-lg">
+			<view class="fill-base mt-md radius-16">
+				<view class="flex-between ml-lg mr-lg b-1px-b">
+					<view class="item-text">联系人</view>
+					<input v-model="form.user_name" type="text" class="item-input flex-1" maxlength="20"
+						:placeholder="rule[0].errorMsg" />
+				</view>
+				<view class="flex-between ml-lg mr-lg">
+					<view class="item-text">手机号</view>
+					<input v-model="form.mobile" type="text" class="item-input flex-1"
+						:placeholder="rule[1].errorMsg" />
+				</view>
+			</view>
+			<view class="fill-base mt-md radius-16">
+				<view class="flex-between ml-lg mr-lg b-1px-b">
+					<view class="item-text">选择地区</view>
+					<view @tap.stop="toChooseLocation" class="item-input text flex-1">
+						<view class="flex-y-center text-right">
+							<view class="flex-1 text-right">{{form.address || `点击右边图标设置`}}</view><i
+								class="iconfont iconjuli ml-sm" :style="{color: primaryColor}"></i>
+						</view>
+					</view>
+				</view>
+				<view class="flex-between ml-lg mr-lg">
+					<view class="item-text">详细地址</view>
+					<input v-model="form.address_info" type="text" class="item-input flex-1"
+						:placeholder="rule[3].errorMsg" />
+				</view>
+			</view>
+			<view class="fill-base mt-md radius-16">
+				<view class="flex-between ml-lg mr-lg">
+					<view class="item-text flex-1" style="width: 300rpx;">设为默认地址</view>
+					<!-- status 1默认； -->
+					<view @tap.stop="form.status = form.status ==1 ? 0 : 1" class="item-input">
+						<i class="iconfont icon-switch" :class="[{'icon-switch-on':form.status==1}]"
+							:style="{color:form.status==1? primaryColor:'#f2f2f2'}"></i>
+					</view>
+				</view>
+			</view>
+			<view class="f-icontext c-caption mt-md"> 设置后，下单时优先展示该地址</view>
+		</view>
+
+		<view class="space-max-footer"></view>
+
+		<fix-bottom-button @cancel="toDel" @confirm="submit" :text="textArr" bgColor="#fff"></fix-bottom-button>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		data() {
+			return {
+				isLoad: false,
+				options: {},
+				textArr: [{
+					text: '删除',
+					type: 'cancel'
+				}, {
+					text: '保存',
+					type: 'confirm'
+				}],
+				form: {
+					id: 0,
+					user_name: '',
+					mobile: '',
+					address: '',
+					address_info: '',
+					lng: '',
+					lat: '',
+					status: 0
+				},
+				rule: [{
+						name: "user_name",
+						checkType: "isNotNull",
+						errorMsg: "输入联系人姓名",
+						regType: 2
+					}, {
+						name: "mobile",
+						checkType: "isMobile",
+						errorMsg: "输入手机号"
+					},
+					{
+						name: "address",
+						checkType: "isNotNull",
+						errorMsg: "设置地区"
+					},
+					{
+						name: "address_info",
+						checkType: "isNotNull",
+						errorMsg: "输入街道、楼牌号等",
+						regType: 2
+					},
+				],
+				lockTap: false
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			location: state => state.user.location,
+		}),
+		onLoad(options) {
+			this.options = options
+			this.initIndex()
+		},
+		methods: {
+			...mapMutations(['updateUserItem', 'updateOrderItem']),
+			async initIndex() {
+				// #ifdef H5
+				if (this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				let {
+					id = 0
+				} = this.options
+				uni.setNavigationBarTitle({
+					title: id ? `编辑地址` : `添加新地址`
+				})
+				if (!id) {
+					this.textArr.splice(0, 1)
+					this.isLoad = true
+					this.$util.setNavigationBarColor({
+						bg: this.primaryColor
+					})
+					return
+				}
+				let data = await this.$api.mine.addressInfo({
+					id
+				})
+				for (let key in this.form) {
+					this.form[key] = data[key]
+				}
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				this.isLoad = true
+			},
+			// 选择地区
+			async toChooseLocation(e) {
+				await this.$util.checkAuth({
+					type: 'userLocation'
+				})
+				let {
+					lat: locaLat = '',
+					lng: locaLng = ''
+				} = this.location
+				let {
+					id = 0,
+						lat: addrLat,
+						lng: addrLng
+				} = this.form
+
+				if (id) {
+					locaLat = addrLat
+					locaLng = addrLng
+				}
+
+				let param = {}
+				if (!locaLat && !locaLng) {
+					// #ifdef H5
+					if (this.$jweixin.isWechat()) {
+						this.$util.showLoading()
+						await this.$jweixin.wxReady2();
+						let {
+							latitude,
+							longitude
+						} = await this.$jweixin.getWxLocation()
+						locaLat = latitude
+						locaLng = longitude
+					}
+					// #endif
+					// #ifdef APP-PLUS
+					let location = await this.$util.getBmapLocation()
+					locaLat = location.lat
+					locaLng = location.lng
+					// #endif
+				}
+
+				// #ifndef MP-WEIXIN
+				param = {
+					latitude: locaLat,
+					longitude: locaLng
+				}
+				// #endif
+				let [, {
+					address = '',
+					longitude,
+					latitude,
+					name
+				}] = await uni.chooseLocation(param);
+				if (!address) return
+				this.form.address = address
+				this.form.lng = longitude
+				this.form.lat = latitude
+			},
+			async toDel() {
+				let [res_del, {
+					confirm
+				}] = await uni.showModal({
+					title: '提示',
+					content: "请确认是否要删除此数据?"
+				})
+				if (!confirm) return;
+				let {
+					id
+				} = this.form
+				let {
+					check_id
+				} = this.$util.getPage(-1)
+				if (this.lockTap) return
+				this.lockTap = true
+				this.$util.showLoading()
+				try {
+					await this.$api.mine.addressDel({
+						id
+					})
+					this.$util.hideAll()
+					this.$util.showToast({
+						title: `删除成功`,
+					});
+					this.lockTap = false
+					if (id == check_id) {
+						this.updateOrderItem({
+							key: 'haveOperItem',
+							val: true
+						})
+					}
+					setTimeout(() => {
+						this.$util.back()
+						this.$util.goUrl({
+							url: 1,
+							openType: `navigateBack`
+						})
+					}, 1000)
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+			},
+			//表单验证
+			validate(param) {
+				let validate = new this.$util.Validate();
+				this.rule.map(item => {
+					let {
+						name,
+					} = item
+					validate.add(param[name], item);
+				})
+				let message = validate.start();
+				return message;
+			},
+			async submit() {
+				let param = this.$util.deepCopy(this.form)
+				let msg = this.validate(param);
+				if (msg) {
+					this.$util.showToast({
+						title: msg
+					});
+					return;
+				}
+				if (this.lockTap) return
+				this.lockTap = true
+				this.$util.showLoading()
+				try {
+					let methodModel = param.id ? `addressUpdate` : `addressAdd`
+					await this.$api.mine[methodModel](param)
+					this.$util.hideAll()
+					this.$util.showToast({
+						title: `保存成功`,
+					});
+					setTimeout(() => {
+						this.$util.back()
+						this.$util.goUrl({
+							url: 1,
+							openType: `navigateBack`
+						})
+					}, 1000)
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+</style>
diff --git a/user/pages/address/list.vue b/user/pages/address/list.vue
new file mode 100644
index 0000000..a2be3be
--- /dev/null
+++ b/user/pages/address/list.vue
@@ -0,0 +1,252 @@
+<template>
+	<view class="user-address-list">
+		<view @tap.stop="toUpdateItem(index)" class="item-child mt-md pl-lg pr-lg fill-base radius-16"
+			v-for="(item,index) in list.data" :key="index">
+			<view class="flex-warp pt-lg pb-lg b-1px-b">
+				<view class="address-icon flex-center c-base radius"
+					:style="{background:`linear-gradient(to right, ${subColor}, ${primaryColor})`}"><i
+						class="iconfont iconjuli"></i></view>
+				<view class="address-info flex-1 ml-md">
+					<view class="flex-y-baseline username c-title text-bold">{{item.user_name}}
+						<view class="ml-md f-desc c-caption">{{item.mobile}}</view>
+					</view>
+					<view class="f-desc c-title ellipsis">{{`${item.address} ${item.address_info}`}}</view>
+				</view>
+			</view>
+			<view class="oper-info f-paragraph c-caption flex-between">
+				<view class="flex-y-center"
+					:style="{color:options.check && item.id == check_id || !options.check &&  item.status==1?primaryColor:''}">
+					<i class="iconfont icon-xuanze mr-sm"
+						:class="[{'icon-xuanze-fill':options.check && item.id == check_id || !options.check &&  item.status==1}]"
+						:style="{color:options.check && item.id == check_id || !options.check &&  item.status==1?primaryColor:''}"></i>
+					<block v-if="options.check">{{item.id ==check_id?'当前选择地址':'点击选择'}}</block>
+					<block v-else>{{item.status ==1?'默认地址':'设为默认'}}</block>
+				</view>
+				<view class="flex-center">
+					<view @tap.stop="toDel(index)" class="pl-lg pr-lg">删除</view>
+					<view @tap.stop="goDetail(index)" class="pl-lg">编辑</view>
+				</view>
+			</view>
+		</view>
+
+
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor :tip="[{ text: '你还没有添加地址哦~', color: 0 }]" v-if="!loading&&list.data.length<=0&&list.current_page==1">
+		</abnor>
+		<view class="space-max-footer"></view>
+
+		<fix-bottom-button @confirm="$util.goUrl({url:`/user/pages/address/edit`})"
+			:text="[{text:'添加新地址',type:'confirm'}]" bgColor="#fff"></fix-bottom-button>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		data() {
+			return {
+				options: {},
+				check_id: 0,
+				param: {
+					page: 1,
+				},
+				list: {
+					data: []
+				},
+				loading: true,
+				lockTap: false,
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			userInfo: state => state.user.userInfo,
+			haveOperItem: state => state.order.haveOperItem,
+		}),
+		onLoad(options) {
+			let {
+				check = 0
+			} = options
+			this.options = options
+			if (check) {
+				let {
+					address_info = {
+						id: 0
+					}
+				} = this.$util.getPage(-1).orderInfo
+				let {
+					id
+				} = address_info
+				this.check_id = id
+			}
+			this.updateOrderItem({
+				key: 'haveOperItem',
+				val: false
+			})
+			this.initIndex()
+		},
+		onUnload() {
+			let {
+				check = 0
+			} = this.options
+			let {
+				data = []
+			} = this.list
+			if (check && this.haveOperItem) {
+				this.$util.getPage(-1).orderInfo.address_info = {}
+				this.$util.back()
+			}
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			...mapMutations(['updateUserItem', 'updateOrderItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				await this.getList()
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			async getList() {
+				let {
+					list: oldList,
+					param
+				} = this
+				let newList = await this.$api.mine.addressList(param);
+
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+			},
+			async toUpdateItem(index) {
+				let item = this.list.data[index]
+				if (this.options.check) {
+					this.$util.getPage(-1).orderInfo.address_info = item
+					this.$util.back()
+					this.$util.goUrl({
+						url: 1,
+						openType: `navigateBack`
+					})
+				} else {
+					let {
+						id,
+						status
+					} = item
+					await this.$api.mine.addressUpdate({
+						id,
+						status: status == 0 ? 1 : 0
+					})
+					this.initRefresh()
+				}
+			},
+			async toDel(index) {
+				let [res_del, {
+					confirm
+				}] = await uni.showModal({
+					title: '提示',
+					content: "请确认是否要删除此数据?"
+				})
+				if (!confirm) return;
+				let {
+					id
+				} = this.list.data[index]
+				let {
+					check_id
+				} = this
+				if (this.lockTap) return
+				this.lockTap = true
+				this.$util.showLoading()
+				try {
+					await this.$api.mine.addressDel({
+						id
+					})
+					this.$util.hideAll()
+					this.$util.showToast({
+						title: `删除成功`,
+					});
+					this.list.data.splice(index, 1)
+					this.lockTap = false
+					if (id == check_id) {
+						this.updateOrderItem({
+							key: 'haveOperItem',
+							val: true
+						})
+					}
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+			},
+			goDetail(index) {
+				let {
+					id
+				} = this.list.data[index]
+				let url = `/user/pages/address/edit?id=${id}`
+				this.$util.goUrl({
+					url
+				})
+			},
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.user-address-list {
+		.address-icon {
+			width: 64rpx;
+			height: 64rpx;
+
+			.iconfont {
+				font-size: 38rpx;
+			}
+		}
+
+		.address-info {
+			max-width: 600rpx;
+		}
+
+		.username {
+			font-size: 30rpx;
+		}
+
+		.oper-info {
+			height: 80rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/user/pages/alipay-account.vue b/user/pages/alipay-account.vue
new file mode 100644
index 0000000..335c522
--- /dev/null
+++ b/user/pages/alipay-account.vue
@@ -0,0 +1,188 @@
+<template>
+	<view class="apply-pages" v-if="isLoad">
+		<view class="apply-form">
+			<view class="fill-base pd-lg">
+				<view class="flex-between b-1px-b">
+					<view class="item-text">支付宝账号</view>
+					<input v-model="form.alipay_number" type="text" class="item-input flex-1"
+						:class="[{'mr-md':form.alipay_number}]" maxlength="20" :placeholder="rule[0].errorMsg" />
+					<i @tap.stop="toRest('alipay_number')" class="iconfont icon-jia-bold rotate-45"
+						v-if="form.alipay_number"></i>
+				</view>
+				<view class="flex-between">
+					<view class="item-text">支付宝账号姓名</view>
+					<input v-model="form.alipay_name" type="text" class="item-input flex-1"
+						:class="[{'mr-md':form.alipay_name}]" maxlength="20" :placeholder="rule[1].errorMsg" />
+					<i @tap.stop="toRest('alipay_name')" class="iconfont icon-jia-bold rotate-45"
+						v-if="form.alipay_name"></i>
+				</view>
+				<view class="flex-center mt-lg pt-md pb-lg">
+					<view @tap.stop="submit" class="bind-btn flex-center f-title c-base radius"
+						:style="{background:primaryColor}">立即绑定</view>
+				</view>
+			</view>
+		</view>
+		<view class="pd-lg">
+			<view class="f-title text-bold mb-md">支付宝账号获取：</view>
+			<view class="f-paragraph c-desc mt-md mb-md">1)、打开【支付宝】-【我的】页面</view>
+			<image mode="widthFix" class="item-image radius-16"
+				src="https://lbqny.migugu.com/admin/anmo/mine/alipay-0.jpeg">
+			</image>
+			<view class="f-paragraph c-desc mt-md mb-md">2)、打开上图箭头所示，个人信息页面</view>
+			<image mode="widthFix" class="item-image radius-16"
+				src="https://lbqny.migugu.com/admin/anmo/mine/alipay-1.jpeg">
+			</image>
+			<view class="fill-base pd-lg mt-lg radius-26">
+				<view class="f-title text-bold mb-md">身份信息</view>
+				<view class="f-paragraph c-title mb-md">根据相关法律法规要求，请保持身份信息完整，以便使用支付宝相关功能</view>
+				<image mode="widthFix" class="radius-16" src="https://lbqny.migugu.com/admin/anmo/mine/alipay-2.jpeg">
+				</image>
+			</view>
+		</view>
+
+		<view class="space-footer"></view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		data() {
+			return {
+				isLoad: false,
+				options: {},
+				form: {
+					alipay_number: '',
+					alipay_name: ''
+				},
+				rule: [{
+					name: "alipay_number",
+					checkType: "isNotNull",
+					errorMsg: "请输入您的支付宝账号",
+					regType: 2
+				}, {
+					name: "alipay_name",
+					checkType: "isNotNull",
+					errorMsg: "请输入您的支付宝账号姓名",
+					regType: 2
+				}],
+				lockTap: false
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+			location: state => state.user.location,
+		}),
+		async onLoad(options) {
+			this.$util.showLoading()
+			this.options = options
+			await this.initIndex()
+			this.isLoad = true
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getUserInfo']),
+			...mapMutations(['updateUserItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				let {
+					alipay_number = '',
+						alipay_name = ''
+				} = this.userInfo
+				this.form.alipay_number = alipay_number
+				this.form.alipay_name = alipay_name
+				this.$util.hideAll()
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			toRest(key) {
+				this.$nextTick(() => {
+					this.form[key] = ''
+				})
+			},
+			//表单验证
+			validate(param) {
+				let validate = new this.$util.Validate();
+				this.rule.map(item => {
+					let {
+						name,
+					} = item
+					validate.add(param[name], item);
+				})
+				let message = validate.start();
+				return message;
+			},
+			async submit() {
+				let param = this.$util.deepCopy(this.form)
+				let msg = this.validate(param);
+				if (msg) {
+					this.$util.showToast({
+						title: msg
+					});
+					return;
+				}
+				if (this.lockTap) return
+				this.lockTap = true
+				this.$util.showLoading()
+				try {
+					await this.$api.mine.bindAlipayNumber(param)
+					this.$util.hideAll()
+					this.$util.showToast({
+						title: `绑定成功`
+					});
+					setTimeout(() => {
+						this.$util.back()
+						this.$util.goUrl({
+							url: 1,
+							openType: `navigateBack`
+						})
+					}, 1000)
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.apply-pages {
+		.apply-form {
+			.item-text {
+				width: 250rpx;
+			}
+		}
+
+		.bind-btn {
+			width: 600rpx;
+			height: 80rpx;
+		}
+
+		.item-image {
+			width: 690rpx
+		}
+	}
+</style>
diff --git a/user/pages/alipay-result.vue b/user/pages/alipay-result.vue
new file mode 100644
index 0000000..9a07735
--- /dev/null
+++ b/user/pages/alipay-result.vue
@@ -0,0 +1,221 @@
+<template>
+	<view v-if="isLoad">
+		<view v-if="isWechatAgent">
+			<view class="text-section">
+				<view>点击复制网址去浏览器中打开</view>
+				<view class="pl-lg pr-lg mt-sm ml-lg mr-lg f-paragraph c-desc ellipsis">{{ link }}</view>
+			</view>
+			<view class="button-section">
+				<button class="button copy" @click="copyLink">点击复制</button>
+				<!-- <button class="button off" @click="goDetail">完成支付</button> -->
+			</view>
+		</view>
+		<view v-else>
+			<view class="text-section">
+				<view>{{ content }}</view>
+			</view>
+			<view class="alipaysubmit" v-html="alipayOrderParams.orderInfo"></view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from 'vuex'
+	import siteInfo from '@/siteinfo.js';
+	export default {
+		components: {},
+		data() {
+			return {
+				options: {},
+				isLoad: false,
+				isWechatAgent: false,
+				link: '',
+				content: '正在支付中'
+			}
+		},
+		onLoad(options) {
+			this.options = options
+			this.initIndex()
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			commonOptions: state => state.user.commonOptions,
+			userInfo: state => state.user.userInfo,
+			autograph: state => state.user.autograph,
+			alipayOrderParams: state => state.order.alipayOrderParams
+		}),
+		methods: {
+			...mapActions(['getConfigInfo', 'getMineInfo']),
+			...mapMutations(['updateUserItem', 'updateOrderItem']),
+			async initIndex() {
+				let isWechatAgent = await this.$jweixin.isWechat()
+				if (isWechatAgent) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				this.isWechatAgent = isWechatAgent
+
+				let {
+					autograph
+				} = this.options
+				if (autograph) {
+					this.updateUserItem({
+						key: 'autograph',
+						val: autograph
+					})
+					await this.toRePay()
+					return
+				}
+				await this.formatLink()
+				this.isLoad = true
+			},
+			async formatLink() {
+				let {
+					siteroot
+				} = siteInfo
+				let url = siteroot.split('/index.php')[0]
+				let {
+					autograph
+				} = this
+				let {
+					order_id,
+					card_id = 0,
+					coach_id = 0
+				} = this.alipayOrderParams
+				let coach_params = card_id ? `&cid=${card_id}&coach=${coach_id}` : ``
+				let link = `${url}/h5/#/user/pages/alipay-result?autograph=${autograph}&id=${order_id}${coach_params}`
+				this.link = link
+			},
+			async toRePay() {
+				let {
+					id,
+					cid = 0,
+					coach = 0
+				} = this.options
+
+				let param = cid ? {
+					card_id: cid,
+					coach_id: coach,
+					pay_model: 3
+				} : {
+					id
+				}
+
+				let methodKey = cid ? 'mine' : 'order'
+				let methodModel = cid ? 'payBalanceOrder' : 'rePayOrder'
+				let {
+					pay_list
+				} = await this.$api[methodKey][methodModel](param)
+
+				if (pay_list) {
+					let alipayOrderParams = Object.assign({}, {
+						orderInfo: pay_list,
+						provider: 'alipay'
+					}, this.options)
+					this.updateOrderItem({
+						key: 'alipayOrderParams',
+						val: alipayOrderParams
+					})
+					this.isLoad = true
+					this.$nextTick(() => {
+						document.getElementById('alipaysubmit').submit();
+					});
+				}
+			},
+			copyLink() {
+				let {
+					link: url
+				} = this
+				this.$util.goUrl({
+					url,
+					openType: 'copy'
+				})
+			},
+			goDetail() {
+				let {
+					page_url: url
+				} = this.alipayOrderParams
+				this.$util.goUrl({
+					url,
+					openType: `reLaunch`
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page {
+		background-color: #ffffff;
+	}
+
+	.alipaysubmit {
+		display: none;
+	}
+
+	.text-section {
+		padding-top: 148rpx;
+		margin-top: 185rpx;
+		background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAjAAAADECAYAAACBbRtJAAAgAElEQVR4Xu1dTXYVObIO8QYPRq18GyhYQZsVACvAzMquQcEKMCvArKDMCjCDtnsGrACzAswKgA28FKPuN2j0TtzMi6+vb6aUUkipzPzuOZyqc6zfLyJTX0aEIhTl+J3VD0jRQyK6u/pnSZOivRxTY45ZIfCNiK7+Kbqk/6ZP9KQys9olNgMEgAAQAAJOBJSzRUiD8/ouKXpMlvaJVsQFPyCQDgFLl0R0QZbe0h8V/z9+QAAIAAEgMHMEZAnMWf0nER3BujJzrSl7e2yhOaXb9BqWmbIFhdUBASAABGIQiCcw72pN/6LHpOi4dRHFrAd9gYAMApYMKToBkZGBE6MAASAABEpDII7AnNX7pOgvEJfSxIr1/EKAicwtOqbfq9dABQgAASAABOaDQBiBYavLv+kd4lvmowiz3wnHyVh6hhiZ2UsaGwQCQGAhCAwnMOf1Q7L0jhTphWCEbc4JAUVHsMbMSaDYCxAAAktFYBiB+Wf9nCydLBUs7Hs2CJzSQfVsNrvBRoAAEAACC0TAn8Cc12+I6OkCMcKW54gAu5Tu0CPcVJqjcLEnIAAEloCAH4EBeVmCLixvjyAxy5M5dgwEgMBsEHATGJCX2QgbG9mBAEgM1AIIAAEgMEkE+gnMWX1Cip5PcmdYNBDwRcDSezqsnvg2RzsgAASAABAYH4FuAtPkeOGr0vgBgSUg8IoOKk7GiB8QAAJAAAhMAIHdBIZrGVn6jKvSE5AgliiJwCM6qC4kB8RYQAAIAAEgkAaBLgLzEUnq0gCOUQtGgLP23qF7uJm0W0Zaay7M+lIpJVag1Vr7yhgDy1fBjwWWVjYCWusLpdQDyVVaax8ZY4r/mLtJYM5rvirNV6bxAwLLQ8DSazqsjpa38f4da633lVLiLmUQmCvctdZih5Ax5tPUdFhrfZeIfhNa93djDBd2nf0PBGYt4qYw41e4jmav89hgHwI/6T5KDlwHSGtdK6XEs2+DwDQ4s3VLKcWW7+iftfaTMUbMSha9IM8BtNbHSqmXns17my1Jr0Bg1qpwXrMpV0SBJJQQYwCBkRC4oIPq0UhzFzctfxkrpb6mWNiSDpo+/LTWp0qpPyUwnor5f3uvIDBh0geBYdxgfQnTHvSaJwKwwvySq6R1YFtZQGBW1hcxgmitZdcJu2Im9wOBCRMZCAzjButLmPag11wReEsHFUpnCLs3QGBuPi7CB/czY8zpFB9KYRwWExwOAtMQGDYRT5K5T/FhxZongMBtqnAjSTY+AwTmOgJaa44r+ioUX/SjrmvxOKVcTyoITBjSIDD/qPfoFn0Ogw+9gMBsEXhGB9Ukv2YlJQIXkiSaNwjMU6WUyK3PqbvjQGDC9AwEBiUDwjQHveaNgKVPdFhN7jaHtFBAYKQRvRpPa83WFxHLt7W2MsaYdKtNOzIITBi+IDBwH4VpDnrNH4GDyl3wdOYogMCkEbAkrtbat8aYScdsgcCE6dmyCQyXDSBKckUyTBzoBQQKQsDSEzqs3he0ouxLkTxotxc/dbdHjDC01u+VUo9jxlj3tdbem3riNhCYME1YOoFB5t0wvUGvZSCw+CKPIDDyii58dXqSieu2US2dwGit+awUydUjrFF7QkHgv5Zlrb0kolLckbyO98aYt9u4KVyfFlal7uEY/BQBoSLZO7OhML2JPtBBtT+9ZcutGARGDsv1SFrrE6XUc4mRp5q4boIERixTsITclzZGS6qebFoamcCweVzEjLk0QL33a+kFHVYn3u2HNDyv7ZDmaDsQAUuXdFjdH9hrVs1BYGTFKXl12lr7xRizJ7vCcUabgAUGBGYc1di2DHGhyZV1SNFZfUGKxIqIjby/Uqd/RAdVmsqeIDDpZb7wQF4QGFkVY1eE4NXpySaugwVGVq+WMtpm3BwTmBrFG5OLHgQmOcQJJwCBESs0uC2lJQbxSl2dnnLZgF1PKywwCd9hMxraWssGmKqxwOALPodoQWByoJxqjgwERmtdshWUgwSTuECttRwXliI2TFob2FUTHdQoac2aG/kDgZFW2fmOV9f1Kr0FCEweGYPA5ME51Szp5NeuuKoqxDKlkp7AuFKBsoJXp39Ya+9KkCoBeESGAIERgXERg4DA5BVzugMQFrQckkwnPxCYHPKLnkOCwAhfnZ584rptoSyRwHACQiL6Fq2gZQ/AMV+/SS4RBEYSTfdY6Q5AEBg3+vEt0skPBCZeOhlGECIwp0opkTwic0hcBwJDJKFXGdQ/aooUifZAYKJEMrhzugMQBGawMAI6pJMfCEyAOPJ3iT1ohK9OfzDG9OYm0lq/zI9S9IwcLC5Se8xay7c++25+sgVrkOVD0kK0RipWr6IRzzAACEwGkBNPke4ABIFJLLrV8OnkBwKTQ37Rc8QeNFrrI6XUX9ELIb+vdsRU9SMdIk8QmDDtBYEJw62kXukOQBCYHHJOJz8QmBzyi54j5MDbnFTw6rRX4joQGBCYaKUXGgAERgjIEYdJdwCCwOQQazr5gcDkkF/0HDEERmu9r5R6F72IxvrilbgOBAYERkLfJMYAgZFAcdwx0h2AIDA5JJtOfu3qOT9Ijo0EzsF5YETcH9vzt7cwppAH5jL0yrLW+qNEbMeQxHUgMCAwgc+6eDcQGHFIsw+Y7gAEgckhzHTyy7H6yDkkk6/tIDCvjDHHkUsstrvw1WlvrEBgQGBKeShAYEqRRPg60h2AIDDhUvHvmU5+/msYrSUITDj0Wmupq9ODEteBwIDAhGutbE8QGFk8xxgt3QEIApNDnunkl2P1kXOAwIQBKHx1elDiOhAYEJgwrZXvBQIjj2nuEdMdgCAwOWSZTn45Vh85BwhMGIDCV6fvDc1bErbq8XpJXlNOUSdKcn1rlGOCw8eT1LCZQWCG4VVi63QHIAhMDnmnk1+O1UfOAQITBqDg1Wln4rqwFZbVS5IgJCIwT4mI/0n+jowxl5IDljaW1poLwe5JrssYs7r0gGKOkqh2j5XuAASBySHBdPLLsfrIOUBghgMofHX6kTGmL6vs8AUW2KN0AlMgZItfEghMHhVIdwCCwOSQYDr55Vh95BwgMMMBFLw6zenud331f5+bSwkEZrieLb0HCEweDUh3AILA5JBgOvnlWH3kHCAwwwDUWnPenM/Deg1rncJFMmwF8q1BYOQxnfuIIDB5JJzuAASBySHBdPLLsfrIOUBghgEoeHW6c2IQmH6ZzBGfYVq4jNZlExhL30nRFLJ0urTllA6qQZVPXQP++vt5Pf0kYJaekqLfvPecvyEIjFIfU8A+t4OGr04rpeoUWG2OOTfceG+wwKTWmvmNXzqB+USHVckp1uenEWPs6Ky+IEUPxpjac04QGBAYL1WRPIT7JgSByW+B0VpzLNKfXoqARkkRMMY84glAYJLCjMG9EACB8YJprEZwIfkjL3V12jUjCMwoBOZYKfXSJRv8PT0CdV0rEJj0OGMGHwRAYHaixMGgRJSkiKKPWDbasFtENI/DemxrLbtW07hXB26ybc4Zb4Pc1vyFrpR6EzbtsF4gMCAwwzRmXq1BYOYlz2nvBgSmi8A8VIlcN9NWmHSrt9beD00sJnV12md3IDAgMD56Mtc2IDBzlewU9wUCAwJTgN5aazm3yt2QpeS4Or25rhgCE5tkz1rLmWPZavZaMsGeZPxQDD5d8pdcX4iOoc8VAiAw0IZyEACBAYEpQButtXwgH4UsJcfVaSkCw+NUVWWI6G8he91ah1iWYEmCAAITK9my+4PAlC2fZa0OBAYEpgCND3Uf5bo6LUlgpAiXtfbTui5NrAhBYGIRXE7/aRCY+cgj3TVcJLLLoSXp5Nez+pS3f3KANqU5It1H2W+nxFoYJAOO14dJrLxBYGIRXE5/EJi8sk53AILA5JBkOvmBwOSQn3OOSPfRV6VUUOyMc2EdDQQIjFjCPWutiBsJBCZUG5bXDwQmr8zTHYAgMDkkmU5+/QSGry5zKXr8WgSUUkkSHka4j7JdnZZ0IfFYWusLCTxjyN/mniZAYDiR3a7CmqM+n22Kg+h4pi39+kJEHCdV5G/ttiw7kV2R0AUtKt0BCAITJJCBndLJb+BCltw89vZMF3YxcRxa68+pcuT0yTrWAtMSmCOlVHSeIb6VZIy5H6ubpROY2P2l6i9FRLcIjIhVLdWe1+OCwKRGuBk/3QEIApNDgunkl2P1M5lDKvB0G45QF8iYMUpCBOauUuqrhHpYaytjTNQXOwhMmCRAYMJwQy9/BNIdgCAw/lIIb5lOfuFrWlTPVDd9rLVfjDFBWYZTESofwUoQmNYKc6mU+rvPnA6L0BNjzPuYcUBgwtADgQnDDb38EUh3AILA+EshvGU6+YWvaVE9JQ+3TeCstc9CSgdorcWsFyGCFCQwJ0qp5yFr2MKRSzBExYdIylgKn1hccvQHgcmB8rLnSHcAgsDk0Kx08sux+onPwdYXIuKbPvxfsd/Urk5vEYZXxpjjWDCkMghzTStjzL2Y9YDAhKEHAhOGG3r5I5DuAASB8ZdCeMt08gtf02J6Sh5sEtYXHqMttBlKqNjqEeW2kbQwaK2/KaV+i1Uoa+09Y0xwYU5JOUviE4tL6v4gMKkRxvjpDkAQmBzalU5+OVY/4TlKtL7Ewilx4Ege0FKxPNbaF8aY4Gv/IDBhmiWhT9szhwa2h+0gvBduIYVjN6RnugMQBGaIHELbppNfwIq01iLXX3lqyYMwYCvOLlKHa0kvaIkDR1JuUtfTrbUfjDH7TqF2NACBCUNOQp9Kej6GoAACMwSt8LbpDkAQmHCp+PdMJz//NVxrKfXSstby1Vc2/UddgQ3cRm83qfiMHS/nqIM2dq8SspMkMLyfqqps7L5Yl4wxVeg4IDBhyEnoEwhMGPZL6ZXuAASByaFD6eQXuPr2FsylUEXh6BskgdtwEZgUSeJ+WGvvjknYJA4caQKjtX6vlHocK8fQjMY8LwhMGPoS+gQCE4b9UnqlOwBBYHLoUDr5Raxe+IVfVOZNSTfZJsSxcRoR4vrVVeLASUBgREoixKxLWJ9FbmlJyDv1GBL6BAKTWkrTHj/dAQgCk0Mz0skvcvVaa6lEZHx75P6Ylok1FGxdIiK2voTe8tmJakzSukgxXesuceDEEIVde5FKFBhZlkGsqrc0PpLylx5LQp9AYKSl4jfeKzqoonMh+E2FVoMROKv3SdG7wf3K61AygdlTSl0IuZJOjTHPxoY/VX2hGPeGJCYSB06KA1qKDK8rBQ/FrHQLTEuso6+bD8XFoz1fyw/KJt01trX2iIjYRV3kzxjziRc29SBeEJgi1atd1Hl9SkR/lrxEz7UVS2B4/VprEfM/jxWamdYTR2czyUNsc7ISXEfr9RRMYERut1lrg8oKSMo+EcETsxA5HwQ06EVgTZJBYKAo6RA4r7lQHLsDpv4rmsC0JEYkCLMlMexKyv71lao4Yuz1XmnlLZjAiJRHsNa+NsbwF/ygHwjMILgW3RgEZtHiz7D585qJi0il2wyrdU0xBQLD8SIcDxNt4h7janXKhHVEtFdCbE/pFpiWCEdn5bXWXhpj7rsequ2/g8AMRWy57UFgliv7PDs/r7mw25s8kyWfpXgC0x4+kvEwbIHhm0nJ88O05OWjtB9/TGtSn0aWaoFpdUiquOPgsgIgMMnfY7OZAARmNqIsdCPn9Xsiis4rUcjuJkFg2gNIMh4m6Et6qMy01m+UUlGVjHfNOXY8TxcOhRMYJsGfh8pwu30I9iAwsagvpz8IzHJkPc5Oz+qaFIlegx1nI6tZJ0NgJL+iWwtG0ptJkofWpn5Ya4tMztfK50Ip9SBGn1MEqa7XU1UVW93+Frm+wfhL6kIKfCTXF4Mt+hLNhcDw9VH+h18IAgfVq5Buzj7zuT693uqkCEx7SEoG9SYhMZK3p6ZCXqZAYCTqT1lrvxlj7jnfFRsNJAkCCMwQ5KfXdi4EZnrIl7PiL3RQieYO+LW1+VyfnjKBYesXf+n/XULlrLWiJEaqgOD23kpJVteHeckupJZg7SulovM3Dc27AwIj8aQuYwwQmGXIuXuXll7QYXWSBIZ5uY8YoslZYNqDqEgSw0UaiYiDdkVdjExeiOhhjsDjmOdmAgRGK6XqmD1y36G5d0BgYhFfTn8QmOXIumun9+ig4vTxsr9/1Ht0i6KDAGUXFT3aJAnMBokRuV7dHkrssuVEZUG3k1KRFyIavUijr5aVTmBavYl2QQ7Nv1M6gfGVb+52Evq0w5JZVG20Lkynnsgut67MZb507qOz+oQUPZ8LUO0+Jktg2sNI7Hp1S2KCrlgnJi9secmefC9EzyUOnBQxHpt7kYhP4nxCxpjKFyMQGF+krreT0CcQmDDs0WsMBOA+Gor6pAlMIhLD1ju2xHiRhlTkxVr7nYj2fdcxVPAp2kscOBkIjFRWXu8veRCYMG2T0CcQmDDs0WscBNK4j+Z3+2gtnckTmEQkht1ITGJ6bwJKfM3vekymEvOyvXaJAyc1gWn1JbrS+ZB1gsCEHQYS+gQCE4Y9euVHIJ37aH63j2ZFYNYkhohOpW4ntS6lI2PM612qDPJyExWJA2cIMQh9xWito4s7DikrAAITJikJfQKBCcMevfIj8IwOKq4SLf+b3+2j2RGYlsSI3k5qSQzr1IvN4F6t9Uul1LG0ok3V8rLGQeLAyURgpLLyVj5B3yAwYU+KhD6BwIRhj15ZEbA/6OB/RK+u/lr+vGofbUtlFi6kzU219YfE8sS0JIbjYZ5xPErC8gCf2piXoFtQWR+3jskkDpwcBKYluxLFHdnNyKVFen8gMC6Edv9dQp9AYMKwR6+cCFh6TYfV4DL3Xks8rz9yDg6vttNrNDsCs2ENYHfSn1IiaStZ86EnniSx5PIAQ/CTOHAyEpjo4o7W2tfGGOd7BwRmiBZdtZXQJxCYMOzRKy8CaYJ3z+u7RPQ171ayzjZbAtN+ZUcfUqmlkevATr2PFu+iayFtYiCRMdm3rAAITJj2gcCE4YZeU0LA0ic6rNJYSOaZ+2VTurMmMO2hylWsOTNzVBG/FI9ESGXjFOuQGlPiwMlJ6LTW0e8N1021VgePlVIvJXDOiY/EemPGkNAnWGBiJIC+6RGw9IQOK6cfOmgh8w3eXcMxewLTHiDs9uEMrL8F6YF8J86uO5kEdb7blzhw5nhAwwLjq0HX20noEwhMGPaRvewPsuqSFHFSrc1/fuNa2iNFmixxYGvjs1cUVebeb+LMrSx9p8OK3Tzyv3kH7y6KwLQkhp8FJjGjPgdTv2nU96BJHDggMP2vsjni07VjCX0CgZE/Gm+OyAexIk6a1fxLUctnPSvX9FF0l9SK2PA/JgAilX1zQLU1R8qr059bjEbYVrYpF2GB2URT8mt4qJR8gz6HjltKe4kDZ44HtKTOzREfEJibCEyhFtIXsnRKli7oj8orbXnSFxUHrDaWmz2y9JCU3SNSxcUN/MIgrfWFfeN8+2juv8URmNYak9ulxC4jToqXJk9RIVoKArNbECAwYQoqoU+wwIRh39Fr5Rpi0nJaBGlx7W1NapprxExuRjW/Z7O+nNccU/PYBc8M/r5IAtOSGHYp8VXrpHJuXUZPp1TTKFSvJQ6cOVoYQGDCNEpCn0BgwrC/3qtxER3TbXpPT6rJJqpabeq8ZjLzcFwrTdLEdXO/Or2pm0smMKzHb5RSaWKoNlC21nLWXs4ZMu1n3/EulDhwQGD6QZ4jPlNxIUmWD+FSFG2G75311spwIa2JS6oU9xLkKnaMJqbm4eof2YeZ3E6v6KAST+XeEjQ284slQIuFN3H/xRGYNlMvE5f9xNheG55zhrQvrDQ35nJupmMuEBi4kCTVUEKfJC0w/O5QStWSe7TW3jPG8Lvh2m9kAmN/EKmTZIesJILSY60tNER8QCQIDrY/6La6m8SS9a7W9C/6urrBtYzfogiM1vo5EXFOjtHka63lLy6urTR+3JuwjkscOHO0MMCFFKZoEvokSWB4LK0132QUczt36ft4BIYTqyl6mvQmUZg+5O/VEAK2zuw3LieKz8Nh6QUdVpyYTP53XrNVRyThlPzikoy4CALTJiz7K0UZgFCpWGvZ0vdq19dX6Jhj95M4cEBg+qU4R3y6diyhTwkIDCfGfCP1rHVVNR+BwKwCdI+THa5SiI05ztrdxNaZkIDglDePlmd9YU2YNYFp3UVMXJ6OqfZdc7f1lZiMzyI+RuLAmeMBDQtM2NMnoU8JCEwKN9KNqua5CcwX+klPJ3GzKEyX5HsxYfj3ys3EsTP7nrEz6fK+LM/6MlsC0xIXdhcdjeku8n1o1kTGGPPKt0+J7SQOHBAYWGDWCEjokzSBSeRG4kr311Is5CQwH+g2PU0Sk1HiWyrVmjh2xq4IDVtnbrqaYH1JgfzsLDBaaw7A5jiX5LeLpAXSBvoeG2PeSo+dYzyJAwcEBgRmAgRmXyn1TuqZ2lWNPheBeUsHVZHmaSlwRxmHXU23WjKzDgROWfNomdaXWVlgcsW5WGs/ENGlVHG+Xc/XVIkMCMzutyVcSGGniIQ+pbDA8JhVtUqHIpLodVdV8xwEBuQlTC+H9eJkeuxmSnUVvUnWx2UDRruZMgwQ0daTt8C0xOWlUiq6snAfstbaT2zZWVcf1lqzXrKlJ9mV+6kRGYkDBxYYWGBKt8C0biROgin27Ftr72/eTExNYEBeRM/REQc7r5eU92Ub6MkSmIzE5XtLXHaWAWjXwUQmWZbqlshwsO/bkpPhgcDAAiP5JpfQp1QWGK21tBuJUyv8ul2bksB8oIMqXRKss5pfhFxskS0D2rugoCWuXm3IttWr79AXxOU4HqfGuvNV8qGb2FiTIzClEJdtOWciMmy2XhOZG8mvxtY9iQMHFhhYYKZggUngRvpkjPllRU5DYDiQ9A7tiREDvonzf/SAfq5qDXGeFC4yJ/3jxFnfSNEl/Yc+4abUBrxn9btVjprl/iZDYHIF51prey0uLlXJQWR4DSXmkQGBgQXG9XwM+buEPqWywKRwI9V1rdbrTUNgJPJmNAGqj1c3btIQFh8dYVJzsaqEfVixb395vyZj8BIqTvfJtmgCs3EdmpNHJb1VFEtcxrDItESGn+UTYwwHF4/6kzhwYIGBBWYqFpgEbqQnxphVqZEUBCa8/g67KtSKtByt3EMl/SwZUvR+RWbu0Acx61JJe9y1lrOaA3dTWLxK3/nm+ookMFprlsvzHAnopInLiESGXUqjxsmAwMACI/nyk9CnlBYYHlv4NhIntGSOIExguDzAYTX8lkPzlc+RytO5am2JGeD7WZOZ85rlIZYOWvKhzTxWMQSmtbZwjRFOPpecWLa3ithykaW4Yuta4r2J1VHp0pXWvcQBvzsr3abSMYkDZ6YWGLH6OXPEp0sfJfQpNYHRWovdRtq8Ti1tgRn2om/cRH81WWYn/TtdWWd+r0Y3T4uhuMySAV3wDdNrMSFcDaS15gOdXURZYpE4aRQRneY+3DfM4smvX6/nyn17SeLAmdsB3RLzr1IZoeeGT98rRUKfMhAY6dtIq+rUkgTG/8p0czi+JLVyFc3nx24molOy9HYWQcBnNccf7Q8oYTAfWV7fySgEpnURrSyTUi92h4B+WGvZvcLEpYjbO+3Bxu8JxiC+yKkDgNYq8z5lrIzEgTOVA7rVYVciM84txVfsxSyKKfBpcxol18GAl+iJJHY8v7WWnznRSvBKKTFLp7V2VVZAksDc86os3RQqfLOAuAoO/j2lw2qS6c5vPESNO4m//pOb9gMe4NRdshGY1tKyKhWRibTwy+pLG+C6M4dLanB9x9dasw4ykUmWS2bLKsNuM/a3i5K5hRGYixzy2mFBuJYvxFfHHJYOJlkvJcbCGHEIcKZvY8y+FIHxs7405OXjorK5NsG/q6BBL4IXJ9f0vdfFJS09DaqUnX6FKWZITmC01hxrlI20EBFbW/iA5vgW0S+tFALYHLP9quc4GSZ6rq/76OVYaxkfvvkgQmRAYKJF4hzAWrtyMTgbDmggWepgwLRougMBLuxqjKmkCIzb+rJE8nITeP7CZSIjZkobVbub8gLsZuIv47+Pupa0kycnMFVV2bRbaEZvg3JZD9lNwi7Pyf5a9xKTGCYzSfXPWvtIKh4IBCatyrGObyY7k5oNBEYKSZlx+JmUIDBf6KDq912CvGxL7GJllZlT0G+TrfcpNZaZEv3EMU/NpAlMewWaSUsxsS0xwtjVN7VVBgQmTGISZG3gzGxZ3JO2vvAaQGAGSiJxc45ziicwll7QYfWrNsGNNTcuh8/F5XVJDK7n8N/I0vFs4mTWm24IaxMzMw8yM0UCwy/yNWmZlIvI89npbMaJs9pYGbF4LRCYMKnkJjDW2l9JzsJW3N0LBEYa0bjx2LUbT2BuU9Wb1A1p6N1SWsfJ3KbXs0uQ1+T4eTrxm0xTITDruBZ2D2XJ2+JW7vFaSLqYQGDC5JiLwLRWxv2U8VwgMGE6kLJXLIHpL9iINPTDZDdnIsNITPdadrEEpn1xM1m5AGnp/XpmF+faMjM4XgYEZtirbN06NYFp9X999T9pTBcITJgOpOwVS2D6ywac11xDZ+pJ6lLiv3vsddkCIsZXNJI+/2Y6ZvxFZlYZmEv/FUVg2mvPHAjOMS2Lcg9JKEqbz2MQmQGBkUAeYwABWQRiCUz3ix3WFxlJuVx0MrOMN8r6WnbZOWbGJjDsGmLCsra0zJPUjqCFG24mvsLOH1s7r2WDwIwgHEwJBBwIxBKY7uvT5zW/bMWC6BYqyWd0UBWdXExULuWSmewEpr3uvKqGLnV9V1RWMx2srcXE1pmHm1ezJQnMTKHDtoBAdgQiCIz9QQf/wymgd//O6npRCevkRRde1Vt+LflHLIvMJCcwHCvAZAWEJb+qdc3YuprYKsP/JpfwrxwksRIgkAaBcALTV3m6KdLIV6fxC0PAL7Nx2NjT7DVuAHByAjNNoWDVQAAIAIHxEEhDYJq6OZwaHSXXsYIAABUlSURBVL/hCLgTAw4fc1491mTG0sNMeWZAYOalQdgNEAACM0AgFYE5JiIUvRquIF/oNj2cXS6Y4Tj491gnzVMrM//g67GeE4HAeAKFZkAACACBXAiEE5impg9bWm7+zmsQmMEStD/op3pIf1S4FjsYu7bDujZTkwFYsmIxCEyoTNAPCAABIJAIgRgC0x1kCgIzUFyZyAsHxj6pkiZ7GrjxdM15r/9auZj2Kd7VBAKTTlIYGQgAASAQhEA4gbH0mg6row4LDGJgvMWRibxc5eWZV0VsX5wbVxO7mUKsMyAwvjijHRAAAkAgEwIxBOYTHVa7s+wiiZ2n+DKRl93VwPnKLlvR+L/L+3EgMF+P9YudAYFZnoZgx0AACBSOQAyBuaTD6v7O/TU5POrC9z7y8jKRlyYu5HNnTh5LHHNzMruK2EOke+Vu2mvdTdvxMyAwQ/BEWyAABIBABgTCCQwv7qBSnWtEJt4+8eW5bdQczB9J0Z6HLn0jRSf03/R2MXEyfaA0Vqu7LXans61J5aEYaAIEgAAQKBGBOAJD1FdKAHEwuyVeInm5Wum6InZzyww1d0p8arEmIAAEgAAQoDgCY+kJHVZc82j376zmr/rfgPMvBN7SbTpKbuEYZnnpE88p/aTXuNoNDQYCQAAIAIHSEIgjMH25YHinyMi7adl4QYfVSRYFOKs55sXHbeS7nIuVe+n36oNvB7QDAkAACAABIJASgTgCw+6Gw6rqXeB5zUGiqTKkpsRGaGz7g6x62mupEpqJmuDpv4hod4LB+Hm+kaVjukMfkluR4teKEXoQaAsV7rKOfjHGTCJXkNaai8n6vFsms6cukXnstYg99ujVkOfxhzFmFgk9pyK3tXC01vzh+7cuYRljPg0RZF9brbVPstHvxpjOUIY4AsOr+0n3e10MfAuG7CWR6gRFCpACx/lCP+lpFheMnNvIDSPiZNwYFd5Ca/1ZKXXDSmetfWaM4VxBxf+01g+VUh9dC7XWPjLGTDpdgGuvpexRa32slBIrI2Mtnx2/qrRPzgKstT5RSj3v0lFr7WtjzO58ai7FTvB3rfVTpVRnHUMpPXPN027th7X2bt8HVTyB6Utotwa4Kb73LgHe5Q7JuNyh4yyWipzk5SbiiJMpVwt3roy/spRSO6vF84FhjNmdHqGwfboO9fVypV66Y27ftddS9ihNYDYxt9ayZfDEGPNqTFkMmVtr/VUpdbeHwHwzxtwbMmbqtlrrb0qpnbGr1toLY8yj2DW4cOHxrbWvjDFclqjzJ0FgDN2he86DeinxMJa+k6Kn2RLEjUteNhXrgiydLjqfTOxTnam/x1fhvT6zbaZlOqdxHeogME4IxRukJDAb8mSXwgtjTPcFEvGdDR+w70Nhi5g9KWkvrucqliz7WF+stew66iR+a/ziCcyKKpFfgOrcSUxOqwvjzrlKbq0sW05BD3/8gnsgn0wwdHk6aq1rpRTHj+z8lWbW7lqn60ULApNHnzZnyUFgNuR6ZIx5nX+XfjO6PhQ29vHBGMOZwYv5aa0vlFI7Y1RirDBtTBBbpTrfPytK4en2lSEwRN/ooPIzg61IjD2ZWUzMFyI6ymZ1WZMXtUpS16sIoz0RTZwMfyFxuQLkkxlNENcn1lrvK6V63bnW2uLM2rvgA4G5QsX3hZ9aDXMSmPagKyqGZIvM9bqPNttaa6uSguddz1aovvnoh7X2kzFmd5miLQWWIjA87DM6qPyC/1aBvavDzecGQepnLnz8xl107L3v8Jmu95yeJQvXsKVkHzmO1vq9UuqxaxhrbVFmbRCY/oDl0APFpQdD/+5zQA0d09W+xMBzX/fRhhWGXWJ50my4AG3/7rDCDP7IGWB98XZhyxEY/uL2iYXZBO+85gAdsYh1T7nENxuLuPDKz+q/SFExUesDwcQ17IGASTbnK65Kqa8+Y1prizNrb6/b9ZW4cTjgFpKP0AXajERgOLj3fklxW77uow0dLS543vV8DSWOPrrhE7i7qaZyBIZHtfSeDqsng56DxhrDRObPQf3GaDwmcWlyvLDp38u0NgY83nMy2SU6JUWv4V7yRi26odb6SCnFeYK8fqWZtUFguq+MT8UCw+v0Uj5aJeLkf3xV3pnNPSYuw3M9g5r53LLZHtBayySsqPw3UlYYT+uL89r0NmayBKYhMf3lBbrUoGwiw/kH3md3Fa2xKjNYd9AD3dmYSW9DZCadp0MGjLSjDH2pWmuLM2tvIuT6QoQFJq0+7Rrd9ZVd13V3AeCO5brGLE3OQ91HG+t/a4xJlYQ0SBlcz5ivFcZHhr5jbW4kBYEZ7kraXFFjaeCIbHaTjBkjw4G5J3Sb3juviAephmenf9bPyVJRvlHPlQ9tBvfSUMQGtHe9iHYNVXowr++eSrFODBDXjaauvZayR9dBFUJgGIyWFPBHTmdCVGttEQRgqPtog8BwHG9/ZvsYJQrsG2uF8bG+DAncTUtgGivMJd2hR9EHf2OVYZfJQ7L0MGlhyMY9dEmWOOCUrS3j3pxp9s4ZEafvMhry4MC9NAQt77Za61Ol1GA3bYlm7fWmXYd6aV/m3sLa0dC117kTmJbEuLLEFkEAXGkK+vQgxAoRo1c+fT10rzd7t4vUriiD57Xp7fXKW2CuZrigg8rX3+mDIxeHXBMa/u8eWdKkyKeewtb4q/pEl6SIk68x2bqIJlt+O/BrxZmLmbyUekXabxcSrXB7SQBFzy+gD7tuJ5XyVbsLBteLFQRGQHkGDuE6rEItMBuktTM/ScxBOHCbnc1daQo4OL7vFmBpsTw+uPdZaj3fPcGWs5QEhvd+SgfVMynl6B2nITfdCd2mEGPBe7DEt4yKSmqURX79kyA5XoQQXJkvmaRwjNeu/DCcvr1Es3b7RY5aSK1ehH7BRqjVzq4ZCIzLCuNMPy+9583xXJZODownosu+wGRrrfc14pR72dpX77PWZTly6QMRDQ7c3VxXagKTl8TkkmaKeTjW5Scdw+rSAy6S4wVpntb6o1Kq0xW5PvyqqrK7JijRrA0Cc11SCyIwWilVdz0IQ6/hBj1QPZ363Efr1ASuQ33sPXRtb2gsjKf1JYpw5iAwzfXqO/SsKDeNtOaGjndec3wPW11uVAYOHXIh/eBe8hC0K/fLZs2RriR3BZu1YYFZmAWGt9tFtPlvY5bB8HAfrW71eTyTg5PEebwKopu4XLbbHzoeRM2r3lHfwvMQmJVmrQJkn9EfVVH33KOlGjoA3EWhyG3342DrU7pNr0GQb0LquhGx+dLpczVN0ay9RqMU60SMwnscHkUk63MdWrExMB4EJuqLPlJGvYHym8+QKyN2qTrb5yLbjIXxtL5E62w+AtOQGE5g9owOq6KriMYosbNvUz365YSz6Tq3OGKDU/pJr0GSryTgyP1yzf/ML50u83yJZm3XoQ4Ck/9JTE1gPKwXYxKYziKp1tovxphfVnaX7pYaPO+B/+pGkkcskHe9ozIsMNdXwV/MLxb1xdxYXJ4T0VPEuSR+sbK1j3P4HFYcnLrYn4dJ+0b0v9aaAwxv5F8qMSeM6xAAgcmv+hkIjCuId5QaXh7P2o2ik1rrb45g3qIKPK61yWWFIaJHrpIlUhbdvBaYzeeJrTG36Jh+r4othy7y+De3o7jeU1EZFkX2VvogC88p42GmvpG6vK/cQGlmbRCYqwewFNmkJDCtW+KzUqrztulY5S88LA6DnrWVw8La3vwqY71+PawwRimlu9Ynac0dj8D8+jwizsfyYnap5P9ZP6afK2sLrkSP9aRdJ8yLKlnQ5w5qX47XTNobX1d7SqnPu0RWmlkbBGZxBOaNUqrzQ3DMAqSO20c7g1U9ntHiCjz6WGEcr/uoa9PbY49PYK5WxEnlTidt9mdri6LHZFdlELpz0pRwoC93DYvIKeMq3Nj3dddn2h7rC3eXuoLALIfAaK17yUtLykt1H3Umagux3JTw6nZZYXqsL6JWpZIIzHrP0zpgmqDcx6RWLqJlpf0v4UkKXcM6p8xMg3611mxq77qa3/sV1HdzqSSzNgjMvAlM6zJ6TETHfW6jlryIBIWGvE48SEgnsXLp8JjXwl1YuPa93T+03lHfOkokMM16m/gFLt7FOWQ+FBXwy9Wh/4setC4i5G9xaXr5f5++9W8DY1c1XNdLse+laq0txqztevmvISklPiTmMXDttZQ9umJgOKeQJw7syuyMo9gagwn5njEme/06j+vCP+q67t2Hw+JZcibsu65g3U05pdDRcgnMDfq2ipV5Tz/pQ/Zrsmf1A7pFe/RzVVCSCQvcQ55voUk1a6wyXPn77ejFPCOAc30Z+dwAqKqKPyB2Vv4tpcCj61AHgYlQosCuLgITOGxfNyYvD40xo+QX8yjT8cEY0xsH6THGKK4xH1m53jUbz2BwvaNpWmBc6DVXZdndxMTmkv5D36OJDVtWFP2N1MoVtK6tBLeQSxZz/Dtnj75Fp/R79WFq23MEFHqZ2h1XJW9cCR0DIxCYK9RTfN2GyDQngeHcKny7cyzywvh43PRzxny0wbxsPer6YHCSoBBZSfTxjIURDdzdXPd0LDBD0G6+pLcZ+dq8uG096S8COWRetJ0jAqw3j6ZikfH4mnO+UNsX8/6u4o78t1IKPILALJfAuNygOV5ErltE7bPilcvFZcnwsZrm2POuOTzWniy54DwJzFiSxLxzRYAJjK/vflQMHIUbnf749eJdL2dr7ehmbRCYZREYrtu1KhtCdMKBIaM+aI31xZVUb2eqgg4S0Jm+oCVCqzpKY++5Y+2uStXRJQO69g0CU6JGYE2lITAJAuMy5w5NINVnHh8z58YGyUIxxxaMqbiQ+CbKgIebrZ/rfxdjBOn2rdXDfTSIdHRlwW4JTJEFHltrLQjMAKVGUyCQF4GDSuWdMGw2V/zBUDO0xxfmvTEPFVhgpmeBkSjmGPZ0yPZyWShb0jHo+fB43pJZMmLQcT2HKcm1ovP/NURqZ/BQzKbQFwjMBoHpEJivXfky+Poz0SrB4pAfX5Nkk/3On7V20BfmkIl92rpenOsxUr5AfdYp0ca111L26CLRMyIwLvcRu7iGZmHnYqqdhY5Ly4S91usxdVPRWX1Bih5IPGQYAwjMEoEJEBjXSySFXMYu8Oi751IO9xgZuPZayh4XRGDeK6U4yV62HwfPExFbdUaP/9nc9Ji6yTEwzPiyCiKbxDEREIhH4AsdVMUnK3TdBIiHodMKM5pZ2/XihAUmldS7x10CgfFxH6VCvqRM2GVYYM7r47ZacirMMS4QmDICH+igGmoKzrrfkV+oSRJU+QAIAnOFEiwwPhoj08YVqyIzS+cHAwczP0o5x9CxXc9hSt1kCwzX8HkzdNFoDwQWgsArOqiY5Bf7G/mFOppZ2/XihAUmv8ouxAKT3X20KcmhwfiptcD1HKYmMJzI7WvqTWJ8IDBRBIq/Qu0o3Jgc9rHM2q4XJwhMctHfmGDuBGZMa+eGPheRCXu9HtdzmJbA8CrOak7J/1t+dceMQKBwBAoP4PUo3MilEGITYPHtiHddkuICfWOYtV0vThCY/M/WAgiM6/YRlzcYetvvhqCUUh97nreicsK4nsP0BOa85quSf+ZXd8wIBIpGYArxLydKqec9LzuRINu+4o489xhmbdeLEwQm/7O1AALzWSnVGdQvZY3UWl8opTpvB5eQCbscC8x5zQULOxlf/scAMwKBIhB4RgdVZx6UElboKNz43RgjUjnd44Wa3awNAnOlgSm/cofo+ZwJjCvTNRGJFS3UWrs+TIop8Oh6DlPq5lWGUbiRhjynaDt7BOwPuq3u0pOqqJwLm7BrrTsLLrZWEa/CjT6idB1MY+SEcb04YYHxkaxsG5eeTDmRndb6SCn1V4+1U4zE+wTmW2u9CkXKSvjmaK7nMA+BwXXq1HLG+NNC4C0dVHxDr9ifoxaL2NcgA+B6SbWEKWuBR581SQsv5cu4b62uvY61ru01z5zAuNxHg0oHOOTNWbB7L9eMnQl7vf4xdfPKAvOu1vRv+w1lBaRfeRhvogjco4OKC8kV+XOZs6XTjvvcvshd4NH14kwhuLGIgmuvY61rKQTG43n7ZIzhUAyxn0fc2aUx5r7YhIEDjamb14vUwQoTKEJ0mxkCU7C+uMzZ940xXP9I7Ke1/qaU6r2tmNOs7Xpxim18Y6CxiIJrr2Ota0EExvW8iblrNywbvYG8rdVT/Dkf+tyMqZvXCQysMENlh/bzRKBo6wtDrrXuK9z4xRgjXv7A4bJaaUJOs7brxZlCNcciCq69jrWuBRGYPvfRj7qutbS+udxx7fM2WibsDaL10HHtW+Qm5C58rxMYbnFWH5GizkAlaSFhPCBQGAJTyLzremGIfw22pOlYKfWyT15c9TqXWdt1qKfQq7GIgmuvY61rCQTGw30kFry7iacrSL8lMFzbsUqh675jjqmbNwkMr/q8ZtPz3303gHZAYBYIWPpOd2iv5JtHLZFgX3ufv/0kRcVafpETkU9gc5L5dxyWvuuRVM9TY0z22CgP7EdZ1w6Z9OqmMaboshy7FIWTRRJRXz20JNh7yHy93CTz+z40HutMtr7dBOYf9R7dshcI6PUVIdrNAoGfdJ/+qETjRmaBCzYBBIAAECgQgd0EprHCoMhjgQLDkhIhYOkFHVaxKfcTLQ7DAgEgAASAwDYC3QSmITEoMQCdWQICxd86WoIQsEcgAASAwBAE+gkMSMwQLNF2ighY+kSHlWj+hinCgDUDASAABKaGgJvAgMRMTaZYrz8CX+g2PSw9aNd/O2gJBIAAEFgOAn4EBiRmORqxnJ1+oNv0FORlOQLHToEAEJgXAv4Ehvd9Vp+QoufzggC7WSACiHlZoNCxZSAABOaFwDAC05CYfVL2FFes56UIy9iN/UGkjuig4uB0/IAAEAACQGDCCAwnMI076S5ZOiVFDya8dyx9SQhwsK6lI+R5WZLQsVcgAATmjEAYgVkjwtYYInYr9RZ4mzOA2FvpCMDqUrqEsD4gAASAQAgCcQSGZ1wVgKQjInsEt1KICNAnDQIr4nJCt+kEgbppEMaoQAAIAIExEYgnMJurb7L3HqGO0pgiXfzcX1buzTt0CuKyeF0AAEAACMwYAVkCswaKY2Saom/sYkJRyBkrUCFbY9JysSIuqGVUiEiwDCAABIBAWgTSEJjNNTcuJq7mydlOOfj3LinSIDZpBTvT0ZmoGFLE1YC/kaVLukMXsLTMVNrYFhAAAkCgB4H/B0cM/0Z/lp1HAAAAAElFTkSuQmCC') center top/280rpx 98rpx no-repeat;
+		font-weight: bold;
+		font-size: 32rpx;
+		text-align: center;
+		color: #111111;
+	}
+
+	.button-section {
+		margin-top: 95rpx;
+		margin-right: 98rpx;
+		margin-left: 98rpx;
+
+		.button {
+			height: 80rpx;
+			border-radius: 40rpx;
+			font-size: 30rpx;
+			line-height: 80rpx;
+
+			~.button {
+				margin-top: 32rpx;
+			}
+
+			&.copy {
+				background-color: #333333;
+				color: #ffffff;
+			}
+
+			&.off {
+				border: 2rpx solid #999999;
+				color: #666666;
+			}
+		}
+	}
+
+	.hint {
+		position: fixed;
+		top: 0;
+		right: 0;
+		bottom: 0;
+		left: 0;
+		padding-top: 156rpx;
+		padding-left: 144rpx;
+		background: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAcoAAAFkCAYAAACgintCAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyVpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuNi1jMTQ4IDc5LjE2NDAzNiwgMjAxOS8wOC8xMy0wMTowNjo1NyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIDIxLjAgKE1hY2ludG9zaCkiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6MjM0OUI3N0QxQjFDMTFFQjg5Q0RFQzkyMDYxNDI0NzMiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6MjM0OUI3N0UxQjFDMTFFQjg5Q0RFQzkyMDYxNDI0NzMiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDoyMzQ5Qjc3QjFCMUMxMUVCODlDREVDOTIwNjE0MjQ3MyIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDoyMzQ5Qjc3QzFCMUMxMUVCODlDREVDOTIwNjE0MjQ3MyIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PjAoHQAAADGgSURBVHja7J0HkFzXdabPDDgY5AyCIEGCYM5REimJmWJUooIlK1HakkzvSiqvdx1qt3bt9ZblKq23Vl5tSeWVbAUrrGWJtpUokhZJUcw5QyQIIpAAkYhE5Diz99f9n/uhNQFhZjq876s61dOve7pfv379/nvOPfecjt7e3gAAAIC+6eQQAAAAIJQAAAAIJQAAAEIJAACAUAIAACCUAAAACCUAAABCCQAAgFACAAAglAAAAIBQAgAAIJQAAAAIJQAAwHByWF8b77nnHo4MAAA0grHJxiXbnmzbUL3oJZdcgkcJAABtweHJ3pHsuGbZIYQSAACahanJPpDsC3ICk81BKAEAAGrMTnZVsmnJ3pPsfIQSAAAgM8EiebLvX5rs6mSnIZQAAFB1lFh6VrIPJzva27qSvTXZdY3WKoQSAAAaTUeyi5LN9d8Fp0QOwb4pWTdCCQAAVUVzkQqzTqvbLnE8MdnHks1AKAEAoIrMTHZtsisih1vrmZ7sI5GzYA9HKAEAoEp0WvyUuNPbz3NGRU70+VCy0xFKAACoEtMsgKcNokcSy2uSXZ7shJHeycP4ngAAoAEoaefcyEtC9iekOtrPXZ7sJTxKAABodyYle0uy4w/gf85O9s5kZ9rLRCgBAKBtvckLk703ctm6/WWsRVLh2okIJQAAtCtTkl0WuQrPgerQkZGXi7zZr4NQAgBAW6G5xpOi/+Ugg6H/0ZrKj8aBhW0RSgAAaAkkch9PduohaNCYyBV7Lk52zHDvMFmvAAAwkijT9Y1x6HOMmq9U38pVyV7BowQAgHZA84tXxtAVDlBC0PWRQ7kdCCUAALQyXfYk329vcCgYH7lO7A0xjEXTEUoAABgJJGRK4BnqTNV5yW6MHNIdj1ACAEArIgFTdxBV1hnq9Y/yTudEThCag1ACAEArohJ1747hW84h8VURAs1ZHoFQAgBAq6HSc+fE8K20kJapJJ4q/ZyHUAIAQKugTFRV33lfDN4hZCi4LHJ491iEEgAAWkUo5U1eEiOzbl9e5UXJrhtKfUMoAQBguERypkVr6gi+7ynJPhy58s9ohBIAAJqVCZFbYr0tRrDTh99XzZ1vtFAjlAAA0JQo01VVeGY14L1VT1YdRlSMYBpCCQAAzYaaKr812QUxgg2WSxxmodaSkUMul4dQAgDAUKP5QZWVm9dAnZFAX2Ov9pAKESCUAAAwlKhU3Rsir5scKnptYndp+85kPck228SKZJuSrUu23vtxSIUOaLMFAABDhbJMFerU/OBsb+uxU9ZTctC22+PT8zdGTvbZYuGbnGxPsh2RS98t8f+87udOtRgWr7HKt1ssjl2l56q83ZPJHkMoAQCgGZBgKeyqBJ5FyXZZ2F6ygOn+a5EzU9dZzLq8TZ7iWZEzZTdEXhO5PNltyf4x2VYL57Jk4+xh6vHpfmyrBVevNcb6tmUoPhRCCQAAQ+lRLkj2xyVv8lV7iVvt/UnYVlp/uv33eAtfUYLuJP+/PMzHkz0RtTBr2TsNv27BjrrbIQGhBACAoUJzg09aALdb/ORl7vXjHRbGejb6MXmAY+s81MP8/z0l8R1RSOYBAIChoteiti1qyTd76x7vjy57nIeVnidvUesgdzXyQyGUAADQDEgMZ1osO7xttr3MSQglAABUHenReotj4VHKMz089p2HRCgBAKCSSByVsLOy5FFqmYhCsmMQSgAAQChz9mt5PlJLS7RspBuhBACAqiM9UnGBKVELvapwgOYtNyGUAABQdbTsQ2sste6yCL2qMIHmKWcglAAAADnMOj72XVrSbbFEKAEAoNLIi1wfv1kAXfOUexBKAACoOhJHzUeuLWmTQq+ap5yOUAIAAGSRnFXyIHdZJF9HKAEAALImaR3lqLrtExFKAACAXBC9I2pZr6r7urN0H6EEAIDKIjFUL0nVdd3tbeX6rw2DNlsAANAMKJlHGa4qOqBQq5aFqEGz2nap3usKhBIAAKqOig18Ptm8yGsoN9q73IhHCQAAkFtqLU62IPLUoGxPo3cKoQQAgGaimJ/ssTUcknkAAAAQSgAAAIQSAAAAoQQAAEAoAQCgynQ0k06R9QoAAM3C6GQnRy6CPsWCqao8qxFKAACAXIHn+mTXRV4msiPZo8m+nmw5QgkAAFVnfLKrkl1sb1LVedYFRdEBAAB+LYZbk3VFrvuq+3ssng0tYYdQAgBAMyBxVNNmlbEr+lGqMLr6U05GKAEAALLneFTUStepzdZEPEoAAIDMhMg9KTtLGrXF2xFKAACoPIfViWKvvcpdCCUAAFQd6ZHWT2pesgi9bo+8tnIzQgkAAFVH4jgncuZroU3KeF0ThF4BAAB+rUfyHE8oeZQqODAu8jwlQgkAAJX3KCdFrsBT1qYNycYilAAAAHk+srxmsig6sAehBACAqqOKPOujVplHvG6x3IZQAgBA1VERdM1P7oxabVd1EFHnkHEIJQAAVB0tC9FykHmlbSqIPh6PEgAAIBcVUJutVaVtqvmq5J7RCCUAAFSdTnuVU+u2SSR7Grlj9KMEAIBmQCFW1Xl9NtnJydYmWxp5zrKhWa8IJQAANAObkj2Z7M8jh2Fn2qO8O3JyTy9CCQAAVWdhsgUWSIVbtVRkbyNFEqEEAIBmoqfudncz7BTJPAAAAAglAAAAQgkAAIBQAgAAIJQAAIAuNQlkvQIAQDMw06biAipd90rk7Fc1b2Z5CAAAVBoJ45xkf5rsuGTzk21OdluyHyGUAABQdToslOcmOzLZWfYon7dO7WrkzjFHCQAAzYAEUgXQu3x/bOTOIT2N3jGEEgAAGs1Ye5UzS9vWRC5ft6fRO4dQAgBAo1HD5rlRa9CsOckpkcOvDdcphBIAABrNJHuUY31ffy+JJuhFiVACAEAzIDFUtute399jL3NZM+wcQgkAAI1mmr3H7tK2jfYsEUoAAKg0EsPJkRN5CmHUusrV9ioRSgAAqDzqOzm+dF/FBnp8i1ACAEClUYbrCfYiCySaC5ONQSgBAKDqSAxVeWdu1ErVvRo5oed1hBIAAKqOip6fmmxL1OYodftC1Kr0IJQAAFBZJkZeP3lEadsmi+RuhBIAAKqOloUck2xnaZuWhqxulh1EKAEAoJEU5eqKZB7NTWrO8vVm2UGEEgAAGqlBJ0ZeQ1nMR2p+cmGdh9lQ6EcJAACNZLE9yPsjz1N22ZtsmtArQgkAAI1CRQW2JvtMstnJJkTuSymPUuXsdiCUAABQdbbZq3zJ95UBu72ZdpA5SgAAaAbPsmB7s+0cQgkAAIBQAgAAIJQAAAAIJQAAAEIJAABVoajI09GsO8jyEAAAaARaBnJyshnJ9iZ73rdq1ryjmXYUoQQAgEYwOdkNyf4g2XOR11Pek+zbkddVIpQAAFBpVKbu/MgVeC6MXNt1moVSYdjeZtlR5igBAKARnB45/FoUQ5dgPmjB7G2mHUUoAQBgpJE4KvR6RkkU1ax5VbIVzbazCCUAAIw0Sto5zrdFtquKoy+JJpwSRCgBAKAR2nOkvcoCNWxeE00WdkUoAQCgEahR87xko31f4qjWWistmAglAABUmokWykKD1Lh5fbJlzer+AgAAjKTuHJ/s8KhV5dHt/MhzlgglAABUGiXraG5yemnba8nWRU7oQSgBAKDSaA7yzJI3qabNynx9srQNoQQAgMpybOSM12klHXom2ZbIc5UIJQAAVBZ5jqrAc749SaF5SYVdlzTrTiOUAAAwUmgZiDqGjCrpj8RzfjRxmy2EEgAARorxkddQHlXapiUhyyOHXhFKAACoLEXY9aLYN5FHYdfHohaKRSgBAKCSKOw63SLZU9KgV32/aYWSfpQAADBSqEPItyJ3CZkbOQz7iL3KpgWhBACAkWJ1svuTPRC5Mo+WiKit1lqEEgAAIFNU31HyzuLI4deeZt5h5igBAKCR9DT7DiKUAAAACCUAAABCCQAAgFACAEDL0tGKO41QAgDAcDMj2ZuTjU02LvKKi5YRTZaHAADAcKImzTck+0DkQgPqO7k02b3R5OsnEUoAABgJ5EW+LdmlkftNvjfZfcmeS7YxciNnhBIAACrLcZG7hYy2CZWy62wFkYxgjhIAAIYPdQuZZrHs9bbXkj2f7OVW+RAIJQAADBfyIK+IHH7tsFhuS3ZXtEBFHoQSAACGm2OTnZRsqu9LLOdHnpvchVACAECVUd9JhV1PLm1TQXSFXF9ppQ+CUAIAwHAg7/HiZJN8v9de5J2t5E0ilAAAMFzMS3Zm5L6TBc8kWx61VlsIJQAAVBYJ5Dml+3sjh10Xt9oHQSgBAGA4uCBqYVehLNf7k+1AKAEAoOocb2/yiNK2xyNnvG5GKAEAoMoo2/XIyIk8BQq7LrZQthwIJQAADCUSRYVdx5e2KQP2oWiRknUIJQAADCcKu56dbHpp26PJnk22BaEEAIAqo5J1KjBwbdT6TSp551fJHmjVD4VQAgDAUKGwq/pPLo1a0k5XskeihbtV0WYLAACGil6L4n9PdlWy0yO31FoQLbgsBKEEAIChRmslFyVbluzeZCdEzoJ9LGptthBKAACoPLtsWjvZGS3UUqsvmKMEAIDh9jJbGoQSAAAAoQQAAEAoAQAAEEoAAGhKxkStyEBbQdYrAAAcCudGrsSzMdnTkWu69kYLLwdBKAEAYKiQB3lmso8nOzryesmHk/0gWnztZBlCrwAAcLAiOSvZlcnmJhuX7JJkV0QuNNA2IJQAAHCwQnl+sjdEnp8UqvW6ItmD0UahV4QSAAAOhu5kb4zcpLlgd7J7km3AowQAgCqjjiCnRE7imVASSRVE/2Wy1xFKAACoujcpkTwxakmh2yIXQn++3T4sQgkAAAeKMlw1NzmptO21ZI9GLoaOUAIAQGWZGDmJ56LILbSEek7+EqEEAACIOCLZ+5JNjVolnlXJfmyvsu1AKAEA4ECQN3lq5ISeAlXkWZhsTzt+YCrzAADA/iDvUXOTVyc7qbR9UbLbfNvbjh8cjxIAAPbXsVICz2VRC7mqwMB8C+Wudv3gCCVA3x0POjgsAPsw3iI5vbRNQnl3sq3tPkIAqCrTIpfeUteD45P1JNuZ7PBka5KNTbYj2Wr/rUXUe6JN52EABhFJ1XC9JmpLQvRbuSPZL6LNCgwglFBlr1Hnu6IopyW7INmUyEWd5/o5Es0jLYzTPEpeF3neZXHkjL5vWUR7OaRQIVRg4Ppkx5a2qUzdXZFDr20NQglVEUn90C9Odl2yN1sIZ3l0vD1y54MeC+DZJSHUNpXmUobfA8nut3jiVUKV0O9jabIXIncG0aBymX8TbT9oRCihCuhHrcXR/zNyWHVm3bk/zreddeIqRkVtUfU6e5WIJFQNRVG+ZWH8hAeat9ibbPvfA0IJVWCnRU63R8RvJurs8m9hl3/0KvK8Odlob+/1/66NHJbtj9EWVQnuVg47tBH6bbwSubDAkmSz/ZvaXIUPj1BCFejxiPifkp1XOu+fipyEoMy9lyOHWPd62zTf1zzmkX6NO2LgbFhdPFSxZJvfa4NfA6CdBHOpxbIyIJRQFeQJ3prsBguY5hq1QFrzLKoqopDsDo+QNW+pTFjNa6qupeYnZ0QOM/U3glb4VuHd3/X9YyKX9HqIQw9tRuUS2RBKaCe6BvDgtH15st+LWmLCy35MXuLi0nMLMVT4dL0ff2mA91W4VWW9borcdqjHgqm/NS+qBIhNfD0ACCVAI5BIKUv15GQrIndX72/EKy/xyfjN5IPBRsiDPa7w7Onehw7vk0K3V/t/lQRxS7CkBAChBGiABzkv2W8luzxySFWh1FcjJ9/U02MbanbY43wm2ZmRl51IMBXCfU/kxdpbkj3mW4BmZ4oHdpsY4FHCDlqbc5L9p2R/GLmAwJuS/bvYt2DzSKAQrXrxfS7ZN+ouLhqMat3m7yc7IyiNB82P2mdd7d+SBn0T8SgBWtOTVKjzE8mujNo6R42ClXWqaiFK1Nk2gvukOVCtMXvBv6vrvY/Ffr0r8pyosmof5SuEJv5tacD5F5GT2TT3rmxvJcK9glACtA5q9fOpZJ/0jznswWmN1yORk3F6GrBfmvvUMpSv+/ZPIoddCyG/NnIVoKf8XOYsodmY4PNUS6KU9KZs8Hcn+2DkOf5KJqUhlNBqaNnFR/1jLjeOlTAqYebLkZd7NJIXfFFR2ErLUU7w9pPsWT7tEfpGvk5oMpG80lZUq9JAtEiA21XVA4NQQish7+ztyT5tESo8SSXw/NCe3PNNsq+FZzmxNDovhP4T3s/ngnJ40DxoIPdvkp1S2qZM8h8k+0mVDwzJPNAqqDyckmHem2xyabvmBu9L9m17as0y6u2xGKpCz+2R5yYLsVeG7jti304MAI3Wgksiz6sXkRqdsy9G7jfZUfWDA9AKqF/kZyNXvxnjbZvtSX7R3lkz8oRFfH3UiiHoQvTOyOs/ARqNfk+aytCUxtzS9oWRoyKqSFXp+XSEEloBzZNcGHkJyJjSdo12b072eOS1jM2ICqk/GLnowLrSdmUWvi1qmbEAjULlGdV+7rTSNkVmtOTpX4KqUgglND3FUhDNnRzrbRrdKlX9e5FT13ua/DPIm/xu5OUhhaCvTDY2at3iARrBWA/YtG5ytLcp8qECGj8NEs5+Dck80ArnqLLwTona3Il+yCpqXnToaHY0OlfVnlss6vocWsZym28BGsUbIodcy0U6tMzqa8nujb4rXCGUAE2G5kzeEvsm8KhE3c8iN1FuFfbaA1b4VQXYbw/WUUJjUW9WhVzPLG3TOanlIHcHIVeEEloCieOlkcNChTepXpG32lqtaexCi2QvIglN8NtS5rUKd0z3NkVqFPn4auQMcs5RwxwlNDMqID7GHuRab9OcyR3RunMn8ix7+GqhwWg9r8osTinpgKYIFKl5NGrLmQCPEpocjWgVolwQeVnIGyMvgF6A2AAcFCqnqEpRvxN53WRXSSTvtlBu4DAhlNA6SAxVDk4Fzu+MnP262kZYCODAKbLIVVpxemm71kpqve9DHCKEElqTYqG+iol3IJIAB02RxfqShVKlFbd4IIpIIpTQJrSjSKqsndaz7fCFbDdfMwzj70fLPtTFRl1BVKT/7mR/GxVuo4VQAjQvSs9XUsW0yOvZ1L3hLyMnKjEHC8OFEuOUNa4pDa3jVfGLZUGkBqEEaDIkiqr1elPkRCV1GVkauZDCzzg8MMxepVhso4PNILA8BKAxdNiT1BpRNccda7E8N0jNh5FhDyKJUEJ7MN7naXebna8qlqAQ2MOlbQrFzoncKQUAmgRCr9CsqLbrm+1dKaV9W+S+kyo+0C7zd5oXWu7P0+nfo4RSjZ4XcQrAEDAxWq+CFUIJsB+oGo+SXP4o2amRs/FUqFmhyr9uo8+5wMK/yuIozvfnVyh2O6cCHCT6rVzhvx8JknUOCUKv0IxomcTk0vkp0ZyXbGvs24+y1VGVlKfqLmD6fGdxCsAhoPlv9ZZUa7o/T/bvIyeOdXBo8CihvX7ou+p+2FoYPb4NR8UqQq1+lbM9MOi1UO7iNICDQD0lz0v22chddxR6/f1kM5N9I3IzZpYe4VFCm3haS+xdFcK43Z5lO4UjlXGo+dcnS7/Fyb64ncNpAAeBBPG9kdtnTfFvSb+hwy2ieJUIJbSRgMh7fL70w57uH/rcNvusa2zlhItZsW//TYD9uZZrIHljsvf79xMWSfWVvNe/J5YeIZTQRigcuaP0w5ZgzrZYtqNQbixd2FSlZ1y013wsDC8Kp2pN7kciz+eP8nYli30lKFGHUEJbotCr1hkWoVYJ5nm+ALTTeavQ63wLY68HBGpOfVqwGBz2j6nJPpjs47HvGlydP1qn+6Nkr3GYEEpoP7Q8Qoku3b5fzLWcH+2V0LPHF7FFUQszSzyPjlr4DGAgNID8ZORSiEUUQqH8nyT7fOSuICTwIJTQhuywV1kOF020p9VO2dq9tuWlbVM8QJjFaQCDDCYvS/bpZG8qDSAVfVGh8x9E7ucKCCW0KTs9Ki7/0DVHeYTFsp140bdbSxe64yL3CSRLEfpDyTtaK/mOyMlfHY5QPBF5/eTPfA4BQgltjERyfeybEXq6xbKd6LD3PKr0u5zqgQHVVKAeJbRpCuI/RE7gKSe4aX5bIde7/TcglNDmrI48T7mutE0hJiUstFNYUnOSK31bCKcKDszhFIA+0FKp90VeL1kMGjWgWpjsi8m+FvuG8gGhhDZGHpb6MyoMW2SAKix5SbJJbfQ511oYfxW5pJ1ut3qg0MVpAKXfg2ofq9LORyPXcy1Qdvgvkv042QoO1dBCCTtoZiSOL0Uu6jzH56sGd1cl+7ovCFvb5LPeHjnzVZmua/zZNgQLxKGGzgVFUy6MnBVdoKL6/5TsryI3/waEEirG7mR3Jrshcnip02JyfbLH2kgoldDzqj9PEekhpR/q0Zz945HruMrDVLRFyz++n+zlYO0tQgmVROW3VAtVIUmtE1OCwoORl40UC/TbJeFlKwIJg/CwIw6aelAFp+cir5V8jkODUEJ1kWiovNsPfYF43BeFpyOHJgGqhMKvi5P978iZr/oNLOWwIJQAmq/7+8iFndWAdhWHBCo+eNRgUXPaNPdGKAF+jeZdlAG6kkMBFWF/phQQSYQS4DdG0QDtjsrSzYhaGToKTjQBrKMEaC5G1Q1kKWFXLVSN6abIJehUoo5Wa3iUAGBUWOCkyJmvczyIVUUiVVvZxeFpe9RmTesj1QXkWnuUKt2oufmHOTwIJcBQcIwFZVUL/xavidxXUOG27b79ROQEJkJw7UmHvUZV3FHT5csjV9zRVMNHLZZaCsX8PEIJcNCok8hF9saeTfbdaM1F17o4HhV5bVwxJXK7vUs607f3Nfi6ZJ9JdnHUShZ2+u/J9jYBoQQ4YNSb8uxkb092ZeQ1ZT+NXAz6zhb8PKq4oj6UW/3ZFHqbELnaSjsVVYDMKA+C5EF+KNm5sW9dX53H6if5xaDAOUIJcJBIPBSqVNPaokD6OZE7KtxjoWmlTNlxFskxJY9C4qgMyFf5utsOfd8qw/g7FsmC3R4cadD3vcjLoqj3i1ACHBQqbacKJQq3vtXbjrF3+duRe/JtbKHP020vo7M0ENgULItpRxRe13ykWmXNrntMCVx/F7lVFvOSCCXAIXNHsrnJzog8lyPUVeFTkbuOqEbsjhb5LCpFNsHegwRT86zqNUjz3fZBofUzIydsXRP7dgBRNOHRZN9J9vNkr3G4mgfWUUIro2xQ9eC7veR5jbOH+buRkyNGtdBFdG1p8Kpbhd1m8TW3zbVWSWd/HDlx54TSY8pwXmiRvCVy8hZdQPAoAYaM53yB0UVI83mjLY4asSuTdLkvPM3ejkv7p7nWbfYse3yrJB+SeVobLf14V+SknRPqHlPEQ82W/2/kWsbMR+JRAgw5mtNRP76vRp6zLDjCYvlH9ixb4VzfVjd4VWJPNyLZsnRZJD8ced789Mi9VIWSdhYk+xuL5FOIJB4lwHAir+sbketkTrFIhr3Ld0dO8lFYU/OWzZrgI+9xZ+yb9brenwlak6KYgErSTStdbyWImpO+Odn/S/YrDhUeJcBwowvPK77oSDDL2YK6QKk02H+xh9nVxJ6x9nWL78uLnOnPQr3X1qSoFPXlyK3iiu/1l8n+MNkXkr3AYcKjBBhJno+8QFtemOaEjvVgUOEu1c+c5/sK1S5psn2fHLXM18Ibkfd7VOkiC62Hsle/GbmC1Hqfozf7HFzP4UEoAUYazfustlepC5SyC4/0YwqBaY7oD5L9Q7K/iubKLOyxR7k9auFWiTrLQ1obnWOKdnzFAzUlnz3CYUEoARqN5nyU2NNtz/Kc0vmu5AqViJuebE00T6LMDu9LZ+kCK8HcG2S9NjtakrRtkOfcH7WKUYBQAjTFKF5zfd+MXA7sjz2a10XqXl+wNjeZ+Mz0fneXfpuvBlmvzcyJyS7w4OZ7jmj0913RKg2hBGhKllhs5JG9P3Iiz19HrujTTGj/FCo+2p7lGIvm+Gi+uVTIWdUK41+R7CpHKFRu8C7fAkIJ0FJoJP+jyOvUtNj7oSbcR3khx1gky5V5tKRFHSYW8jU2BRq4HB65uMUHkl0deQmSohc3Rq32MBEAhBKg5Vjrkf7j+/FcVfXZ69/GSCb7KBT8dLLjIyfwKPt1mbdD4z1+efkKs37EIql5yc6SgN7gAZkqQZHNilACtKxnuT9cFrm+6nMj7B3oAqt5LmXkzvDFWWso1/HVNRy1wVL7tvdEzqIeWxJJnR8Kjz/hAQ5zkQglQFtzqj0GeQ6q4qM1mVr3tiaGP1tRF9wXLZAL6rxbaAzKltY85OU+NxQe7yp9X5vt9d+a7IeRM1sBoQRoW+QpKKT2UV8Mj7Nnp+4kWgO3YoREq+zBIpIjjwYqpyQ7P9mlyd4UuVhA+VqpNa9aDqJ2WEXHD7p9IJQAbX9xVKq/St0VIbUxvn+6vQl5DA8mWxQka7QjGhwdm+zkyG3arrBI9oWWF/0g2b9ELnCxh3MCoQRod4qF/souVbitKKqubSotp/J3CscqxPZNi+WaqPXAhNZmogXynf6u+xJIfddqrKwlIHdHLmrxKgKJUAJUift98VvqC+bZyab6sXG237Z3qaIF/xy1LFpCpK2Nsla11ONP+3hslwdQT1ggHwgKmSOUABVFF0SF0b7li+HHk11n77KolqMlGxfa49Ac1h32MJR8wzKO1mWVIwTPJDvL27SmVfPSL/l7Vpj1aQ4VQgkAec3lOnuWj0WuvKJw3GQ/Psp2pS+q8jKV7POIL6pb4+BDshJklUHr8GsQ1hs6BquXK49Rc9Cn+Ptf6aiB1kY+y+FDKAFgX3rtYXw3ctarQrLKgNT85VRfdDV/qfWW6vjxX30xfTjZ/4jcgPlARE5eqxJIxtiTWWQvZ52FEw6eaR6A6LhuGOB5T/u7VlszzUV+PwixAkIJMCA9vriqLNmXIi8FUCj2RnuXU/w8ZUvOsamUmZYSPHWAQqn//bA911f8v9+wreWrOCjvcXbk5T36Pi5Odl/k8Gl/BRw0z3y3v2cq6wBCCXCA6MKpsNzSyCFWhV2viZwpGfYu11kgnzjA1x5lQVYYVxVfFPpTw+bj7JnC/qO6q8dGXhN7tr+nK/39aH75pRi40tFqDiEglACHxkp7JbIHoraU4GRfgH8Z+1dNpwixFp7MOfYiO0q/y4eCOcr9ZYo9x7k+lgqTvzFqy350XLUu8ieRw6kkXgFCCTCMFLU8ddHVXNZJyT5oYVs0iEiqJ+Y7IpfFW2bT/Nlke5Blz0aVX7ZwuPu9bik0rpB1URRCBSPOK3n5ZfTc6R7UPIJQAkIJMDLII1xqsXvR91cN8Hx5Nm+IXEtWc2eP27tRAsn5FuCxfq5Crwtj8EzNKtHlAcUoi+JF9hqVCKWOK7P6+J/dHnDo2N4eOYP1FQ4lIJQAI8teC+ZgzLD3o4IFE+xBau7zY5GLGXSVvJ+lvrgjknmwcJTFUPOOb7bnqPnImZGLBdSz1YON7fb8vx/N2YcUEEoAMPKCFKJVxZ+JUZuLVDhwatTqyxbCoG0X+/H77EkVYdh2LL49kOesY6cQ65/5mOyySI7q47lr7dXr9jZ7kCzxAIQSoAXotZez0N7kRN9GnUgWoqGwoubTlEWreqKqGKMqMQ/6deSJbmsDUZzm+/pMOwY4dkqimuT7Y/t4jrJZtYznZQ8sfu7/AUAoAVqEHgve5yIvXbg+chjxSHuL4+qeL4+py4KpJSLvjzy3JkFRKPErFoWB6LTINCJ8WxZDCZtCoDP8WfUZlHBzjD+3bu+MnGTTV/JSkRylLONz7VH3+NqlbU9YKF/wQIIEKEAoAVqUNbZuX+BPSHZ0ss9bTDr6EJuIWp3ZeRYceZr/J/oPV+o3rWSXURZcVaPZ6PvK9hxjMZGQ7i79z5661xzlvwcrxzfe+7/en6fb3u5J3t7t/ZlhL/oUe4eH+e/tfp+B1p9uilxO8Bm/370WxSUegCwIOrkAQgnQNshDXGnRPN2e4RH2ICVWqy1YEphp9qiK36mec5cFrj9PUV6a5vI+a4FZ5fd8xa+7zO/zukVqlJ8zIWol3iZ5/5ZZZPvzWJWQpMILmlOd7f2c4EGA9lEh5mMtzEXIeW/ddUf3z4z+Q6/h/VIY+r/5eL3mz0TVIkAoAdoYiZ6Wi5wctYxXhSW/bY9T25XpeYFFRmK6PHJhg4Gqy0gE32IRG+/7u/0emy2CRbPhMf57ll877AUWAvRJi1xfCUQ9fo93R17gv8P/21V6v7CgTxrgmjPGz1Eo+uEBPtdztrInDIBQArQx4y2GZRFRGFFFDFT5R3ORx1h8VG1GoUtlfz4+yOvO9muPKf3Gi9950V/zyNLzD7dQFbcyLWGZb89w0QDvtcX7KFEcXTcIKCjCuR2lwUBRpHyJt6/w9oHYW3cLgFACtDEdFpOzSgKiZQ8Khz5Z8pgULlVodGHUkmJ6BnndcrhzbNRKuI0a5P+K2/L+bBng/Trsea4vebKHWRS3Wzg3+jU0GFBRhjV+nj7PYr+HtivEuyEosAAIJQAYeVSXRQ6tji4JzV0Wy54+PKmt+/naEqEvWYS77D1OLf29xd7jbnudk/yeE+3lHeZtmuvcZqHtSywlaNPt4Xb6fxb5NXbaW9xsW2Tx1GPP+zP3Rm1OtDNIxgGEEgBKyNM7zp7fXnt7ayxyGw7hdXstRj9O9g+RQ7DjLcwzLXxz/Z4qJD7ZAj3TQjYpatmuG/oQ7Xqe8uM/tvc7Nmr9NKf6701+/4E6oSCSgFACwD5IPLT27+ZkZ0Se5+ux8HTGoc3D7S2JrYRqXcnT7PB7jPb7jbKIbbJI7vVzJK7703JK4vqoX6veK1xT+pt2YYBQAsABIUG5w6Ilr06l7eZbnIYzWaWY/ys6oOwpidim0vO2HOBnwSsEhBIAhlyw1tv0GywyS9dzaAAQSgDYlz0IJEBz08khAAAAQCgBAAAQSgAAAIQSoHUZzyEAaD1I5gEYflTlRoXD1SLrZ5Gr1mgxP8W9ARBKAIi8HORDkVtSvS1yb0UVPr+VQwOAUAJUHdVTvSFyS63DbWqDpWkPFQRfxCECaG6YowQYXlT4XJV3Ti1tU+NmlZRbyuEBQCgBqu5NnmNvsigft9ue5ANBSykAhBKg4r+t85LdFLlLSNFrUc2ZvxG5KDr1UQEQSoDKokzXKyN3B+nyNonlPckeiX2LkANAE0MyD8DwiOQlyd4TuTtI2JuUF3l7MDcJgEcJUHGUwPPJZGdG7vkoVPj8n5P9NOjPCIBQAlSYacmuTXZu7BuxUQLPncm2cYgAWgtCrwBDx6Rkb0/2mWRzva3HIqkEHmW67uEwAeBRAlQRhViPSPauyEUFCiSM90aem9zCYQLAowSoqkienuz3Ime6ji15k/cl+16y1zhMAAglQFVRluvbLJJTS9sXJPu7ZHdxiABaF0KvAIf+G5prkTyytH1N5AzX+zhEAHiUAFWmx57jLRbNyyIv//hJsi9YMAEAoQSoNErY0Tzkk5FruY5O9sPIPScpUweAUAJUHlXdUUGBB5P9WeTydMuCwgIACCUA/AZPRQ7Bsl4SAKEEgD7oCcKtAG0FWa8A+4eWgFyQbA4DTAA8SgCoodZYqrRzebKrIyfofDHoAAKAUALAv/5Grkv26WRviDz3uCFyVuuzkRN5AAChBKgcmpZQ0+V3J/utZCfau1QT5g/7Oc8hlAAIJUDVkBiOT3Zcsg8kuyFyHdeC7ZHDr6sil6tbxyEDQCgBqsbFyW6K3DKrq7Rd3uPyZN9J9iNEEgChBKgaZyW73l7kyXW/j62RGy9/NXLbrE0cLgCEEqAKKNSqPpIKrypp56rIc5MdflzJOysjV935+2QPI5IACGWB6lX2+IKhiwVJC9BuAtmdbFqya5N9JNkVdc/R+a85yZuTfS3ZfA4bAEJZ5nCPsJX991DkuZltFs3dHDpocYpOHx+KPBc5ue7xXcnuiVzs/PbIyTsAgFD+KxppH5/sPycbE3lxtdaMvZjsGd9qLdneyHM3AK3ElGQ3WiRPiJy9WlSp0iBwSeQQq1plPehBIgAglPugsOv1vqDoIqI5nPOTbYmc6SexfMW3CyOvJ+vx450WUIBmZXOy6cmOTTbD2zS1oIjJq/Yib/bgEAAQyj45sjTSFh0Wz2k2XWB2+LFnfXF5wp7nI35svUVzR1AkGpoLDeR+kewtHgQKTSloyce3I2e1EikBgAGFUheJjZGz/SSQEyOvJysyAbuitr7szZHnc96X7KXIIVk1sF1l8bwvcpYgXiaMJKMGOefuTnZRslnJViT7ceQ5yVcQSQDYH6HUnMyXk90SeT2Z0uXVOUFzl0p6GB+1OZ0ie1CcFHmO5zxfbBSK/WyyWxFKGCGO8HmoxsmrI4dT+0P1Wl+IHPV4KpiLBIADEMqwN/iUR+ZHJ5ubbF6yUyMXh1Z4doaFs6MknIWnqfnNpfY2B2piK9EdGzk8K5HdzNcCB4FKzp0ZeT3keaXB3sIB/uc5e5CsiwSAgxLKiFoT2sW+oCg0NdEieWyyU5KdluycZDOjlj043qK3JvKc5UBzlLMjZx8eE3kZiuY7X7S4rrYI7+CrghI6J4p1vefZzrCd70Haa5GzVlcNMvhCJAHgkISyTOEVbvTFRSGrWy10s+xpHumL1gn2Qu+L2rxmX3RZYG/yxe399kIljE9baB+NHD5b4tuN9lIjSBKqGgrxj7ZIvjXZJR6ozfVtd+m5ympVKbqXiFIAwEgJZb2nWaBECCX9PGNPstsXrS4L20Ajdl3wLrQXOsHbziltl1fwqchhNHVsWGR7xd7m2sihNb3n9qCCULuigZiyrRWiv9QCOddieEw//7PGz9F5OFhiDwDAkAtlX4K316IoD/JeX5wGq+BTrNE8om574YXO9GvP9u2lFsxNvr8gcmhtvgXz50GYtp04N3JiTrGO9y0+ZyR+E/v5H0UkXvU5cZsHVYgkADRcKOtFszf2Lyza6wvaL30BnGZRDF8Me0uiWTTNnWHTY6oepOzancm+FXkOdecAXmWnvZDX/Nn34oE2rQf5bx1V0DmhJJ0x/q46+3i+vvPnk73syIbOp7ti37lMAICmEcoDQaFTLfx+yh6CusjP84VxioVQnulRFrVydm0hoONtG/1YfxfGCfZQLo9cXWi+n7vSXqpCt1rOMtpeaWcwBzrUFMd0oGNbiJvOgWv7iTQUr6GiFkoWe8FC+VjkbO3yQAwAoKWFUmi9W7F+7QF7EJpznOv9e2Pk0NuZFkRtH2cPtJh70v+vslj2hxKA3ht5zrNICFpvkdR8pzJ7lfRRJA0pmWiSvc9dvuhuspDuQUT369wqsqaPtsjJK9T89QIf5x39RBkOs/DVUxSuWOFz5WGfPwv9egAAbSmU9SP/db6orrAo3R95rvIwe5YKyxVZtXMiL1PZ6ItmV9QyYuuZZq9yXNQSh46L2vrNvVGrAfqst630a6vakMJ6W31BXuaL/WDeU+H9tGsIsBiodHsQ83rUkmx2RC0jVY+d7PsSu7uT/WX0P5+80UK53N/9Ym9bYoFUNvVOD3A28DMGgCoIZX/CWYjeat++6ovyz6M2XznZt4sGEEmJ1kRfrIs51I7SY8WygnG+PddeY3F8tljw1lsY/sTv118hhW6/3/H2TpfZO11rr2q3RbfLF/wuv24jvNSO0vEYTMwLb/qMqBWWOM6ftQiVT7Uwnu5j22mxLDKSeyyQ3QO8zzZHCP7G34m+d4VVn/Hr7RzguwYAqIRQDsRO3+6wB7g/qf89/qzL7S3q4r7d3ukuv8aoAY5N4YFO8kW8qyQafSGPSmtD3+OLfK89UrHG+77dHmu3hbTb3tYGC88yDwJWx8Ah5cJb3uvXnGxBnmZB3mavbLNFerQfn1PypGf5fVeWjm9fSAg/ZhGUgJ3i/5vs19jh7fWJWPXHU9+HQul3DfBeD9mD3B210DzJOQCAUB4E+5v6L8H6i8jJQhKLUy18x1sI1ai6WKYy1QI6ya9fFtGi8PtANUTlLao2rkKNZ1lARpe8oJ32UiUqr1kYi9ccY5HUNoWfP2cB7E/AtM9virwAX97W6/bodnq/J3rb5KiFpqf78Yn+3OssyP8YObkqBvDM3+XP1eFjM6fOky57qmV2e2DRXRLLgQY5RZGJviINAAAI5TAgb03zXvMtUGqpNCVq3VFm+yJ+osXqZD9vni/6U+01FfNnA13kj/JFvRDYMX3cTi6JckRtWYwE5AzfSjx/muxXA3wu7fN/tDBv82d63du7/fc0C3Px3ruiFmbe6efN9zEZKCNVz11loYw+vPDyoGKtX7eYW+zx7fN+7GWEDwAQyuajp+SthD0psdKeoi7yP7eIKVR5rIVFojLDnliHxWfvAMd0kj213b6/y69TFpLe6Lu8X2fpdq09zp5BPOrCEx1TJ75hkYyohY/rv/fCw5u1H+fD+Ni3/q483bE+fpt9nJ63mMqrLrJRO/z3au/j+hi4UD4AAELZpCJaCFIxJ7io7jnjYuCQa1gA9H9q4XSPBWqmhe8ki8T0qNUs1XzpCotr8f6TLETj7Ql2DiDMM0qCW4jv3j68vSL7tsMC3lUSK50Hy/xaA4ny8x5QfMXP074tjVqpwhdLnudif8awoJY9ewAAhLJN2bafz5PH+b8sFEUC0NEWpmlRyxidY1E7oiSQEy1CqmH6nL3K/kRSorfcYvW4hVICO9veW7ffa63Fep1FbIr/r8i6LZZYFF51f+8ngf2SPVZ5jK/a+97mx+r/dzunDAAglNAXu0pC8boFrVgfWszLFUtCxkRtucRobyvmGafEwOsE9VoKef5tsu/YWyuSc4paqGu8rRDOMRa46d6/df57pQWvd5D3K8LB5UFBATVVAQChhIOit+628M7KXur2kgdWJN7sT3uoXfYmhUK0z/p73RO1UOuCPjzRFaX7Gw7iswAAVIKO3l6uewAAAP3RySEAAABAKAEAABBKAAAAhBIAAGAE+f8CDABXljxRM/eEOgAAAABJRU5ErkJggg==") calc(100% - 32rpx) 12rpx/229rpx 178rpx no-repeat;
+		font-weight: 500;
+		font-size: 30rpx;
+		line-height: 68rpx;
+		color: #c1c1c1;
+		background-color: rgba(0, 0, 0, 0.8);
+
+		.iconfont {
+			margin-left: 10rpx;
+			font-weight: bold;
+			font-size: 30rpx;
+		}
+	}
+</style>
diff --git a/user/pages/app-download.vue b/user/pages/app-download.vue
new file mode 100644
index 0000000..bc56f3c
--- /dev/null
+++ b/user/pages/app-download.vue
@@ -0,0 +1,131 @@
+<template>
+	<view class="user-app-download" v-if="isLoad">
+		<block v-if="detail.app_download_img">
+			<image mode="widthFix" class="web-code-img" :src="detail.app_download_img">
+			</image>
+			<block v-if="(detail.ios_link && isIos) || (detail.android_link && !isIos)">
+				<view class="download-tip fix" v-if="isWechatAgent">
+					<image mode="widthFix" class="tip-img fix" src="https://lbqny.migugu.com/admin/anmo/mine/tip.png">
+					</image>
+				</view>
+				<view style="height: 200rpx;"></view>
+				<view class="space-safe"></view>
+				<view @tap.stop="toDownLoad" class="fix footer-btn">
+					<image mode="aspectFill" class="download-bg abs" src="https://lbqny.migugu.com/admin/anmo/mine/download-btn.png?1">
+					</image>
+					<view class="flex-center f-md-title c-base">
+						<view class="item-btn flex-center radius" :style="{background:detail.primaryColor}">
+							<i class="iconfont" :class="[{'icon-apple':isIos},{'icon-android':!isIos}]"></i>
+							<view>立即下载</view>
+						</view>
+					</view>
+				</view>
+			</block>
+		</block>
+		<abnor v-if="!detail.app_download_img"></abnor>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		data() {
+			return {
+				isLoad: false,
+				options: {},
+				isIos: uni.getSystemInfoSync().system.includes('iOS'),
+				isWechatAgent: true,
+				detail: {},
+			}
+		},
+		computed: mapState({}),
+		async onLoad() {
+			await this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initIndex()
+			uni.stopPullDownRefresh()
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getUserInfo']),
+			...mapMutations(['updateConfigItem']),
+			async initIndex() {
+				// #ifdef H5
+				this.isWechatAgent = await this.$jweixin.isWechat()
+				// #endif
+				this.detail = await this.$api.base.getConfig()
+				this.$util.setNavigationBarColor({
+					bg: this.detail.primaryColor
+				})
+				this.$util.hideAll()
+				this.isLoad = true
+			},
+			toDownLoad() {
+				let key = this.isIos ? 'ios_link' : 'android_link'
+				let url = this.detail[key]
+				console.log(url, "==========toDownLoad")
+				window.location.href = url
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	page {
+		background: #FEFFFE;
+	}
+
+	.user-app-download {
+		.web-code-img {
+			width: 750rpx;
+		}
+
+		.download-tip {
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100vh;
+			z-index: 1000;
+			background: rgba(000, 000, 000, 0.6);
+
+			.tip-img {
+				top: 30rpx;
+				right: 30rpx;
+				width: 500rpx;
+			}
+		}
+
+
+		.footer-btn {
+			width: 750rpx;
+			height: 500rpx;
+			bottom: 0;
+
+			.download-bg {
+				width: 750rpx;
+				height: 500rpx;
+				z-index: -1;
+			}
+
+			.item-btn {
+				width: 640rpx;
+				height: 100rpx;
+				margin-top: 260rpx;
+
+				.iconfont {
+					font-size: 50rpx;
+					margin-right: 10rpx;
+				}
+			}
+
+		}
+	}
+</style>
diff --git a/user/pages/apply-result.vue b/user/pages/apply-result.vue
new file mode 100644
index 0000000..398d508
--- /dev/null
+++ b/user/pages/apply-result.vue
@@ -0,0 +1,227 @@
+<template>
+	<view class="user-apply-result" v-if="isLoad">
+		<abnor percent="150%" @confirm="confirm" @cancel="cancel" :title="title[status]" :tip="tipArr[status]"
+			:button="buttonArr[status]" :image="image[status]" :tipMax="status == 4? '690rpx':''"></abnor>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+
+	export default {
+		components: {},
+		data() {
+			return {
+				options: {},
+				// -1未申请，1审核中，2审核通过，3取消授权，4审核失败(可再次申请)
+				tipArr: {
+					'1': [],
+					'2': [],
+					'3': [{
+						text: '平台管理员已取消授权',
+						color: 0
+					}],
+					'4': [{
+						text: '请联系平台管理人员询问失败原因',
+						color: 0
+					}]
+				},
+				buttonArr: {
+					'1': [{
+						text: '返回',
+						type: 'cancel'
+					}],
+					'2': [{
+						text: '',
+						type: 'confirm'
+					}],
+					'3': [{
+						text: '返回',
+						type: 'cancel'
+					}],
+					'4': [{
+						text: '再次申请',
+						type: 'confirm'
+					}, {
+						text: '返回',
+						type: 'cancel'
+					}]
+				},
+				title: {
+					'1': '等待审核',
+					'2': '',
+					'3': '取消授权',
+					'4': '申请失败',
+				},
+				image: {
+					'1': 'https://lbqny.migugu.com/admin/public/apply_wait.jpg',
+					'2': 'https://lbqny.migugu.com/admin/public/apply_suc.jpg',
+					'3': 'https://lbqny.migugu.com/admin/public/apply_fail.jpg',
+					'4': 'https://lbqny.migugu.com/admin/public/apply_fail.jpg',
+				},
+				isLoad: false,
+				status: 1
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			mineInfo: state => state.user.mineInfo,
+		}),
+		async onLoad(options) {
+			this.$util.showLoading()
+			this.options = options
+			this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		methods: {
+			...mapActions(['getUserInfo', 'getMineInfo']),
+			...mapMutations(['updateUserItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				await this.getMineInfo()
+				let {
+					type
+				} = this.options
+				let {
+					coach_status,
+					sh_text,
+					fx_status,
+					fx_text,
+					channel_status,
+					channel_text,
+					salesman_status,
+					salesman_sh_text
+				} = this.mineInfo
+				let statusArr = {
+					1: coach_status,
+					2: fx_status,
+					3: channel_status,
+					4: salesman_status
+				}
+				let textArr = {
+					1: sh_text,
+					2: fx_text,
+					3: channel_text,
+					4: salesman_sh_text
+				}
+				let status = statusArr[type]
+				let text = textArr[type]
+				this.status = status
+
+				if (status == 1) {
+					this.tipArr[status] = type == 1 ? [{
+						text: '审核成功后将直接入驻平台',
+						color: 0
+					}] : [{
+						text: '您已经成功提交申请',
+						color: 0
+					}, {
+						text: '审核将在3个工作日内出结果，请耐心等待',
+						color: 0
+					}]
+				}
+				if (status == 2) {
+					let sfText = {
+						2: '分销商',
+						3: '渠道商',
+						4: '业务员'
+					}
+					let tips = [{
+						text: '恭喜您，审核通过！',
+						color: 0
+					}]
+
+					tips.push(type == 1 ? {
+						text: '快去管理订单吧',
+						color: 0
+					} : {
+						text: `您已具备${sfText[type]}资格，快去分享体验吧~`,
+						color: 0
+					})
+
+					this.tipArr[status] = tips
+					this.buttonArr[status][0].text = type == 1 ? `去管理` : `去分享`
+					this.title[status] = type == 1 ? `入驻成功` : `审核通过`
+				}
+				if (status == 4 && text) {
+					this.tipArr[status][0].text = text
+				}
+				this.$util.hideAll()
+				this.isLoad = true
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				uni.setNavigationBarTitle({
+					title: this.title[status]
+				})
+			},
+			initRefresh() {
+				this.isLoad = false
+				this.initIndex(true)
+			},
+			// 去管理/再次申请
+			async confirm() {
+				let {
+					status
+				} = this
+				let {
+					type
+				} = this.options
+				let page = {
+					1: `/technician/pages/apply`,
+					2: `/user/pages/distribution/apply`,
+					3: `/user/pages/channel/apply`,
+					4: `/user/pages/salesman/apply`
+				}
+				let url = status == 2 ? type == 1 ? `/pages/mine` : type == 3 ? `/user/pages/channel/income` :
+					`/pages/service` : page[type]
+				this.$util.log(url)
+				this.$util.goUrl({
+					url,
+					openType: status == 2 ? `reLaunch` : `redirectTo`
+				})
+			},
+			// 返回首页
+			cancel() {
+				if (getCurrentPages().length > 1) {
+					this.$util.back()
+					this.$util.goUrl({
+						url: 1,
+						openType: `navigateBack`
+					})
+					return
+				}
+				this.$util.goUrl({
+					url: `/pages/mine`,
+					openType: `reLaunch`
+				})
+			},
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	page {
+		background: white;
+	}
+</style>
\ No newline at end of file
diff --git a/user/pages/article.vue b/user/pages/article.vue
new file mode 100644
index 0000000..edb4aa4
--- /dev/null
+++ b/user/pages/article.vue
@@ -0,0 +1,219 @@
+<template>
+	<view class="user-pages-article" v-if="isLoad">
+		<view class="pd-lg f-paragraph fill-base">
+			<parser :html="detail.text" @linkpress="linkpress" show-with-animation lazy-load>加载中...
+			</parser>
+		</view>
+
+		<block v-if="detail.is_form">
+			<view class="form-info mt-lg ml-md mr-md pd-lg fill-base radius-20">
+				<view class="mt-md mb-lg" v-for="(item,index) in detail.field" :key="index">
+					<view class="item-text flex-y-center"><i class="iconfont icon-required"
+							:class="[{'c-warning':item.is_required},{'c-base':!item.is_required}]"></i>{{item.title}}
+					</view>
+					<input v-model="item.field_value" type="text" class="item-input mt-md pd-lg radius-16"
+						:placeholder="`请输入${item.title}`" />
+				</view>
+			</view>
+
+			<fix-bottom-button @confirm="submit" :text="[{text:'提交',type:'confirm',isAuth:true}]" bgColor="#fff">
+			</fix-bottom-button>
+		</block>
+		<view :class="[{'space-footer':!detail.is_form},{'space-max-footer':detail.is_form}]"></view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	import parser from "@/components/jyf-Parser/index"
+	export default {
+		components: {
+			parser
+		},
+		data() {
+			return {
+				options: {},
+				isLoad: false,
+				detail: {},
+				pageLen: 1
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+			loginPage: state => state.user.loginPage,
+		}),
+		onLoad(options) {
+			this.options = options
+			this.$util.showLoading()
+			this.initIndex()
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getUserInfo']),
+			...mapMutations(['updateUserItem']),
+			async initIndex(refresh = false) {
+				let {
+					id
+				} = this.options
+				let data = await this.$api.service.articleInfo({
+					id
+				})
+				if (data.is_form) {
+					data.field.map(aitem => {
+						aitem.field_value = ''
+					})
+				}
+				this.detail = data
+				uni.setNavigationBarTitle({
+					title: data.title
+				})
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				this.$util.hideAll()
+				this.isLoad = true
+				this.pageLen = getCurrentPages().length
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			linkpress(res) {
+				// #ifdef APP-PLUS
+				this.$util.goUrl({
+					url: res.href,
+					openType: 'web'
+				})
+				// #endif
+			},
+			async submit() {
+				let {
+					id: uid = 0,
+					phone = ''
+				} = this.userInfo
+				let {
+					loginType
+				} = this
+				let {
+					short_code_status
+				} = this.configInfo
+				if (!uid || (loginType === 'weixin' && short_code_status && !phone)) {
+					let {
+						id,
+						type
+					} = this.options
+					this.updateUserItem({
+						key: 'loginPage',
+						val: `/user/pages/article?id=${id}`
+					})
+					this.$util.goUrl({
+						url: `/pages/login`
+					})
+					return
+				}
+				let {
+					is_form,
+					field
+				} = this.detail
+				if (is_form == 1) {
+					field = this.$util.deepCopy(field)
+					let isTel = /^(1[0-9]{10})$/
+					for (let key in field) {
+						let index = key * 1 + 1
+						let {
+							is_required,
+							field_value,
+							field_type,
+							title
+						} = field[key]
+
+						if (field_type === 1) {
+							field_value = field_value ? field_value.replace(/(^\s*)|(\s*$)/g, "") : field_value
+						}
+
+						if ((is_required && !field_value) || (field_type === 2 && (is_required || field_value) &&
+								!isTel.test(field_value))) {
+							this.$util.showToast({
+								title: field_type === 2 && field_value && !isTel.test(field_value) ?
+									`${field_value} ${title}无效` : `请输入${title}`
+							})
+							return
+						}
+
+					}
+
+				}
+				let {
+					id: article_id
+				} = this.options
+				let sub_data = this.detail.field.map(item => {
+					return {
+						field_id: item.field_id,
+						field_type: item.field_type,
+						key: item.title,
+						value: item.field_value
+					}
+				})
+
+				let arr = sub_data.filter(item => {
+					return item.value
+				})
+				if (arr.length === 0) {
+					this.$util.showToast({
+						title: `至少填写一项哦`
+					})
+					return
+				}
+				if (this.lockTap) return
+				this.lockTap = true
+				this.$util.showLoading()
+				try {
+					await this.$api.service.subArticleForm({
+						article_id,
+						sub_data
+					})
+					this.lockTap = false
+					this.$util.hideAll()
+					this.$util.showToast({
+						title: `提交成功`
+					})
+					setTimeout(() => {
+						let {
+							pageLen
+						} = this
+						let url = pageLen > 1 ? 1 : `/pages/service`
+						let openType = pageLen > 1 ? `navigateBack` : `reLaunch`
+						this.$util.goUrl({
+							url,
+							openType
+						})
+					}, 2000)
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.user-pages-info {
+
+		.form-info {
+			.item-input {
+				color: #333;
+				background: #F7F8FA;
+			}
+		}
+	}
+</style>
diff --git a/user/pages/bell/list.vue b/user/pages/bell/list.vue
new file mode 100644
index 0000000..67fa932
--- /dev/null
+++ b/user/pages/bell/list.vue
@@ -0,0 +1,610 @@
+<template>
+	<view class="pages-user-bell" v-if="isLoad">
+		<!-- <fixed v-if="can_add_order">
+			<tab @change="handerTabChange" :list="tabList" :activeIndex="activeIndex*1" :activeColor="primaryColor"
+				width="50%" height="100rpx"></tab>
+			<view class="b-1px-b"></view>
+		</fixed> -->
+		<!-- <view class="pt-lg pl-lg pr-lg" v-if="activeIndex==0 && have_check.length>0"> -->
+		<view class="pt-lg pl-lg pr-lg" v-if="activeIndex==0 && have_check.length>0">
+			<view class="f-desc c-paragraph text-bold">已选择项目</view>
+			<block v-for="(item, index) in have_check" :key="index">
+				<view class="list-item pd-lg fill-base radius-16" :class="[{'mt-lg':index==0},{'mt-md':index!=0}]">
+					<view class="flex-center">
+						<!-- #ifdef H5 -->
+						<view class="cover radius-16">
+							<view class="h5-image cover radius-16" :style="{ backgroundImage : `url('${item.cover}')`}">
+							</view>
+						</view>
+						<!-- #endif -->
+						<!-- #ifndef H5 -->
+						<image mode="aspectFill" class="cover radius-16" :src="item.cover"></image>
+						<!-- #endif -->
+
+						<view class="flex-1 ml-md" style="max-width: 456rpx;">
+							<view class="flex-between">
+								<view class="f-title c-title text-bold ellipsis" style="max-width: 250rpx;">
+									{{ item.title }}
+								</view>
+								<view class="flex-warp">
+									<button @tap.stop="changeNum(-1,index)" class="reduce"
+										:style="{borderColor:primaryColor,color:primaryColor}"><i
+											class="iconfont icon-jian-bold"></i></button>
+									<button class="addreduce clear-btn">{{item.init_add_num || 0}}</button>
+
+									<button @tap.stop="changeNum(1,index)" class="add"
+										:style="{background:primaryColor,borderColor:primaryColor}"><i
+											class="iconfont icon-jia-bold"></i></button>
+								</view>
+
+							</view>
+							<view class="flex-warp mt-sm">
+								<view class="time-long flex-center">{{ item.time_long }}分钟</view>
+								<view class="f-caption c-caption">{{ item.total_sale }}人已预约</view>
+							</view>
+							<view class="flex-between mt-md">
+								<view class="flex-y-baseline">
+									<view class="flex-y-baseline f-icontext c-warning ml-sm mr-sm">¥<view
+											class="f-sm-title">
+											{{ item.price }}
+										</view>
+									</view>
+									<view class="flex-y-baseline f-caption c-paragraph" v-if="!activeIndex">需补差价:<view
+											class="c-warning">
+											¥{{item.init_add_price}}</view>
+									</view>
+								</view>
+								<view @tap.stop="toAddDelItem(2,index)" class="remove-btn flex-center f-caption radius"
+									:style="{color:primaryColor,border:`1rpx solid ${primaryColor}`}">移除
+								</view>
+							</view>
+						</view>
+					</view>
+
+					<view class="flex-between f-desc mt-lg pt-lg b-1px-t" style="color: #2E3541;">
+						<view class="flex-y-center">{{item.order_goods_name | textFormat }}</view>
+						<view class="shengji-icon-text flex-1 flex-center flex-column" :style="{color:primaryColor}">
+							<view class="f-icontext">升级为</view>
+							<i class="iconfont iconshengji"></i>
+						</view>
+						<view class="flex-y-center">{{item.title | textFormat }}</view>
+					</view>
+				</view>
+			</block>
+		</view>
+
+		<view class="pd-md" v-if="activeIndex==1">
+			<view class="flex-y-center f-title c-title text-bold"> 选择加钟项目 </view>
+		</view>
+
+		<view class="flex-center pt-lg pb-sm pl-lg pr-lg fill-base mt-md rel" v-if="activeIndex === 0">
+			<view class="flex-1 flex-y-center f-title c-title text-bold">
+				将<view :style="{color:primaryColor}">{{order_goods[goodsInd].goods_name | textFormat }}</view>升级为以下项目
+			</view>
+			<view @tap.stop="showGoods = !showGoods" class="change-btn flex-center radius"
+				:style="{color:primaryColor,border:`1rpx solid ${primaryColor}`}">切换项目 <i class="iconfont"
+					:class="[{'icon-up-fill':showGoods},{'icon-down-fill':!showGoods}]"></i></view>
+			<view class="change-goods-info pd-md abs" v-if="showGoods">
+				<view @tap.stop="toChangeGoods(index)" class="goods-title flex-y-center"
+					:class="[{'c-title':goodsInd!=index},{'c-base cur':goodsInd==index}]"
+					:style="{background:goodsInd==index?primaryColor:'',borderColor:goodsInd==index?primaryColor:''}"
+					v-for="(item,index) in order_goods" :key="index">{{item.goods_name}}
+				</view>
+			</view>
+		</view>
+		<view :class="[{'pl-lg pr-lg fill-base' :activeIndex==0}]">
+			<block v-for="(item, index) in serviceList" :key="index">
+				<view @tap.stop="toAddDelItem(1,index)" class="list-item flex-center"
+					:class="[{'pt-lg pb-lg':activeIndex==0},{'ml-md mr-md pd-lg fill-base radius-16':activeIndex==1},{'b-1px-t':index!=0 && item.id != no_check_id && activeIndex==0},{'mt-md':index!=0&&activeIndex==1}]"
+					v-if="(activeIndex==0&&!item.is_check) || activeIndex==1">
+					<i class="iconfont mr-md"
+						:class="[{'icon-xuanze':!item.is_check},{'icon-xuanze-fill':item.is_check}]"
+						:style="{color:item.is_check?primaryColor:'#999'}" v-if="activeIndex==0"></i>
+					<view class="flex-center flex-1">
+						<!-- #ifdef H5 -->
+						<view class="cover radius-16">
+							<view class="h5-image cover radius-16" :style="{ backgroundImage : `url('${item.cover}')`}">
+							</view>
+						</view>
+						<!-- #endif -->
+						<!-- #ifndef H5 -->
+						<image mode="aspectFill" class="cover radius-16" :src="item.cover"></image>
+						<!-- #endif -->
+
+						<view class="flex-1 ml-md" :style="{maxWidth:activeIndex==0?'456rpx':'495rpx'}">
+							<view class="flex-between">
+								<view class="f-title c-title text-bold ellipsis" style="max-width: 250rpx;">
+									{{ item.title }}
+								</view>
+								<view class="f-caption c-caption">{{ item.total_sale }}人已预约</view>
+							</view>
+							<view class="flex-between mt-sm">
+								<view class="time-long flex-center">{{ item.time_long }}分钟</view>
+								<view>
+									<view class="f-caption c-caption" v-if="item.material_price*1>0">
+										物料费：¥{{item.material_price}}</view>
+								</view>
+							</view>
+							<view class="flex-center mt-md">
+								<view class="flex-1 flex-y-baseline f-icontext c-warning ml-sm mr-sm">¥<view
+										class="f-sm-title">
+										{{ item.price }}
+									</view>
+								</view>
+								<view class="flex-y-center f-paragraph c-paragraph" v-if="activeIndex==0">需补差价<view
+										class="c-warning">¥{{item.init_add_price}}</view>
+								</view>
+								<view class="flex-warp" v-if="activeIndex==1">
+									<block v-if="item.car_num">
+										<button @tap.stop="changeNum(-1,index)" class="reduce"
+											:style="{borderColor:primaryColor,color:primaryColor}"><i
+												class="iconfont icon-jian-bold"></i></button>
+										<button class="addreduce clear-btn">{{item.car_num || 0}}</button>
+									</block>
+									<button @tap.stop="changeNum(1,index)" class="add"
+										:style="{background:primaryColor,borderColor:primaryColor}"><i
+											class="iconfont icon-jia-bold"></i></button>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</block>
+			<view class="space-md" v-if="have_all_check || serviceList.length==0"></view>
+		</view>
+
+		<abnor v-if="(!loading&&serviceList.length==0) || (activeIndex==0 && have_all_check)"></abnor>
+
+		<view class="space-max-footer"></view>
+
+		<!-- <fix-bottom-button @cancel="$util.goUrl({url:1,openType:`navigateBack`})" @confirm="toOrder"
+			:text="[{text:`暂不${navTitle}`,type:'cancel'},{text:'下单',type:'confirm',isAuth:true}]" bgColor="#fff"
+			:classType="2"> -->
+			<fix-bottom-button @cancel="$util.goUrl({url:1,openType:`navigateBack`})" @confirm="toOrder"
+				:text="[{text:`暂不加钟`,type:'cancel'},{text:'下单',type:'confirm',isAuth:true}]" bgColor="#fff"
+				:classType="2">
+		</fix-bottom-button>
+
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		data() {
+			return {
+				isLoad: false,
+				options: {},
+				navTitle: '',
+				tabList: [{
+					id: 1,
+					title: '项目升级'
+				}, {
+					id: 2,
+					title: '项目加钟'
+				}],
+				activeIndex: 1,
+				serviceList: [],
+				serviceList_check: [],
+				no_check_id: 0,
+				have_check: [],
+				have_check_num: 0,
+				have_all_check: false,
+				can_add_order: 0, // 是否可加钟
+				order_goods: [],
+				order_uprecord: [],
+				goodsInd: 0,
+				showGoods: false,
+				loading: true,
+				popupInfo: {},
+				lockTap: false
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad(options) {
+			this.options = options
+			// let {
+			// 	tab = 1
+			// } = options
+			let tab = 1
+			this.activeIndex = tab
+			this.initIndex()
+		},
+		watch: {
+			'have_check'(value) {
+				if (this.activeIndex == 0) {
+					this.toFormatHaveCheck()
+				}
+			}
+		},
+		filters: {
+			textFormat(val) {
+				let text = val
+				if (val.length > 5) {
+					text = val.substring(0, 5) + '...'
+				}
+				return text
+			}
+		},
+		methods: {
+			...mapActions([]),
+			...mapMutations(['updateOrderItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				await this.getDetail()
+				await this.getList()
+				uni.setNavigationBarTitle({
+					title: this.navTitle
+				})
+				this.isLoad = true
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			async getDetail() {
+				let {
+					id,
+				} = this.options
+				let {
+					order_goods,
+					can_add_order
+				} = await this.$api.order.orderInfo({
+					id
+				})
+				this.order_goods = order_goods
+				this.can_add_order = can_add_order
+				this.navTitle = can_add_order ? '升级/加钟' : '升级项目'
+			},
+			async getList() {
+				let {
+					id: order_id,
+					coach_id
+				} = this.options
+				let {
+					id: order_goods_id,
+					true_price,
+				} = this.order_goods[this.goodsInd]
+				let {
+					activeIndex
+				} = this
+				let methodModel = activeIndex === 0 ? 'getUpOrderGoods' : 'coachServiceList'
+				let param = activeIndex === 0 ? {
+					order_goods_id
+				} : {
+					coach_id,
+					order_goods_id,
+					is_add: 1
+				}
+				let data = await this.$api.service[methodModel](param)
+				if (activeIndex == 1) {
+					data = data.data
+				}
+
+				data.map(item => {
+					item.is_check = false
+					if (activeIndex == 0) {
+						item.init_add_num = 1
+						item.init_add_price = (item.price - true_price).toFixed(2)
+						item.is_check = this.serviceList_check.includes(item.id)
+					}
+				})
+				this.serviceList = data
+				await this.toFormatHaveCheck(3)
+				this.loading = false
+				this.$util.hideAll()
+			},
+			handerTabChange(index) {
+				this.activeIndex = index
+				this.serviceList = []
+				this.getList()
+			},
+			async toChangeGoods(index) {
+				this.goodsInd = index
+				this.showGoods = false
+				await this.toFormatHaveCheck(2)
+				this.handerTabChange(0)
+			},
+			async toFormatHaveCheck(type = 1) {
+				let {
+					id
+				} = this.order_goods[this.goodsInd]
+				if (type != 3) {
+					let arr = this.have_check.filter(item => {
+						return item.order_goods_id == id
+					})
+					this.have_all_check = arr.length == this.serviceList.length
+
+					this.serviceList_check = arr.map(item => {
+						return item.id
+					})
+
+					let have_check_num = 0
+					arr.map(item => {
+						have_check_num = have_check_num + item.init_add_num
+					})
+					this.have_check_num = have_check_num
+
+				}
+
+				if (type != 2) {
+					let no_check = this.serviceList.filter(item => {
+						return !item.is_check
+					})
+					this.no_check_id = no_check.length > 0 ? no_check[0].id : 0
+				}
+			},
+			// 加/减数量
+			async changeNum(mol, index) {
+				let {
+					activeIndex
+				} = this
+				if (activeIndex == 0) {
+					let have_check = this.$util.deepCopy(this.have_check)
+					let {
+						init_add_num
+					} = have_check[index]
+					let {
+						num: goods_num
+					} = this.order_goods[this.goodsInd]
+					let {
+						have_check_num
+					} = this
+					let num = init_add_num + mol
+					if ((have_check_num + mol > goods_num) || !num) {
+						this.$util.showToast({
+							title: !num ? `数量至少为1` : `数量不可大于${init_add_num}`
+						})
+						return
+					}
+					have_check[index].init_add_num = num
+					this.have_check = have_check
+					return
+				}
+
+
+				let {
+					id: order_id,
+					coach_id
+				} = this.options
+				let {
+					id: service_id,
+					car_num = 0,
+					car_id = 0
+				} = this.serviceList[index]
+				if (this.lockTap) return;
+				this.lockTap = true;
+				let methodModel = mol > 0 ? 'addCar' : 'delCar'
+				let param = mol > 0 ? {
+					service_id,
+					coach_id,
+					order_id,
+					num: 1
+				} : {
+					id: car_id,
+					num: 1
+				}
+				try {
+					let add_car_id = await this.$api.order[methodModel](param)
+					this.serviceList[index].car_num = car_num + mol
+					if (add_car_id && mol > 0 && !car_id) {
+						this.serviceList[index].car_id = add_car_id
+					}
+					if (this.serviceList[index].car_num < 1) {
+						this.serviceList[index].car_id = 0
+					}
+					this.lockTap = false
+				} catch (e) {
+					this.lockTap = false
+				}
+
+			},
+			// 选择升级项目/加钟项目加购
+			async toAddDelItem(type, index) {
+				let {
+					activeIndex,
+					have_check_num
+				} = this
+				if (activeIndex == 1) return
+				let {
+					id: order_goods_id,
+					num: goods_num,
+					goods_name
+				} = this.order_goods[this.goodsInd]
+
+				if (type == 1 && have_check_num == goods_num) {
+					this.$util.showToast({
+						title: `当前项目最多可升级${goods_num}个服务数量`
+					})
+					return
+				}
+				if (type == 1) {
+					this.serviceList[index].order_goods_id = order_goods_id
+					this.serviceList[index].order_goods_name = goods_name
+					this.serviceList[index].is_check = true
+					this.have_check.push(this.serviceList[index])
+				} else {
+					let {
+						id: serid,
+						order_goods_id: ogid
+					} = this.have_check[index]
+					this.have_check.splice(index, 1)
+					if (order_goods_id == ogid) {
+						let serind = this.serviceList.findIndex(item => {
+							return item.id === serid
+						})
+						this.serviceList[serind].is_check = false
+					}
+				}
+			},
+			// 下单
+			async toOrder() {
+				let {
+					have_check,
+					activeIndex,
+				} = this
+				let car_count = 0
+				if (activeIndex == 1) {
+					this.serviceList.map(item => {
+						car_count += item.car_num
+					})
+				}
+				if ((activeIndex == 0 && have_check.length == 0) || (activeIndex == 1 && car_count < 1)) {
+					let msg = activeIndex == 0 ? `升级` : `加钟`
+					this.$util.showToast({
+						title: `请选择${msg}服务`
+					})
+					return
+				}
+				let {
+					id: order_id,
+					coach_id
+				} = this.options
+
+				let val = {
+					order_type: activeIndex
+				}
+
+				if (activeIndex == 0) {
+
+					let order_goods = have_check.map(aitem => {
+						return {
+							order_goods_id: aitem.order_goods_id,
+							service_id: aitem.id,
+							num: aitem.init_add_num
+						}
+					})
+
+					val = Object.assign({}, val, {
+						order_id,
+						order_goods
+					})
+
+				} else {
+					val = Object.assign({}, val, {
+						coach_id,
+						order_id
+					})
+					await this.$api.order.checkAddOrder({
+						order_id
+					})
+				}
+
+				this.updateOrderItem({
+					key: 'bellOrderParams',
+					val
+				})
+				this.$util.goUrl({
+					url: `/user/pages/bell/order`,
+					openType: `redirectTo`
+				})
+			},
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.pages-user-bell {
+		.change-goods-info {
+			top: 89rpx;
+			right: 30rpx;
+			min-width: 218rpx;
+			min-height: 280rpx;
+			max-height: 500rpx;
+			overflow-y: auto;
+			background: #FFFFFF;
+			box-shadow: 0px 6px 16px 0px rgba(222, 222, 222, 0.37);
+			border-radius: 16px;
+			border: 1px solid #F5F5F5;
+			z-index: 99999;
+
+			.goods-title {
+				font-size: 20rpx;
+				margin: 15rpx 0;
+			}
+
+			.cur {
+				height: 36rpx;
+				padding: 0 9rpx;
+				border-radius: 4rpx;
+			}
+		}
+
+		.list-item {
+
+			.icon-xuanze,
+			.icon-xuanze-fill {
+				font-size: 40rpx;
+			}
+
+			.cover {
+				width: 155rpx;
+				height: 155rpx;
+			}
+
+			.time-long {
+				min-width: 72rpx;
+				height: 30rpx;
+				padding: 0 5rpx;
+				background: linear-gradient(270deg, #4C545A 0%, #282B34 100%);
+				border-radius: 4rpx;
+				font-size: 20rpx;
+				color: #FFEEB9;
+				margin-right: 16rpx;
+			}
+
+			.f-icontext {
+				font-size: 18rpx;
+			}
+
+			.text-delete {
+				font-size: 20rpx;
+				color: #B9B9B9;
+			}
+
+			.remove-btn {
+				width: 110rpx;
+				height: 54rpx;
+				transform: rotateZ(360deg);
+			}
+
+			.shengji-icon-text {
+				height: 60rpx
+			}
+
+		}
+
+		.change-btn {
+			width: 125rpx;
+			height: 46rpx;
+			font-size: 20rpx;
+			transform: rotateZ(360deg);
+
+			.iconfont {
+				font-size: 20rpx;
+				transform: scale(0.8);
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/user/pages/bell/order.vue b/user/pages/bell/order.vue
new file mode 100644
index 0000000..10066d6
--- /dev/null
+++ b/user/pages/bell/order.vue
@@ -0,0 +1,461 @@
+<template>
+	<view class="order-pages" v-if="isLoad">
+
+		<view v-if="orderInfo.order_goods && orderInfo.order_goods.length > 0">
+			<view class="mt-md ml-lg mr-lg  fill-base radius-16">
+				<view class="list-item flex-center pd-lg" :class="[{'b-1px-t':index!=0}]"
+					v-for="(item,index) in orderInfo.order_goods" :key="index">
+					<!-- #ifdef H5 -->
+					<view class="item-img radius-16">
+						<view class="h5-image item-img radius-16" :style="{ backgroundImage : `url('${item.cover}')`}">
+						</view>
+					</view>
+					<!-- #endif -->
+					<!-- #ifndef H5 -->
+					<image mode="aspectFill" class="item-img radius-16" :src="item.cover"></image>
+					<!-- #endif -->
+					<view class="flex-1 ml-md">
+						<view :class="[{'flex-between':bellOrderParams.order_type==0}]">
+							<view class="f-title c-title text-bold ellipsis"
+								:class="[{'max-400':bellOrderParams.order_type==0},{'max-470':bellOrderParams.order_type==1}]">
+								{{item.title}}
+							</view>
+							<view class="f-caption c-caption" v-if="bellOrderParams.order_type ==0">x{{item.num}}
+							</view>
+						</view>
+						<view class="flex-between">
+							<view class="flex-y-center f-desc c-caption">
+								<view class="f-title c-warning mr-sm">
+									¥{{bellOrderParams.order_type ==0?item.pay_price:item.price}}</view>
+								<view class="text-delete mr-sm" v-if="bellOrderParams.order_type ==0">¥{{item.price}}
+								</view>
+								{{`/ ${item.time_long}`}}分钟
+							</view>
+							<view>
+								<view class="f-caption c-caption" v-if="item.material_price*1>0">
+									物料费：¥{{item.material_price}}</view>
+							</view>
+						</view>
+						<view class="flex-between">
+							<view class="f-caption c-caption mt-sm mb-sm ellipsis" style="max-width: 300rpx;">
+								服务{{$t('action.attendantName')}}：{{orderInfo.coach_info?orderInfo.coach_info.coach_name:'-'}}
+							</view>
+							<view>
+								<view class="flex-warp" v-if="bellOrderParams.order_type==1">
+									<button @tap.stop="changeNum(-1,index)" class="reduce"
+										:style="{borderColor:primaryColor,color:primaryColor}"><i
+											class="iconfont icon-jian-bold"></i></button>
+									<button class="addreduce clear-btn">{{item.num || 0}}</button>
+									</block>
+									<button @tap.stop="changeNum(1,index)" class="add"
+										:style="{background:primaryColor,borderColor:primaryColor}"><i
+											class="iconfont icon-jia-bold"></i></button>
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="mt-md ml-lg mr-lg fill-base radius-16">
+				<view class="flex-between pd-lg b-1px-b">
+					<view class="f-title c-title text-bold">服务开始时间</view>
+					<view class="f-paragraph c-caption">
+						{{orderInfo.order_start_time}}
+					</view>
+				</view>
+				<view class="flex-between pd-lg">
+					<view class="f-title c-title text-bold">服务结束时间</view>
+					<view class="f-paragraph c-caption">
+						{{orderInfo.order_end_time}}
+					</view>
+				</view>
+			</view>
+
+			<view class="mt-md ml-lg mr-lg fill-base radius-16">
+				<block v-for="(item,index) in payList" :key="index">
+					<view @tap.stop="toChangeItem(index,2)" class="flex-between pt-lg pb-lg pl-lg pr-md b-1px-b"
+						v-if="(bellOrderParams.order_type == 0 &&orderInfo.pay_model == item.id ) || bellOrderParams.order_type == 1">
+						<view class="flex-y-center f-title c-title">
+							<i class="iconfont mr-md" :class="item.icon"
+								:style="{color:item.id==1?primaryColor:'',fontSize:'50rpx'}"></i>
+							{{item.title}}
+							<view class="f-paragraph c-caption ml-md" v-if="item.id == 2">余额{{balance || 0}}元</view>
+						</view>
+						<view class="flex-y-center" :style="{color:payInd == index ? primaryColor:''}">
+							<i class="pay-icon iconfont icon-xuanze mr-sm"
+								:class="[{'icon-xuanze-fill':item.is_disabled || payInd == index}]"></i>
+						</view>
+					</view>
+				</block>
+			</view>
+
+			<view @tap.stop="isAgree=!isAgree"
+				class="mt-md ml-lg mr-lg pd-lg fill-base f-paragraph c-title flex-y-center radius-16"
+				v-if="configInfo.trading_rules && configInfo.trading_rules.length>0">
+				<i class="iconfont mr-sm" :class="isAgree?'icon-xuanze-fill':'icon-xuanze'"
+					:style="{color:isAgree?primaryColor:''}"></i>
+				我已阅读并同意<view @tap.stop="$refs.show_rule_item.open()" :style="{color:primaryColor}">《平台交易规则》</view>
+			</view>
+
+			<view class="space-max-footer"></view>
+
+			<view class="pay-info fix flex-between text-right pl-lg pr-lg fill-base">
+				<view class="flex-y-center f-paragraph c-title text-bold ml-sm mr-lg">合计：
+					<view class="flex-y-baseline f-title c-warning">¥{{orderInfo.pay_price}}</view>
+				</view>
+				<auth :needAuth="userInfo && (!userInfo.phone || !userInfo.nickName)" :must="true"
+					:type="!userInfo.phone ? 'phone' : 'userInfo'" @go="toPay" style="width: 182rpx;">
+					<view class="pay-btn flex-center f-paragraph c-base radius" :style="{background:primaryColor}">
+						立即支付</view>
+				</auth>
+			</view>
+
+		</view>
+
+		<abnor @confirm="$util.goUrl({url:1,openType:`navigateBack`})" :tip="[{ text: '该服务已下架~', color: 0 }]"
+			:button="[{ text: '去看看其他加钟服务' , type: 'confirm' }]" btnSize="" v-else>
+		</abnor>
+
+		<uni-popup ref="show_rule_item" type="center" :maskClick="false">
+			<view class="popup-rule">
+				<view class="fill-base pd-lg radius-26">
+					<view class="f-title c-title text-bold flex-center pd-lg">平台交易规则</view>
+					<scroll-view scroll-y @touchmove.stop.prevent class="rule-text">
+						<parser :html="configInfo.trading_rules" @linkpress="linkpress" show-with-animation lazy-load>
+							加载中...
+						</parser>
+					</scroll-view>
+				</view>
+				<view @tap="$refs.show_rule_item.close()" class="flex-center pd-lg"><i
+						class="iconfont icon-close c-base"></i></view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	import parser from "@/components/jyf-Parser/index"
+	export default {
+		components: {
+			parser
+		},
+		data() {
+			return {
+				isLoad: false,
+				options: {},
+				// 1微信支付；2余额支付；3支付宝支付
+				payList: [{
+					id: 1,
+					icon: 'iconweixinzhifu1',
+					title: '微信支付'
+				}, {
+					id: 2,
+					icon: 'iconqianbao c-balance',
+					title: '账户余额',
+					is_disabled: false
+				}],
+				payInd: 0,
+				balanceInd: 1,
+				balance: 0,
+				send_info: {
+					time_index: 0,
+					time: {}
+				},
+				orderInfo: {
+					coupon_id: 0,
+					address_info: {
+						id: 0
+					}
+				},
+				lockTap: false,
+				isBus: 0,
+				isAgree: false
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			commonOptions: state => state.user.commonOptions,
+			userInfo: state => state.user.userInfo,
+			mineInfo: state => state.user.mineInfo,
+			bellOrderParams: state => state.order.bellOrderParams,
+		}),
+		async onLoad() {
+			await this.initIndex()
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getMineInfo']),
+			...mapMutations(['updateUserItem', 'updateOrderItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				await this.getConfigInfo()
+				let {
+					alipay_status = 0
+				} = this.configInfo
+
+				if (alipay_status) {
+					// #ifndef MP-WEIXIN
+					let pay = this.payList.findIndex(item => {
+						return item.id == 3
+					})
+					if (pay === -1) {
+						this.payList.splice(1, 0, {
+							id: 3,
+							icon: 'icon-alipay c-alipay',
+							title: '支付宝支付'
+						})
+						this.balanceInd = 2
+					}
+					// #endif
+				}
+				let param = this.$util.deepCopy(this.bellOrderParams)
+				let {
+					order_type = 0
+				} = param
+				delete param.order_type
+				let methodModel = order_type == 0 ? 'upOrderInfo' : 'payOrderInfo'
+				let [data, mineInfo] = await Promise.all([this.$api.order[methodModel](param), this.getMineInfo()])
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				this.orderInfo = data
+				let {
+					balance
+				} = this.mineInfo
+				let {
+					balanceInd
+				} = this
+				this.payList[balanceInd].is_disabled = balance * 1 < data.pay_price * 1
+				this.balance = balance
+				if (order_type == 0) {
+					this.payInd = this.payList.findIndex(item => {
+						return item.id == data.pay_model
+					})
+				}
+				this.isLoad = true
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			linkpress(res) {
+				// #ifdef APP-PLUS
+				this.$util.goUrl({
+					url: res.href,
+					openType: 'web'
+				})
+				// #endif
+			},
+			// 选择支付方式
+			async toChangeItem(index, key = 1) {
+				let {
+					balanceInd
+				} = this
+				if (index == balanceInd && this.payList[balanceInd].is_disabled) return
+				this.payInd = index
+			},
+			// 加/减数量
+			async changeNum(mol, index) {
+				let {
+					id,
+					service_id
+				} = this.orderInfo.order_goods[index]
+				let {
+					coach_id,
+					order_id
+				} = this.bellOrderParams
+				if (this.lockTap) return;
+				this.lockTap = true;
+				let methodModel = mol > 0 ? 'addCar' : 'delCar'
+				let param = mol > 0 ? {
+					service_id,
+					coach_id,
+					order_id,
+					num: 1
+				} : {
+					id,
+					num: 1
+				}
+				try {
+					let changeNum = await this.$api.order[methodModel](param)
+					await this.initRefresh()
+					this.lockTap = false
+				} catch (e) {
+					this.lockTap = false
+				}
+			},
+			async toPay() {
+				let {
+					trading_rules
+				} = this.configInfo
+				if (trading_rules && trading_rules.length > 0 && !this.isAgree) {
+					this.$util.showToast({
+						title: `请先阅读并同意《平台交易规则》`
+					})
+					return
+				}
+				let param = this.$util.deepCopy(this.bellOrderParams)
+				let {
+					order_type = 0
+				} = param
+				let {
+					payList,
+					payInd,
+				} = this
+				let {
+					id: pay_model
+				} = payList[payInd]
+
+				delete param.order_type
+				param.pay_model = pay_model
+				let methodModel = order_type == 0 ? 'upOrderGoods' : 'payOrder'
+
+				if (this.lockTap) return
+				this.lockTap = true
+				this.$util.showLoading()
+				try {
+					let {
+						pay_list,
+						order_id
+					} = await this.$api.order[methodModel](param)
+					this.$util.hideAll()
+					// 微信/支付宝支付
+					if (pay_list) {
+
+						if (pay_model == 3) {
+							pay_list = {
+								orderInfo: pay_list,
+								provider: 'alipay'
+							}
+						}
+
+						// #ifdef H5
+						if (pay_model == 3) {
+							pay_list = Object.assign({}, pay_list, {
+								order_id,
+								page_url: `/pages/order?tab=2`
+							})
+							this.updateOrderItem({
+								key: 'alipayOrderParams',
+								val: pay_list
+							})
+							this.$util.goUrl({
+								url: '/user/pages/alipay-result',
+								openType: `redirectTo`
+							})
+							return
+						}
+						// #endif
+
+						try {
+							await this.$util.pay(pay_list)
+							this.$util.showToast({
+								title: `支付成功`
+							})
+							setTimeout(() => {
+								this.lockTap = false
+								this.$util.goUrl({
+									url: '/pages/order?tab=2',
+									openType: `reLaunch`
+								})
+							}, 1000)
+						} catch (e) {
+							this.$util.showToast({
+								title: `支付失败`
+							})
+							setTimeout(() => {
+								this.lockTap = false
+								this.$util.goUrl({
+									url: '/pages/order?tab=1',
+									openType: `reLaunch`
+								})
+							}, 1000)
+						}
+						return
+					}
+					// 余额支付/零元支付
+					this.$util.showToast({
+						title: `支付成功`
+					})
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.goUrl({
+							url: '/pages/order?tab=2',
+							openType: `reLaunch`
+						})
+					}, 1000)
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.order-pages {
+		.list-item {
+			.item-img {
+				width: 140rpx;
+				height: 140rpx;
+			}
+
+			.item-tag {
+				width: 100rpx;
+				height: 36rpx;
+				margin-top: -18rpx;
+			}
+
+			.iconyduixingxingshixin {
+				font-size: 28rpx;
+			}
+
+			.item-btn {
+				width: 129rpx;
+				height: 54rpx;
+			}
+		}
+
+		.pay-info {
+			height: 110rpx;
+			bottom: 0;
+			height: calc(110rpx + env(safe-area-inset-bottom) / 2);
+			padding-bottom: calc(env(safe-area-inset-bottom) / 2);
+
+			.pay-btn {
+				width: 182rpx;
+				height: 74rpx;
+			}
+		}
+
+		.popup-rule {
+			width: 680rpx;
+			height: auto;
+
+			.rule-text {
+				min-height: 300rpx;
+				max-height: 60vh;
+			}
+
+			.iconfont {
+				font-size: 60rpx;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/user/pages/cash-out.vue b/user/pages/cash-out.vue
new file mode 100644
index 0000000..b05e268
--- /dev/null
+++ b/user/pages/cash-out.vue
@@ -0,0 +1,301 @@
+<template>
+	<view class="technician-income-cash-out" v-if="isLoad">
+
+		<view class="mt-md ml-lg mr-lg pd-lg f-paragraph fill-base radius-16">
+			<view class="f-title c-title text-bold">提现账户</view>
+			<view @tap.stop="toChangeItem(index)" class="flex-center mt-lg" v-for="(item,index) in payList"
+				:key="index">
+				<i class="pay-icon iconfont c-caption"
+					:class="[{'icon-xuanze':payInd != index},{'icon-radio-fill':payInd == index}]"
+					:style="{color:payInd==index?primaryColor:'#BEC3CE'}"></i>
+				<view class="flex-1 ml-lg f-mini-title c-title">
+					<view class="flex-y-center">
+						<view>{{item.title}} </view>
+						<view class="flex-1 flex-between ml-md" v-if="item.id == 2">
+							<view class="f-desc c-paragraph">
+								{{userInfo.alipay_number ? userInfo.split_alipay_number : '暂无'}}
+							</view>
+							<view @tap.stop="$util.goUrl({url:`/user/pages/alipay-account`})"
+								:style="{color:primaryColor}">{{userInfo.alipay_number?'修改':'去设置'}}
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view class="mt-md ml-lg mr-lg f-paragraph fill-base radius-16" style="overflow: hidden;">
+			<view class="fill-space pd-lg b-1px-b">
+				<view class="flex-between pt-md pb-md">
+					<view class="f-title c-title text-bold">备注</view>
+					<input v-model="text" class="flex-1 f-paragraph ml-md" type="text" placeholder="请输入到账信息" />
+				</view>
+			</view>
+			<view class="pd-lg">
+				<view class="f-title c-title text-bold">提现金额</view>
+				<view class="flex-y-center pt-lg pb-md b-1px-b">
+					<view class="text-bold">¥</view>
+					<input v-on:input="checkInput($event,'apply_price')" v-model="apply_price"
+						class="flex-1 f-paragraph ml-sm" type="digit" placeholder="请输入提现金额" />
+				</view>
+				<view @tap.stop="withAll" class="flex-y-center f-caption c-caption pt-md">可提现余额￥{{cash}}
+					<view class="ml-md c-warning">全部提现
+					</view>
+				</view>
+				<view class="flex-y-center f-caption c-caption pt-sm">最低提现额度<view class="ml-md c-warning">
+						￥{{configInfo.cash_mini || 0}}
+					</view>
+				</view>
+				<view class="space-lg"></view>
+				<view class="space-lg"></view>
+				<view @tap.stop="submit" class="cash-out-btn flex-center f-title c-base radius-16"
+					:style="{background:primaryColor}">提现</view>
+				<!-- <view class="flex-center f-caption c-caption mt-md" v-if="options.type == 'technician'">
+					每笔订单收取{{balance}}%手续费</view> -->
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions
+	} from "vuex"
+	export default {
+		components: {},
+		data() {
+			return {
+				options: {},
+				isLoad: false,
+				payList: [],
+				payInd: 0,
+				detail: {},
+				balance: '',
+				cash: '',
+				apply_price: '',
+				text: '',
+				type: 1,
+				lockTap: false,
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+			coachInfo: state => state.user.coachInfo,
+		}),
+		async onLoad(options) {
+			this.$util.showLoading()
+			this.options = options
+			await this.initIndex()
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getUserInfo', 'getCoachInfo']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				await Promise.all([this.getConfigInfo(), this.getUserInfo()])
+				let {
+					wechat_transfer,
+					alipay_transfer,
+					under_transfer
+				} = this.configInfo
+				let arr = []
+				if (wechat_transfer == 1) {
+					arr.push({
+						id: 1,
+						title: '微信零钱包'
+					})
+				}
+				// #ifndef MP-WEIXIN
+				if (alipay_transfer == 1) {
+					arr.push({
+						id: 2,
+						title: '支付宝账户'
+					})
+				}
+				// #endif
+				if (under_transfer == 1) {
+					arr.push({
+						id: 0,
+						title: '线下转账'
+					})
+				}
+				this.payList = arr
+				let {
+					type
+				} = this.options
+				// type technician技-师；carfee车费；distribution分销商；channel渠道商；agent代理商
+				switch (type) {
+					case 'technician':
+						let {
+							detail
+						} = await this.$util.getPage(-1)
+						let {
+							cap_cash = 0
+						} = detail
+						let {
+							balance = 0
+						} = detail.coach_level
+						this.balance = 100 - balance
+						this.cash = cap_cash
+						break
+					case 'carfee':
+						let {
+							id: cid = 0
+						} = this.coachInfo
+						if (!cid) {
+							await this.getCoachInfo()
+						}
+						this.cash = this.coachInfo.car_price
+						break
+					case 'distribution':
+						let {
+							new_cash = 0
+						} = await this.$util.getPage(-1).detail
+						this.cash = new_cash
+						break
+					case 'channel':
+					case 'agent':
+					case 'salesman':
+						let {
+							cash = 0
+						} = await this.$util.getPage(-1).detail
+						this.cash = cash
+						break
+				}
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				this.$util.hideAll()
+				this.isLoad = true
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			toChangeItem(val) {
+				this.payInd = val
+				this.lockTap = false
+			},
+			withAll() {
+				this.apply_price = this.cash
+			},
+			checkInput(e, key) {
+				let val = this.$util.formatMoney(e.detail.value)
+				this.$nextTick(() => {
+					this[key] = val
+				})
+			},
+			async submit() {
+				if (this.apply_price == '0.0') {
+					this.$nextTick(() => {
+						this.apply_price = '0'
+					})
+				}
+				let {
+					cash,
+					apply_price,
+					text,
+					payList,
+					payInd
+				} = this
+				let {
+					alipay_number = '',
+						alipay_name = ''
+				} = this.userInfo
+
+				let {
+					id: apply_transfer
+				} = payList[payInd]
+				if (apply_transfer == 2 && (!alipay_number || !alipay_name)) {
+					this.$util.showToast({
+						title: !alipay_number ? `请先绑定支付宝账户` : `请先绑定支付宝账户姓名`
+					})
+					return
+				}
+				let {
+					cash_mini
+				} = this.configInfo
+				text = text ? text.replace(/(^\s*)|(\s*$)/g, "") : ''
+				if ((apply_transfer == 0 && !text) || !apply_price) {
+					this.$util.showToast({
+						title: apply_transfer == 0 && !text ? `请输入到账信息` : `请输入提现金额`
+					})
+					return
+				}
+				if (parseFloat(apply_price) < parseFloat(cash_mini)) {
+					this.$util.showToast({
+						title: `提现金额不能低于最低提现金额${cash_mini}`
+					})
+					return
+				}
+				if (parseFloat(apply_price) > parseFloat(cash)) {
+					this.$util.showToast({
+						title: `提现金额不能大于可提现金额${cash}`
+					})
+					return
+				}
+				if (this.lockTap) return
+				this.lockTap = true
+				this.$util.showLoading()
+				try {
+					let {
+						type
+					} = this.options
+					let methodArr = {
+						technician: 'technician',
+						carfee: 'technician',
+						distribution: 'mine',
+						channel: 'channel',
+						agent: 'agent',
+						salesman: 'salesman',
+					}
+					let methodModel = methodArr[type]
+					let param = {
+						apply_price,
+						text,
+						apply_transfer
+					}
+					if (type == 'technician' || type === 'carfee') {
+						param.type = type == 'technician' ? 1 : 2
+					}
+					await this.$api[methodModel].applyWallet(param)
+					this.$util.hideAll()
+					this.$util.showToast({
+						title: `提交成功`,
+					});
+					setTimeout(() => {
+						this.$util.back()
+						this.$util.goUrl({
+							url: 1,
+							openType: 'navigateBack'
+						})
+					}, 1000)
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.technician-income-cash-out {
+		.cash-out-btn {
+			width: 622rpx;
+			height: 88rpx;
+			margin: 0 auto;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/user/pages/channel/apply.vue b/user/pages/channel/apply.vue
new file mode 100644
index 0000000..87e6d29
--- /dev/null
+++ b/user/pages/channel/apply.vue
@@ -0,0 +1,281 @@
+<template>
+	<view class="apply-pages" v-if="isLoad">
+		<view class="page-height" v-if="channel_status != -1">
+			<abnor percent="150%" @confirm="confirm" @cancel="confirm" :title="title[channel_status]"
+				:tip="tipArr[channel_status]" :button="buttonArr[channel_status]" :image="image[channel_status]"
+				:tipMax="channel_status == 4? '690rpx':''"></abnor>
+		</view>
+		<block v-else>
+			<view class="apply-form">
+				<view class="fill-base mt-md radius-16">
+					<view class="flex-between pl-lg pr-lg b-1px-b">
+						<view class="item-text">您的姓名</view>
+						<input v-model="form.user_name" type="text" class="item-input flex-1" maxlength="20"
+							:placeholder="rule[0].errorMsg" />
+					</view>
+					<view class="flex-between pl-lg pr-lg b-1px-b">
+						<view class="item-text">手机号码</view>
+						<input v-model="form.mobile" type="text" class="item-input flex-1"
+							:placeholder="rule[1].errorMsg" />
+					</view>
+					<view class="flex-between pl-lg pr-lg b-1px-b">
+						<view class="item-text">申请渠道</view>
+						<view class="item-input flex-1 text">
+							<picker @change="pickerChange($event)" :value="channelInd" :range="channelList"
+								range-key="title">
+								<view class="flex-between" style="color: #A9A9A9;">
+									{{channelInd!=-1 && channelList.length > 0?channelList[channelInd].title:'请选择您能接入的渠道'}}
+									<i class="iconfont icon-right ml-sm" style="font-size: 28rpx;"></i>
+								</view>
+							</picker>
+						</view>
+					</view>
+				</view>
+				<view class="fill-base mt-md radius-16">
+					<view class="flex-between pl-lg pr-lg">
+						<view class="item-text">备注信息</view>
+						<input :disabled="true" type="text" class="item-input flex-1" />
+					</view>
+					<textarea v-model="form.text" class="item-textarea pd-lg" maxlength="300" placeholder="输入备注信息" />
+					<view class="text-right pb-lg pr-lg">
+						{{form.text.length>300?300:form.text.length}}/300
+					</view>
+				</view>
+			</view>
+
+			<view class="space-max-footer"></view>
+
+			<fix-bottom-button @confirm="submit" :text="[{text:'确定申请',type:'confirm',isAuth:true}]" bgColor="#fff">
+			</fix-bottom-button>
+		</block>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		data() {
+			return {
+				// -1未申请，1审核中，2审核通过，3取消授权，4审核失败(可再次申请)
+				tipArr: {
+					'1': [{
+						text: '您已经成功提交申请',
+						color: 0
+					}, {
+						text: '审核将在3个工作日内出结果，请耐心等待',
+						color: 0
+					}],
+					'2': [{
+						text: '恭喜您，审核通过！',
+						color: 0
+					}, {
+						text: '您已具备渠道商资格，快去分享体验吧~',
+						color: 0
+					}],
+					'3': [{
+						text: '请联系平台管理人员询问原因',
+						color: 0
+					}],
+					'4': [{
+						text: '请联系平台管理人员询问失败原因',
+						color: 0
+					}]
+				},
+				buttonArr: {
+					'1': [{
+						text: '个人中心',
+						type: 'cancel'
+					}],
+					'2': [{
+						text: '去分享',
+						type: 'confirm'
+					}],
+					'3': [{
+						text: '个人中心',
+						type: 'cancel'
+					}],
+					'4': [{
+						text: '个人中心',
+						type: 'cancel'
+					}]
+				},
+				title: {
+					'-1': '申请渠道商',
+					'1': '等待审核',
+					'2': '',
+					'3': '取消授权',
+					'4': '申请失败',
+				},
+				image: {
+					'1': 'https://lbqny.migugu.com/admin/public/apply_wait.jpg',
+					'2': 'https://lbqny.migugu.com/admin/public/apply_suc.jpg',
+					'3': 'https://lbqny.migugu.com/admin/public/apply_fail.jpg',
+					'4': 'https://lbqny.migugu.com/admin/public/apply_fail.jpg',
+				},
+				channel_status: -1,
+				channelInd: -1,
+				channelList: [],
+				isLoad: false,
+				options: {},
+				form: {
+					id: 0,
+					user_name: '', //姓名 
+					mobile: '', //手机号  
+					cate_id: '', // 渠道
+					text: ''
+				},
+				rule: [{
+						name: "user_name",
+						checkType: "isNotNull",
+						errorMsg: "请输入您的真实姓名",
+						regType: 2
+					},
+					{
+						name: "mobile",
+						checkType: "isMobile",
+						errorMsg: "请输入常用手机号码"
+					},
+					{
+						name: "cate_id",
+						checkType: "isNotNull",
+						errorMsg: "请选择您能接入的渠道"
+					}
+				],
+				lockTap: false
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+			location: state => state.user.location,
+		}),
+		async onLoad(options) {
+			this.$util.showLoading()
+			this.options = options
+			await this.initIndex()
+			this.isLoad = true
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getUserInfo']),
+			...mapMutations(['updateUserItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				if (!this.configInfo.id || refresh) {
+					await this.getConfigInfo()
+				}
+				let [list, data] = await Promise.all([this.$api.channel.channelCateSelect(), this.$api.channel
+					.channelInfo()
+				])
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				this.channelList = list
+				if (!data.id) {
+					this.$util.hideAll()
+					return
+				}
+				for (let key in this.form) {
+					this.form[key] = data[key]
+				}
+				this.channel_status = data.status
+				if (data.status == 4 && data.sh_text) {
+					this.tipArr[4][0].text = data.sh_text
+				}
+				uni.setNavigationBarTitle({
+					title: this.title[data.status]
+				})
+				this.$util.hideAll()
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			pickerChange(e, val) {
+				this.channelInd = e.target.value
+				this.form.cate_id = this.channelList[this.channelInd].id
+			},
+			// 个人中心/去分享
+			async confirm() {
+				let {
+					channel_status
+				} = this
+				let url = channel_status == 2 ? `/user/pages/channel/income` : `/pages/mine`
+				this.$util.log(url)
+				this.$util.goUrl({
+					url,
+					openType: `reLaunch`
+				})
+			},
+			//表单验证
+			validate(param) {
+				let validate = new this.$util.Validate();
+				this.rule.map(item => {
+					let {
+						name,
+					} = item
+					validate.add(param[name], item);
+				})
+				let message = validate.start();
+				return message;
+			},
+			async submit() {
+				let param = this.$util.deepCopy(this.form)
+				let msg = this.validate(param);
+				if (msg) {
+					this.$util.showToast({
+						title: msg
+					});
+					return;
+				}
+
+				let {
+					admin_id = 0,
+						salesman_id = 0
+				} = this.options
+				param.admin_id = admin_id
+				param.salesman_id = salesman_id
+				if (this.lockTap) return
+				this.lockTap = true
+				param.text = param.text.length > 300 ? param.text.substring(0, 300) : param.text
+				this.$util.showLoading()
+				try {
+					await this.$api.channel.applyChannel(param)
+					this.$util.hideAll()
+					this.$util.showToast({
+						title: `提交成功`
+					});
+					setTimeout(() => {
+						this.$util.back()
+						this.$util.goUrl({
+							url: '/user/pages/apply-result?type=3',
+							openType: `redirectTo`
+						})
+					}, 1000)
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+</style>
\ No newline at end of file
diff --git a/user/pages/channel/income.vue b/user/pages/channel/income.vue
new file mode 100644
index 0000000..7f32751
--- /dev/null
+++ b/user/pages/channel/income.vue
@@ -0,0 +1,448 @@
+<template>
+	<view class="user-channel-index" v-if="isLoad">
+		<view class="mine-menu-list c-base" :style="{background:primaryColor}">
+			<view class="flex-between pt-md pl-lg pb-lg">
+				<view class="flex-center">
+					<view class="f-desc mr-sm">渠道分销商</view>
+					<view class="f-title">{{detail.cate_text}}</view>
+				</view>
+				<view @tap.stop="$util.goUrl({url:`/user/pages/channel/poster`})"
+					class="channel-code flex-center f-icontext">
+					<i class="iconfont iconerweima"></i>
+					渠道码
+					<i class="iconfont icon-down"></i>
+				</view>
+			</view>
+			<view class="money-count flex-center pb-md">
+				<view class="item-child flex-center flex-column">
+					<view class="num text-bold">{{detail.order_price}}</view>
+					<view class="f-caption">订单总金额</view>
+				</view>
+				<view class="line"></view>
+				<view class="item-child flex-center flex-column">
+					<view class="num text-bold">{{detail.order_count}}</view>
+					<view class="f-caption">订单数量</view>
+				</view>
+				<view class="line"></view>
+				<view class="item-child flex-center flex-column">
+					<view class="num text-bold">{{detail.total_cash}}</view>
+					<view class="f-caption">总佣金</view>
+				</view>
+			</view>
+			<view class="cash-out-list flex-center mt-sm">
+				<view @tap.stop="$util.goUrl({url:`/user/pages/distribution/record?type=4`})"
+					class="item-child flex-center f-mini-title c-base radius">提现记录</view>
+				<view @tap.stop="$util.goUrl({url:`/user/pages/cash-out?type=channel`})"
+					class="item-child flex-center f-mini-title c-base radius" :style="{color:primaryColor}">申请提现
+				</view>
+			</view>
+		</view>
+		<view class="search-info flex-between fill-base">
+			<view class="item-search">
+				<search @input="toSearch" @confirm="toSearch" type="input" placeholder="请输入服务名称/订单号"></search>
+			</view>
+			<view @tap="$refs.rank_item.open()" class="flex-center pr-md f-paragraph c-title">
+				筛选
+				<i class="iconfont iconshaixuanxia-1"></i>
+			</view>
+		</view>
+
+		<view class="order-pages">
+			<view class="item-child mt-md ml-lg mr-lg pd-lg fill-base radius-16" v-for="(item,index) in list.data"
+				:key="index">
+				<view class="flex-between pb-lg">
+					<view class="f-paragraph c-title max-350 ellipsis">下单人：{{item.address_info.user_name}}</view>
+					<view class="f-caption c-caption">{{item.create_time}}</view>
+				</view>
+				<view class="flex-center mb-lg" v-for="(aitem,aindex) in item.order_goods" :key="aindex">
+					<image mode="aspectFill" class="avatar lg radius-16" :src="aitem.goods_cover"></image>
+					<view class="flex-1 ml-md">
+						<view class="flex-between">
+							<view class="f-mini-title c-title text-bold ellipsis"
+								:class="[{'max-300':aitem.refund_num>0},{'max-450':aitem.refund_num==0}]">
+								{{aitem.goods_name}}
+							</view>
+							<view class="f-caption c-warning" v-if="aitem.refund_num>0">已退x{{aitem.refund_num}}</view>
+						</view>
+						<view class="f-caption c-caption mt-sm mb-sm">
+							服务{{$t('action.attendantName')}}：{{item.coach_info ? item.coach_info.coach_name : '-'}}
+						</view>
+						<view class="flex-between">
+							<view class="flex-y-baseline f-caption c-warning">¥<view class="f-title text-bold">
+									{{aitem.true_price}}
+								</view>
+							</view>
+							<view class="c-paragraph">x{{aitem.num}}</view>
+						</view>
+					</view>
+				</view>
+				<view class="flex-between">
+					<view>
+						<view class="flex-y-center f-caption">
+							分销佣金：<view class="c-warning">¥{{item.channel_cash}}</view>
+						</view>
+						<view class="flex-y-center f-caption" style="margin-top: 4rpx;" v-if="item.refund_price*1>0">
+							总计退款：<view class="c-warning">¥{{item.refund_price}}</view>
+						</view>
+					</view>
+					<view class="flex-y-center f-desc c-title">付款：
+						<view class="text-bold">¥{{item.true_service_price}}</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+
+		<view class="space-footer"></view>
+
+		<uni-popup ref="rank_item" type="bottom" :maskClick="false">
+			<view class="popup-rank fill-base">
+				<view class="flex-between pd-lg">
+					<view class="f-title c-title text-bold">选择筛选条件</view>
+					<view @tap="toConfirm(1)" class="f-caption c-caption">取消</view>
+				</view>
+				<view class="pd-lg">
+					<view class="pt-lg pb-lg f-paragraph text-bold">时间</view>
+					<view class="flex-warp pb-lg">
+						<view @tap="toChangeItem(index,'tabInd')" class="item-rank flex-center f-desc c-title radius-16"
+							:class="[{'ml-md':index!=0}]"
+							:style="{background:index==tabInd?primaryColor:'',color:index==tabInd?'#fff':'',borderColor:index==tabInd?primaryColor:''}"
+							v-for="(item,index) in tabList" :key="index">{{item.title}}</view>
+					</view>
+					<view class="flex-between pt-lg pb-lg" v-if="tabInd==3">
+						<view class="f-paragraph text-bold">开始时间</view>
+						<picker mode="date" start="1900-01-01" :end="today" @change="pickerChange($event,'start_time')">
+							<view class="flex-y-center f-title"
+								:class="[{'c-title':tabList[3].start_time},{'f-caption c-caption':!tabList[3].start_time}]">
+								{{tabList[3].start_time || '请选择'}} <i class="iconfont icon-right c-caption"></i>
+							</view>
+						</picker>
+					</view>
+					<view class="flex-between pt-md pb-lg" v-if="tabInd==3">
+						<view class="f-paragraph text-bold">结束时间</view>
+						<picker mode="date" start="1900-01-01" :end="today" @change="pickerChange($event,'end_time')">
+							<view class="flex-y-center f-title"
+								:class="[{'c-title':tabList[3].end_time},{'f-caption c-caption':!tabList[3].end_time}]">
+								{{tabList[3].end_time || '请选择'}} <i class="iconfont icon-right c-caption"></i>
+							</view>
+						</picker>
+					</view>
+				</view>
+				<view class="btn-info flex-center pd-lg">
+					<view @tap="toConfirm(2)" class="item-child flex-center fill-base f-desc radius">重置</view>
+					<view @tap="toConfirm(3)" class="item-child flex-center f-desc c-base radius"
+						:style="{background:primaryColor,borderColor:primaryColor}">查询</view>
+				</view>
+				<view class="space-safe"></view>
+			</view>
+		</uni-popup>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		data() {
+			return {
+				isLoad: false,
+				today: '',
+				preCheck: {
+					tabInd: 0,
+					start_time: '',
+					end_time: ''
+				},
+				tabInd: 2,
+				tabList: [{
+					id: 1,
+					title: '今日',
+					start_time: '',
+					end_time: ''
+				}, {
+					id: 2,
+					title: '近7日',
+					start_time: '',
+					end_time: ''
+				}, {
+					id: 3,
+					title: '近30日',
+					start_time: '',
+					end_time: ''
+				}, {
+					id: 4,
+					title: '自定义',
+					start_time: '',
+					end_time: ''
+				}],
+				detail: {},
+				param: {
+					page: 1,
+					name: ''
+				},
+				list: {
+					data: []
+				},
+				loading: true,
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			commonOptions: state => state.user.commonOptions,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad() {
+			this.initIndex()
+		},
+		onUnload() {
+			this.$util.back()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			...mapMutations([]),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				this.$util.showLoading()
+				let cur_time = new Date(Math.ceil(new Date().getTime()))
+				let today = this.$util.formatTime(cur_time, 'YY-M-D')
+				let one = 3600 * 24 * 1000
+				let time = this.$util.DateToUnix(today) * 1000
+				this.today = today
+				this.tabList[0].start_time = today
+				this.tabList[0].end_time = today
+				this.tabList[1].start_time = this.$util.formatTime(time - 7 * one, 'YY-M-D')
+				this.tabList[1].end_time = today
+				this.tabList[2].start_time = this.$util.formatTime(time - 30 * one, 'YY-M-D')
+				this.tabList[2].end_time = today
+				await this.getList()
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				this.isLoad = true
+				this.$util.hideAll()
+			},
+			initRefresh() {
+				this.param.page == 1
+				this.initIndex(true)
+			},
+			toSearch(val) {
+				this.param.page = 1
+				this.param.name = val
+				this.getList()
+			},
+			async getList() {
+				let {
+					list: oldList,
+					tabInd,
+					tabList,
+				} = this
+				let {
+					start_time,
+					end_time
+				} = tabList[tabInd]
+				let param = this.$util.deepCopy(this.param)
+				param.start_time = this.$util.DateToUnix(start_time)
+				param.end_time = this.$util.DateToUnix(end_time) + 24 * 3600 - 1
+
+				if (param.page == 1) {
+					let param_key = this.$util.deepCopy(param)
+					delete param_key.page
+					this.detail = await this.$api.channel.index(param_key)
+				}
+				let newList = await this.$api.channel.orderList(param);
+
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+			},
+			pickerChange(e, type) {
+				let {
+					start_time,
+					end_time
+				} = this.tabList[3]
+				if (type == 'start_time') {
+					start_time = e.detail.value
+				} else {
+					end_time = e.detail.value
+				}
+
+				if (start_time && end_time && this.$util.DateToUnix(start_time) > this.$util.DateToUnix(end_time)) {
+					this.$util.showToast({
+						title: `开始时间不能大于结束时间`
+					})
+					return
+				}
+
+				this.tabList[3][type] = e.detail.value
+			},
+			toChangeItem(index, key) {
+				this[key] = index
+			},
+			// type 1取消；2重置；3查询
+			toConfirm(type, ind = 3) {
+				if (type == 2) {
+					ind = 0
+				}
+				let {
+					start_time = '',
+						end_time = ''
+				} = type == 1 ? this.preCheck : this.tabList[ind]
+				let {
+					tabInd
+				} = type == 2 ? {
+					tabInd: 2
+				} : type == 3 ? this : this.preCheck
+				if (type == 3) {
+					if ((!start_time || !end_time) && tabInd == 3) {
+						this.$util.showToast({
+							title: !start_time ? `请选择开始时间` : `请选择结束时间`
+						})
+						return
+					}
+					this.preCheck.start_time = start_time
+					this.preCheck.end_time = end_time
+					this.preCheck.tabInd = tabInd
+				} else {
+					this.tabList[ind].start_time = start_time
+					this.tabList[ind].end_time = end_time
+					this.tabInd = tabInd
+				}
+				if (type != 2) {
+					this.$refs.rank_item.close()
+					this.param.page == 1
+					this.getList()
+				}
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.user-channel-index {
+
+		.mine-menu-list {
+			height: 360rpx;
+
+			.channel-code {
+				width: 134rpx;
+				height: 54rpx;
+				background: rgba(255, 255, 255, 0.1);
+				border-radius: 100rpx 0 0 100rpx;
+
+				.iconerweima {
+					font-size: 28rpx;
+					margin: 0 5rpx;
+				}
+
+				.icon-down {
+					font-size: 18rpx;
+					transform: scale(0.5) rotate(270deg);
+				}
+			}
+
+			.money-count {
+				.item-child {
+					width: 50%;
+
+					.num {
+						font-size: 49rpx;
+					}
+				}
+
+				.line {
+					width: 1rpx;
+					height: 47rpx;
+					background: rgba(255, 255, 255, 0.3);
+				}
+			}
+
+			.cash-out-list {
+				.item-child {
+					width: 300rpx;
+					height: 70rpx;
+					background: #FFFFFF;
+				}
+
+				.item-child:nth-child(1) {
+					background: rgba(255, 255, 255, 0.5);
+					margin-right: 40rpx;
+				}
+			}
+
+		}
+
+		.search-info {
+			border-radius: 0 0 16rpx 16rpx;
+			overflow: hidden;
+
+			.item-search {
+				width: 630rpx;
+			}
+
+			.iconshaixuanxia-1 {
+				font-size: 20rpx;
+				color: #CDCDCD;
+				transform: scale(0.65);
+			}
+		}
+
+		.popup-rank {
+			border-radius: 34rpx 34rpx 0 0;
+
+			.item-rank {
+				width: 157rpx;
+				height: 72rpx;
+				border: 1px solid #E5E5E5;
+			}
+
+			.btn-info {
+				background: #F9F9F9;
+
+				.item-child {
+					width: 320rpx;
+					height: 80rpx;
+					background: #FFFFFF;
+					border: 1rpx solid #C7C7C7;
+					margin: 0 14rpx;
+				}
+			}
+
+			.space-safe {
+				background: #F9F9F9;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/user/pages/channel/poster.vue b/user/pages/channel/poster.vue
new file mode 100644
index 0000000..ff6ecb6
--- /dev/null
+++ b/user/pages/channel/poster.vue
@@ -0,0 +1,148 @@
+<template>
+	<view style="padding:20rpx 0">
+		<view class="hideCanvasView">
+			<l-painter class="hideCanvas" ref="painter" useCORS />
+		</view>
+		<block v-if="src">
+			<image :src="src" class="code-img" @tap="previewImage"></image>
+			<view class="btns">
+				<!-- #ifdef H5 -->
+				<button class="save-btn flex-center radius" :style="{background:primaryColor}"
+					@tap="previewImage">长按上图保存图片</button>
+				<!-- #endif -->
+				<!-- #ifndef H5 -->
+				<button class="save-btn flex-center radius" :style="{background:primaryColor}"
+					@tap="saveImage">保存图片至相册</button>
+				<!-- #endif -->
+			</view>
+		</block>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions
+	} from 'vuex';
+	export default {
+		components: {},
+		props: {
+
+		},
+		data() {
+			return {
+				src: '',
+				options: '',
+				poster: {}
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		async onLoad(options) {
+			// #ifdef H5
+			if (this.$jweixin.isWechat()) {
+				await this.$jweixin.initJssdk();
+				this.$jweixin.wxReady(() => {
+					this.$jweixin.hideOptionMenu()
+				})
+			}
+			// #endif 
+			this.$util.showLoading()
+			await this.getConfigInfo()
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+			let that = this
+			setTimeout(() => {
+				that.canvase()
+			}, 1000)
+		},
+		methods: {
+			...mapActions(['getConfigInfo']),
+			async canvase() {
+				let that = this
+				let qr_code = await this.$api.channel.channelQr()
+
+				let poster = {
+					css: {
+						width: '750rpx',
+						height: '750rpx',
+						background: '#ffffff',
+					},
+					views: [{
+						type: 'image',
+						src: qr_code,
+						css: {
+							width: '750rpx',
+							height: '750rpx'
+						}
+					}]
+				}
+				// 渲染
+				this.$refs.painter.render(poster);
+				// 生成图片
+				this.$refs.painter.canvasToTempFilePathSync({
+					fileType: "jpg",
+					quality: 1,
+					success: (res) => {
+						that.$util.hideAll()
+						this.src = res.tempFilePath
+						console.log(res.tempFilePath);
+					},
+				});
+			},
+			previewImage() {
+				let finalPath = this.src;
+				uni.previewImage({
+					current: finalPath,
+					urls: [finalPath]
+				})
+			},
+			async saveImage() {
+				await this.$util.checkAuth({
+					type: "writePhotosAlbum"
+				});
+				let filePath = this.src;
+				let [err, success] = await uni.saveImageToPhotosAlbum({
+					filePath
+				})
+				if (err) return;
+				uni.showToast({
+					icon: 'none',
+					title: '保存成功'
+				})
+			}
+		},
+
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background: #fff;
+	}
+
+	.code-img {
+		width: 500rpx;
+		height: 500rpx;
+		margin: 50rpx auto;
+	}
+
+	.btns {
+		display: flex;
+		justify-content: center;
+		padding: 15rpx;
+		background-color: #fff;
+		margin-top: 20rpx;
+
+		.save-btn {
+			width: 690rpx;
+			height: 80rpx;
+			line-height: 80rpx;
+			margin: 0 auto;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/user/pages/choose-technician.vue b/user/pages/choose-technician.vue
new file mode 100644
index 0000000..e45a270
--- /dev/null
+++ b/user/pages/choose-technician.vue
@@ -0,0 +1,506 @@
+<template>
+	<view class="pages-technician">
+		<fixed>
+			<uni-nav-bar :fixed="false" :shadow="false" :statusBar="true" :onlyLeft="true" :color="`#fff`"
+				:backgroundColor="primaryColor">
+				<view @tap.stop="toChooseLocation" class="map-info flex-y-center" slot="left">
+					<view class="flex-y-center c-base">
+						<i class="iconfont iconjuli mr-sm"></i>
+						<view class="map-text max-400 ellipsis">
+							{{location&&location.address ?location.address : isLoad ? '定位失败' : '定位中...'}}
+						</view>
+						<i class="iconfont icon-down"></i>
+					</view>
+				</view>
+			</uni-nav-bar>
+			<view class="fix-info choose fill-body rel">
+				<view class="space-top abs" :style="{background:primaryColor}"></view>
+				<view class="search-info fill-base pt-lg pl-lg pr-lg pb-md abs">
+					<view class="flex-center pb-md">
+						<view class="city-info">
+							<picker @change="pickerChange($event)" :value="cityIndex" :range="cityList"
+								range-key="title">
+								<view class="city-info flex-y-center">
+									<view>
+										<block v-if="cityList&&cityList.length > 0">
+											{{cityIndex === -1 ? '未知' : cityList[cityIndex].title.length > 3 ? cityList[cityIndex].title.substring(0,3) + '...':cityList[cityIndex].title}}
+										</block>
+										<block v-else>请选择</block>
+									</view>
+									<i class="iconfont iconshaixuanxia-1 ml-sm"></i>
+								</view>
+							</picker>
+						</view>
+						<view class="flex-1">
+							<search @input="toSearch" type="input" :keyword="param.coach_name" :padding="0" :radius="30"
+								backgroundColor="#F0F0F0" :placeholder="'请输入'+$t('action.attendantName')+'姓名'">
+							</search>
+						</view>
+					</view>
+				</view>
+			</view>
+		</fixed>
+
+		<view class="ml-md mr-md" :class="[{'flex-warp':configInfo.coach_list_format===2}]"
+			v-if="list.data && list.data.length>0">
+			<view
+				:class="[{'mt-md':(configInfo.coach_list_format===1&&index!=0) || configInfo.coach_list_format===2},{'mr-md':configInfo.coach_list_format===2 && index%2==0}]"
+				v-for="(item,index) in list.data" :key="index">
+				<technician-list-item @comment="toShowPopup(index,'message')" @collect="toCollect(index)"
+					@order="toOrder(index)" :info="item">
+				</technician-list-item>
+			</view>
+		</view> 
+
+		<!-- #ifdef H5 -->
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+		<!-- #endif -->
+		<!-- #ifndef H5 -->
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0&&location.lng" :loading="loading"
+			v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1&&location.address"></abnor>
+		<abnor @confirm="toOpenLocation" :tip="[{ text: '定位失败，请开启地理位置授权后刷新页面重试~', color: 0 }]"
+			:button="[{ text: '开启定位' , type: 'confirm' }]" btnSize="" v-if="!loading && !location.address"> </abnor>
+		<!-- #endif -->
+
+		<technician-list-popup ref="technician_list_popup"></technician-list-popup>
+
+		<uni-popup ref="choose_city_item" type="top" :custom="true" :zIndex="999">
+			<view :style="{height:configInfo.navBarHeight + 8 + 'px'}"></view>
+			<view class="choose-city-popup rel">
+				<image class="city-img" src="https://lbqny.migugu.com/admin/anmo/technician/no_city.png"></image>
+				<view class="text f-paragraph c-base abs">
+					很抱歉,该城市未开通, 点击左上角切换其他城市下单服务
+				</view>
+				<view class="flex-between">
+					<view></view>
+					<view @tap.stop="$refs.choose_city_item.close()"
+						class="item-btn flex-center f-paragraph c-title text-bold radius">知道了</view>
+				</view>
+			</view>
+		</uni-popup>
+
+
+		<view class="space-max-footer"></view>
+		<fix-bottom-button @confirm="toBack" :text="[{type:'confirm',text:pageLen>1?`返回上页`:`返回首页`}]" bgColor="#fff">
+		</fix-bottom-button>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	import technicianListItem from "@/components/technician-list-item.vue"
+	import technicianListPopup from "@/components/technician-list-popup.vue"
+	export default {
+		components: {
+			technicianListItem,
+			technicianListPopup
+		},
+		data() {
+			return {
+				isLoad: false,
+				options: {},
+				param: {
+					page: 1,
+					ser_id: 0,
+					coach_name: ''
+				},
+				list: {
+					data: []
+				},
+				loading: true,
+				lockTap: false,
+				pageLen: 1
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			cityId: state => state.technician.cityId,
+			cityIndex: state => state.technician.cityIndex,
+			cityList: state => state.technician.cityList,
+			loginType: state => state.user.loginType,
+			userInfo: state => state.user.userInfo,
+			location: state => state.user.location,
+		}),
+		async onLoad(options) {
+			this.options = options
+			// #ifndef H5
+			this.$util.showLoading()
+			// #endif
+			await this.initIndex()
+			this.isLoad = true
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			...mapActions(['getCityList']),
+			...mapMutations(['updateUserItem', 'updateTechnicianItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				this.pageLen = getCurrentPages().length
+				this.getList(this.cityList.length == 0)
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			pickerChange(e, val) {
+				let ind = e.target.value
+				this.updateTechnicianItem({
+					key: 'cityIndex',
+					val: ind
+				})
+				this.updateTechnicianItem({
+					key: 'cityId',
+					val: this.cityList[ind].id
+				})
+				this.param.page = 1
+				this.getList()
+			},
+			toOpenLocation() {
+				this.$util.checkAuth({
+					type: 'userLocation'
+				})
+				// #ifdef APP-PLUS
+				uni.getSystemInfo({
+					success: (sys) => {
+						if (sys.platform == 'ios') {
+							plus.runtime.openURL("app-settings://");
+						} else {
+							var main = plus.android.runtimeMainActivity();
+							var Intent = plus.android.importClass(
+								"android.content.Intent");
+							//可能应该直接进入应用列表的权限设置？=> android.settings.APPLICATION_SETTINGS  
+							var mIntent = new Intent(
+								'android.settings.LOCATION_SOURCE_SETTINGS'
+							);
+							main.startActivity(mIntent);
+						}
+					}
+				})
+				// #endif
+			},
+			toSearch(val) {
+				this.param.page = 1
+				this.param.coach_name = val
+				this.getList()
+			},
+			// 选择地区
+			async toChooseLocation(e) {
+				await this.$util.checkAuth({
+					type: 'userLocation'
+				})
+
+				let {
+					lat: locaLat = '',
+					lng: locaLng = ''
+				} = this.location
+
+				let param = {}
+				if (!locaLat && !locaLng) {
+					// #ifdef H5
+					if (this.$jweixin.isWechat()) {
+						this.$util.showLoading()
+						await this.$jweixin.wxReady2();
+						let {
+							latitude,
+							longitude
+						} = await this.$jweixin.getWxLocation()
+						locaLat = latitude
+						locaLng = longitude
+					}
+					// #endif
+					// #ifdef APP-PLUS
+					let location = await this.$util.getBmapLocation()
+					locaLat = location.lat
+					locaLng = location.lng
+					// #endif
+				}
+
+				// #ifndef MP-WEIXIN
+				param = {
+					latitude: locaLat,
+					longitude: locaLng
+				}
+				// #endif
+				let [, {
+					address = '',
+					longitude: lng,
+					latitude: lat,
+					province = '',
+					city = '',
+					district = '',
+				}] = await uni.chooseLocation(param);
+				if (!lng) return
+				let location = {
+					lng,
+					lat,
+					address,
+					province,
+					city,
+					district
+				}
+				this.updateUserItem({
+					key: 'location',
+					val: location
+				})
+				this.param.page = 1
+				await this.getList(true, 1)
+			},
+			async getList(refresh = false, change = 0) {
+				let {
+					location
+				} = this
+				if (!location.lat || (location.lat && location.address == '定位失败')) {
+					// #ifdef H5
+					if (this.$jweixin.isWechat()) {
+						this.$util.showLoading()
+						// await this.$jweixin.initJssdk();
+						await this.$jweixin.wxReady2();
+						let {
+							lat = '', lng = ''
+						} = location
+						if (!lat && !lng) {
+							let {
+								latitude,
+								longitude
+							} = await this.$jweixin.getWxLocation()
+							lat = latitude
+							lng = longitude
+							location = {
+								lng,
+								lat,
+								address: '定位失败',
+								province: '',
+								city: '',
+								district: ''
+							}
+						}
+						if (lat && lng) {
+							let key = `${lat},${lng}`
+							let data = await this.$api.base.getMapInfo({
+								location: key
+							})
+							let {
+								status,
+								result
+							} = JSON.parse(data)
+							if (status == 0) {
+								let {
+									address,
+									address_component
+								} = result
+								let {
+									province,
+									city,
+									district
+								} = address_component
+								location = {
+									lng,
+									lat,
+									address,
+									province,
+									city,
+									district
+								}
+							}
+						}
+					}
+					// #endif
+					// #ifndef H5
+					location = await this.$util.getBmapLocation()
+					// #endif
+
+					this.updateUserItem({
+						key: 'location',
+						val: location
+					})
+				}
+
+				let {
+					lng = 0,
+						lat = 0
+				} = location
+				if (refresh) {
+					await this.getCityList({
+						lng,
+						lat,
+						change
+					})
+				}
+
+				let {
+					id: ser_id,
+					store_id = 0
+				} = this.options
+				let {
+					list: oldList,
+					param,
+					cityList,
+					cityIndex,
+					cityId: city_id
+				} = this
+
+				let ind = cityList.findIndex(item => {
+					return item.id == city_id
+				})
+
+				if (ind == -1) {
+					this.$refs.choose_city_item.open()
+					this.loading = false
+					this.$util.hideAll()
+					this.list = {
+						data: [],
+						last_page: 1,
+						current_page: 1
+					}
+					return
+				}
+
+				city_id = ind == -1 ? 0 : city_id
+				cityIndex = ind == -1 ? 0 : ind
+
+
+				this.updateTechnicianItem({
+					key: 'cityIndex',
+					val: cityIndex
+				})
+
+				this.updateTechnicianItem({
+					key: 'cityId',
+					val: city_id
+				})
+
+				param = Object.assign({}, param, {
+					ser_id,
+					store_id,
+					lng,
+					lat,
+					city_id
+				})
+
+				let {
+					coach_format = 1
+				} = this.configInfo
+
+				let methodModel = coach_format == 1 ? 'serviceCoachList' : 'typeServiceCoachList'
+
+				let newList = await this.$api.service[methodModel](param);
+
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+			},
+			async toShowPopup(index, key) {
+				this.$refs.technician_list_popup.toShowPopup(this.list.data[index], key)
+			},
+			async toCollect(index) {
+				let {
+					id,
+					is_collect,
+					collect_num
+				} = this.list.data[index]
+				let methodModel = is_collect ? 'delCollect' : 'addCollect'
+				await this.$api.mine[methodModel]({
+					coach_id: id
+				})
+				this.$util.showToast({
+					title: is_collect ? '取消成功' : '收藏成功'
+				})
+				this.list.data[index].is_collect = is_collect == 1 ? 0 : 1
+				this.list.data[index].collect_num = is_collect == 1 ? collect_num - 1 : collect_num + 1
+			},
+			// 技-师详情
+			goInfo(index) {
+				let {
+					id,
+					store = {}
+				} = this.list.data[index]
+				let {
+					plugAuth = {}
+				} = this.configInfo
+				this.$util.goUrl({
+					url: plugAuth.store && store && store.id ? `/shopstore/pages/detail?id=${store.id}` :
+						`/user/pages/technician-info?id=${id}`
+				})
+			},
+			// 预约
+			async toOrder(index) {
+				let {
+					id: coach_id,
+					is_work = 0
+				} = this.list.data[index]
+				if (!is_work) return
+				let {
+					id: service_id
+				} = this.options
+				if (this.lockTap) return;
+				this.lockTap = true;
+				try {
+					await this.$api.order.addCar({
+						service_id,
+						coach_id,
+						num: 1,
+						is_top: 1,
+						coach_service: 1
+					})
+					this.lockTap = false
+					let url = `/user/pages/order?id=${coach_id}&ser_id=${service_id}`
+					this.$util.goUrl({
+						url
+					})
+				} catch (e) {
+					this.lockTap = false
+				}
+			},
+			toBack() {
+				let {
+					pageLen
+				} = this
+				let url = pageLen > 1 ? 1 : `/pages/service`
+				let openType = pageLen > 1 ? `navigateBack` : `reLaunch`
+				this.$util.goUrl({
+					url,
+					openType
+				})
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.pages-technician {}
+</style>
\ No newline at end of file
diff --git a/user/pages/choose-time.vue b/user/pages/choose-time.vue
new file mode 100644
index 0000000..7f9c8b8
--- /dev/null
+++ b/user/pages/choose-time.vue
@@ -0,0 +1,159 @@
+<template>
+	<view>
+		<scroll-view class="scroll-left fill-base" scroll-y :scroll-into-view="scrollNav" :scroll-with-animation="true">
+			<block v-for="(item,index) in storeDay" :key="index">
+				<view @tap="onChangeNav(index,1)" :id="`scrollNav${index}`"
+					class="item-child flex-center f-paragraph c-title" :class="[{'active':index==scrollInd}]"
+					:style="{color: index == scrollInd ? primaryColor: ''}">
+					<view class="flex-center child ellipsis"
+						:style="{borderLeft: index == scrollInd ? `5rpx solid ${primaryColor}`:''}">
+						{{`${item.dat_text} (${item.week})`}}
+					</view>
+				</view>
+			</block>
+		</scroll-view>
+		<view class="scroll-right abs fill-base pl-lg">
+			<view @tap="onChangeNav(index,2)" class="item-child flex-center f-paragraph c-paragraph"
+				style="padding-right: 25rpx;" :style="{color: index == checkInd ? primaryColor: ''}"
+				v-for="(item,index) in storeTime" :key="index">
+				<view class="flex-1" :class="[{'text-delete': item.status != 1}]">{{item.time_text}}</view>
+				<i class="iconfont icon-xuanze-fill" v-if="index == checkInd"></i>
+			</view>
+			<view class="mg-lg">
+				<abnor v-if="!loading&&storeTime.length<=0"></abnor>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions
+	} from 'vuex';
+	export default {
+		data() {
+			return {
+				options: {},
+				storeDay: [],
+				storeTime: [],
+				loading: false,
+				scrollNav: 'scrollNav1',
+				scrollInd: 0,
+				checkInd: -1
+			}
+		},
+		computed: mapState({
+			commonOptions: state => state.user.commonOptions,
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+		}),
+		async onLoad(options) {
+			// #ifdef H5
+			if (this.$jweixin.isWechat()) {
+				await this.$jweixin.initJssdk();
+				this.$jweixin.wxReady(() => {
+					this.$jweixin.hideOptionMenu()
+				})
+			}
+			// #endif
+			let {
+				index = -1
+			} = options
+			if (index && index.includes('_')) {
+				let arr = index.split('_')
+				this.scrollInd = arr[0]
+				this.checkInd = arr[1]
+			}
+			this.options = options
+			this.$util.showLoading()
+			await this.getStoreDay()
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+		},
+		methods: {
+			async getStoreDay() {
+				this.storeDay = await this.$api.order.dayText()
+				await this.getStoreTime()
+				this.loading = false
+				this.$util.hideAll()
+			},
+			async getStoreTime() {
+				let {
+					id: coach_id
+				} = this.options
+				let {
+					scrollInd
+				} = this
+				if (scrollInd < 0) return
+				let {
+					dat_str: day
+				} = this.storeDay[scrollInd]
+				this.storeTime = await this.$api.order.timeText({
+					coach_id,
+					day
+				});
+				this.loading = false
+				this.$util.hideAll()
+			},
+			async onChangeNav(index, type = 1) {
+				let key = type == 1 ? 'storeDay' : 'storeTime'
+				if (type == 1) {
+					this.checkInd = this.scrollInd == index ? this.checkInd : -1
+					this.scrollInd = index
+					this.scrollNav = `scrollNav${index}`
+					await this.getStoreTime()
+				} else {
+					let {
+						status,
+					} = this[key][index]
+					if (status != 1) return
+					this.checkInd = index
+					let item = this[key][index]
+					item.time = `${this.storeDay[this.scrollInd].dat_text} ${item.time_text}`
+					let send_info = {
+						time_index: `${this.scrollInd}_${index}`,
+						time: item
+					}
+					this.$util.getPage(-1).send_info = send_info
+					this.$util.goUrl({
+						url: 1,
+						openType: 'navigateBack'
+					})
+				}
+			},
+		},
+	}
+</script>
+
+<style>
+	.scroll-left {
+		width: 260rpx;
+		height: 100vh;
+		position: fixed;
+		top: 0;
+		bottom: 0;
+	}
+
+	.item-child {
+		height: 98rpx;
+	}
+
+	.item-child.active {
+		background: #F9F9F9;
+	}
+
+	.item-child .child {
+		width: 100%;
+		height: 32rpx;
+		padding: 0 5%;
+	}
+
+	.scroll-right {
+		min-height: 100vh;
+		top: 0;
+		width: 460rpx;
+		margin-left: 292rpx;
+	}
+</style>
diff --git a/user/pages/collect.vue b/user/pages/collect.vue
new file mode 100644
index 0000000..127fe15
--- /dev/null
+++ b/user/pages/collect.vue
@@ -0,0 +1,228 @@
+<template>
+	<view class="pages-technician">
+
+
+		<view class="mt-md ml-md mr-md" v-for="(item,index) in list.data" :key="index">
+			<technician-list-item from="collect" @comment="toShowPopup(index,'message')"
+				@collect="toCollect(index)" @order="toShowPopup(index,'technician')" :info="item">
+			</technician-list-item>
+		</view>
+
+
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0&&location.lng" :loading="loading"
+			v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1&&location.lng"></abnor>
+
+		<abnor @confirm="$util.checkAuth({ type: 'userLocation' })"
+			:tip="[{ text: '定位失败，请开启地理位置授权后刷新页面重试~', color: 0 }]" :button="[{ text: '开启定位' , type: 'confirm' }]"
+			btnSize="" v-if="!loading && !location.lng"> </abnor>
+
+
+		<view class="space-footer"></view>
+
+		<technician-list-popup ref="technician_list_popup"></technician-list-popup>
+		
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	import technicianListItem from "@/components/technician-list-item.vue"
+	import technicianListPopup from "@/components/technician-list-popup.vue"
+	export default {
+		components: {
+			technicianListItem,
+			technicianListPopup
+		},
+		data() {
+			return {
+				options: {},
+				param: {
+					page: 1,
+					ser_id: 0,
+					coach_name: ''
+				},
+				list: {
+					data: []
+				},
+				loading: true,
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			userInfo: state => state.user.userInfo,
+			location: state => state.user.location,
+		}),
+		onLoad() {
+			// #ifndef H5
+			this.$util.showLoading()
+			// #endif
+			this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			...mapActions([]),
+			...mapMutations(['updateUserItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				await this.getList()
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				uni.setNavigationBarTitle({
+					title: '收藏' + this.$t('action.attendantName')
+				})
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			toSearch(val) {
+				this.param.page = 1
+				this.param.coach_name = val
+				this.getList()
+			},
+			async getList() {
+				let {
+					location
+				} = this
+				if (!location.lat) {
+					// #ifdef H5
+					if (this.$jweixin.isWechat()) {
+						this.$util.showLoading()
+						// await this.$jweixin.initJssdk();
+						await this.$jweixin.wxReady2();
+						let {
+							latitude: lat = 0,
+							longitude: lng = 0
+						} = await this.$jweixin.getWxLocation()
+						location = {
+							lng,
+							lat,
+							address: '定位失败',
+							province: '',
+							city: '',
+							district: ''
+						}
+						if (lat && lng) {
+							let key = `${lat},${lng}`
+							let data = await this.$api.base.getMapInfo({
+								location: key
+							})
+							let {
+								status,
+								result
+							} = JSON.parse(data)
+							if (status == 0) {
+								let {
+									address,
+									address_component
+								} = result
+								let {
+									province,
+									city,
+									district
+								} = address_component
+								location = {
+									lng,
+									lat,
+									address,
+									province,
+									city,
+									district
+								}
+							}
+						}
+					}
+					// #endif
+					// #ifndef H5
+					location = await this.$util.getBmapLocation()
+					// #endif
+
+					this.updateUserItem({
+						key: 'location',
+						val: location
+					})
+				}
+
+				let {
+					list: oldList,
+					param,
+				} = this
+				let {
+					lng = 0,
+						lat = 0
+				} = location
+				param = Object.assign({}, param, {
+					lng,
+					lat
+				})
+				let newList = await this.$api.mine.coachCollectList(param);
+				newList.data.map(item => {
+					item.is_collect = 1
+				})
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+			},
+			handerTabChange(index) {
+				this.activeIndex = index;
+				this.$util.showLoading()
+				this.param.page = 1;
+				this.getList()
+			},
+			async toShowPopup(index, key) {
+				this.$refs.technician_list_popup.toShowPopup(this.list.data[index], key)
+			},
+			async toCollect(index) {
+				let {
+					id,
+					is_collect,
+					collect_num
+				} = this.list.data[index]
+				await this.$api.mine.delCollect({
+					coach_id: id
+				})
+				this.$util.showToast({
+					title: '取消成功'
+				})
+				this.list.data.splice(index, 1)
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.pages-technician {}
+</style>
\ No newline at end of file
diff --git a/user/pages/comment.vue b/user/pages/comment.vue
new file mode 100644
index 0000000..fd7bee2
--- /dev/null
+++ b/user/pages/comment.vue
@@ -0,0 +1,142 @@
+<template>
+	<view class="user-pages-comment">
+		<view class="list-message flex-warp mt-md ml-lg mr-lg pd-lg fill-base radius-16" :class="[{'b-1px-t':index!=0}]"
+			v-for="(item,index) in list.data" :key="index">
+			<image mode="aspectFill" class="item-avatar radius" :src="item.avatarUrl"></image>
+			<view class="flex-1 ml-md">
+				<view class="flex-between">
+					<view class="flex-y-center">
+						<view class="f-paragraph c-title mr-md">{{item.nickName}}</view>
+						<view class="flex-warp">
+							<i class="iconfont iconyduixingxingshixin"
+								:style="{color: aindex< item.star?subColor:'#eee'}" v-for="(aitem,aindex) in 5"
+								:key="aindex"></i>
+						</view>
+					</view>
+					<view class="f-icontext c-caption">{{item.create_time}}</view>
+				</view>
+				<view class="flex-warp mt-sm">
+					<view class="pt-sm pb-sm pl-md pr-md mt-sm mr-sm radius fill-body f-caption c-desc"
+						v-for="(item,index) in item.lable_text" :key="index">{{item}}</view>
+				</view>
+				<view class="f-caption c-caption mt-md">
+					<text decode="emsp" style="word-break:break-all;">{{item.text}}</text>
+				</view>
+			</view>
+		</view>
+
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+		<view class="space-footer"></view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		data() {
+			return {
+				options: {},
+				param: {
+					page: 1,
+					coach_id: ''
+				},
+				list: {
+					data: []
+				},
+				loading: true,
+				lockTap: false
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			userInfo: state => state.user.userInfo,
+			location: state => state.user.location,
+			carList: state => state.order.carList,
+		}),
+		onLoad(options) {
+			let {
+				id
+			} = options
+			this.$util.showLoading()
+			this.param.coach_id = id
+			this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			...mapActions(['getCarList']),
+			...mapMutations(['updateUserItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				await this.getList()
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			async getList() {
+				let {
+					list: oldList,
+					param,
+				} = this
+				let newList = await this.$api.service.commentList(param);
+
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.user-pages-comment {
+		.list-message {
+			.item-avatar {
+				width: 52rpx;
+				height: 52rpx;
+				background: #f4f6f8;
+			}
+
+			.iconfont {
+				font-size: 28rpx;
+				margin-right: 5rpx;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/user/pages/common/video.vue b/user/pages/common/video.vue
new file mode 100644
index 0000000..c045497
--- /dev/null
+++ b/user/pages/common/video.vue
@@ -0,0 +1,79 @@
+<template>
+	<view class="video-box" :style="{paddingBottom: number}">
+		<video class="my-video" object-fit="fill" preload="meta" :src="url" @play="play" @pause="pause" @ended="ended"
+			@waiting="waitingCallback" @error="errorCallback" @loadedmetadata="loadedmetadata" autoplay="true"
+			controls></video>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions
+	} from 'vuex';
+	export default {
+		data() {
+			return {
+				url: '',
+				number: '',
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+		}),
+		async onLoad(options) {
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+			let url = decodeURIComponent(options.url)
+			this.url = url
+		},
+		methods: {
+			play(e) {
+				this.$util.log("play=> ", e);
+			},
+			pause(e) {
+				this.$util.log("pause=> ", e);
+			},
+			ended(e) {
+				this.$util.log("ended=> ", e);
+			},
+			waitingCallback(e) {
+				this.$util.log("waitingCallback=> ", e);
+			},
+			errorCallback(e) {
+				this.$util.log("errorCallback=> ", e);
+			},
+			loadedmetadata(e) {
+				this.$util.log("loadedmetadata=> ", e);
+				let {
+					width,
+					height
+				} = e.detail;
+				let num = ((height / width) * 100).toFixed(2)
+				this.number = num ? `${num}%` : `56.25%`
+			}
+		}
+
+	}
+</script>
+
+<style>
+	.video-box {
+		position: relative;
+		width: 100%;
+		height: 0;
+		/* padding-bottom: 56.25%; */
+		/*用 9/16 得出，其他比例类似*/
+	}
+
+	.my-video {
+		position: absolute;
+		left: 0;
+		top: 0;
+		width: 100%;
+		height: 100%;
+		align-items: center;
+	}
+</style>
diff --git a/user/pages/common/web.vue b/user/pages/common/web.vue
new file mode 100644
index 0000000..baf20d3
--- /dev/null
+++ b/user/pages/common/web.vue
@@ -0,0 +1,43 @@
+<template>
+	<view>
+		<web-view :src="url" v-if="isLoad"></web-view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+	} from 'vuex';
+	export default {
+		data() {
+			return {
+				isLoad: false,
+				options: {},
+				url: ''
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			personVerifyUrl: state => state.user.personVerifyUrl,
+			fddExtsign: state => state.user.fddExtsign,
+			authUrl: state => state.user.authUrl,
+		}),
+		async onLoad(options) {
+			let {
+				url
+			} = options
+			this.options = options
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+			// this.url = ['personVerifyUrl', 'fddExtsign'].includes(url) ? this[url] : decodeURIComponent(url)
+			this.url = ['authUrl', 'fddExtsign'].includes(url) ? this[url] : decodeURIComponent(url)
+			console.log('显示网址：',this.url)
+			this.isLoad = true
+		}
+	}
+</script>
+
+<style lang="scss">
+</style>
\ No newline at end of file
diff --git a/user/pages/coupon/list.vue b/user/pages/coupon/list.vue
new file mode 100644
index 0000000..b6e1584
--- /dev/null
+++ b/user/pages/coupon/list.vue
@@ -0,0 +1,250 @@
+<template>
+	<view class="user-coupon-list">
+		<fixed>
+			<tab @change="handerTabChange" :list="tabList" :activeIndex="activeIndex*1" :activeColor="primaryColor"
+				width="33.3%" height="100rpx"></tab>
+			<view class="b-1px-b"></view>
+		</fixed>
+
+		<view @tap.stop="goDetail(index)" class="list-item rel mt-md ml-lg mr-lg fill-base radius-16"
+			:class="[{'grayscale':activeIndex>0}]" v-for="(item,index) in list.data" :key="index">
+			<view class="item-title flex-center pl-md pr-md abs f-paragraph c-warning">{{item.title}}</view>
+			<view class=" mt-lg pd-lg">
+				<view class="flex-between">
+					<view class="f-caption c-caption">
+						<view class="flex-y-baseline">
+							<view class="flex-y-baseline c-warning">¥<view class="f-md-title">{{item.discount}}</view>
+							</view>
+							<view class="ml-sm">{{item.type==0?`满${item.full}元可用`:'无门槛'}}</view>
+						</view>
+						<view>数量：x{{item.num}}</view>
+					</view>
+					<view class="use-btn flex-center f-caption radius"
+						:style="{color:primaryColor,background:activeIndex>0?'#eee':'',border: activeIndex>0?'1rpx solid #eee':`1rpx solid ${primaryColor}`}">
+						{{statusType[item.status]}}
+					</view>
+				</view>
+				<view class="f-caption c-caption mt-sm">有效期：{{item.start_time}}</view>
+			</view>
+			<view @tap.stop="toShowItem(index)"
+				class="flex-between fill-space f-caption c-caption pt-md pb-md pl-lg pr-lg b-1px-t">
+				<view>查看详情</view>
+				<i class="iconfont icon-right" :class="[{'rotate-90':!item.is_show},{'rotate-270':item.is_show}]"></i>
+			</view>
+			<view class="pl-lg pr-lg pb-lg fill-space f-desc c-caption" v-if="item.is_show">
+				<view class="flex-warp">
+					<view>使用规则：</view>
+					<view class="flex-1">
+						<text decode="emsp" style="word-break:break-all;">{{item.rule}}</text>
+					</view>
+				</view>
+				<view class="flex-warp mt-md">
+					<view>优惠详情：</view>
+					<view class="flex-1">
+						<text decode="emsp" style="word-break:break-all;">{{item.text}}</text>
+					</view>
+				</view>
+				<view class="flex-warp mt-md">
+					<view>限用服务：</view>
+					<view class="flex-1">
+						<view :class="[{'mt-sm':aindex!=0}]" v-for="(aitem,aindex) in item.service" :key="index">
+							{{aitem.title}}
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor type="DATA" v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+
+		<view class="space-footer"></view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		data() {
+			return {
+				options: {},
+				activeIndex: 0,
+				tabList: [{
+					title: '待使用',
+					id: 1
+				}, {
+					title: '已使用',
+					id: 2,
+				}, {
+					title: '已过期',
+					id: 3
+				}],
+				statusType: {
+					1: '去使用',
+					2: '已使用',
+					3: '删除',
+				},
+				param: {
+					page: 1,
+				},
+				list: {
+					data: []
+				},
+				loading: true,
+				lockTap: false
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad(options) {
+			this.options = options
+			let {
+				tab = 0
+			} = options
+			this.activeIndex = tab
+			this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			...mapMutations(['']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				await this.getList()
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+			},
+			initRefresh() {
+				this.param.page = 1;
+				this.initIndex(true)
+			},
+			async getList() {
+				let {
+					list: oldList,
+					param,
+					tabList,
+					activeIndex
+				} = this
+				param.status = tabList[activeIndex].id
+				let newList = await this.$api.mine.userCouponList(param);
+				newList.data.map(item => {
+					item.is_show = false
+				})
+
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+			},
+			handerTabChange(index) {
+				this.activeIndex = index;
+				this.$util.showLoading()
+				this.param.page = 1;
+				this.list.data = []
+				this.getList()
+			},
+			toShowItem(index) {
+				let {
+					is_show
+				} = this.list.data[index]
+				this.list.data[index].is_show = !is_show
+			},
+			async goDetail(index) {
+				let {
+					activeIndex
+				} = this
+
+				switch (activeIndex) {
+					case 0:
+						this.$util.goUrl({
+							url: `/pages/service`,
+							openType: `reLaunch`
+						})
+						break;
+					case 1:
+						break;
+					case 2:
+						let {
+							id: coupon_id
+						} = this.list.data[index]
+						if (this.lockTap) return
+						this.lockTap = true
+						this.$util.showLoading()
+						try {
+							await this.$api.mine.couponDel({
+								coupon_id
+							})
+							this.$util.hideAll()
+							this.$util.showToast({
+								title: `删除成功`
+							})
+							this.list.data.splice(index, 1)
+							this.lockTap = false
+						} catch (e) {
+							setTimeout(() => {
+								this.lockTap = false
+								this.$util.hideAll()
+							}, 2000)
+						}
+						break;
+				}
+
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.user-coupon-list {
+		.list-item {
+			overflow: hidden;
+
+			.item-title {
+				top: 0;
+				left: 0;
+				height: 50rpx;
+				background: #FFE2E2;
+				border-radius: 15rpx 0 15rpx 0;
+			}
+
+			.use-btn {
+				width: 140rpx;
+				height: 56rpx;
+				transform: rotateZ(360deg);
+			}
+		}
+	}
+</style>
diff --git a/user/pages/coupon/poster.vue b/user/pages/coupon/poster.vue
new file mode 100644
index 0000000..2f55d8f
--- /dev/null
+++ b/user/pages/coupon/poster.vue
@@ -0,0 +1,230 @@
+<template>
+	<view>
+		<view class="hideCanvasView">
+			<l-painter class="hideCanvas" ref="painter" useCORS />
+		</view>
+		<block v-if="src">
+			<image :src="src" class="code-img" @tap="previewImage"></image>
+			<view @tap.stop="toPreviewSave" class="save-btn flex-center f-title c-base radius"
+				:style="{background:primaryColor}">{{confirmText}}</view>
+			<view class="space-safe"></view>
+		</block>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions
+	} from 'vuex';
+	export default {
+		components: {},
+		props: {
+
+		},
+		data() {
+			return {
+				// #ifdef H5
+				confirmText: '长按上图保存图片',
+				// #endif
+				// #ifndef H5
+				confirmText: '保存图片至相册',
+				// #endif
+				options: '',
+				src: ''
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		async onLoad(options) {
+			this.options = options
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+			this.widget = this.$refs.canvas
+			this.$util.showLoading()
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+			let that = this
+			setTimeout(() => {
+				that.canvase()
+			}, 1000)
+		},
+		methods: {
+			...mapActions(['user/report']),
+			async canvase() {
+				let that = this;
+				let {
+					nickName,
+					avatarUrl
+				} = this.userInfo
+
+				let {
+					qr_code,
+					detail
+				} = this.$util.getPage(-1)
+
+				let {
+					share_img
+				} = detail
+
+				nickName = nickName.substring(0, 10)
+				let width = nickName.length * 12 + 33
+
+				let app_name = this.configInfo.app_name
+
+
+				let poster = {
+					css: {
+						width: '652rpx',
+						height: '966rpx',
+						background: '#fff',
+						borderRadius: '20rpx'
+					},
+					views: [{
+						type: 'image',
+						src: share_img,
+						css: {
+							width: '652rpx',
+							height: '652rpx',
+							objectFit: "cover",
+							position: 'absolute',
+							top: '0rpx',
+							left: '0rpx',
+							borderRadius: '20rpx 20rpx 0 0'
+						}
+					}, {
+						type: 'text',
+						text: nickName,
+						css: {
+							width,
+							borderRadius: '27rpx',
+							position: 'absolute',
+							top: '30rpx',
+							left: '67rpx',
+							fontSize: '26rpx',
+							background: '#555',
+							color: '#fff',
+							textAlign: 'center',
+							padding: '7rpx 5rpx 12rpx 30rpx',
+						}
+					}, {
+						type: 'image',
+						src: avatarUrl,
+						css: {
+							position: 'absolute',
+							width: '64rpx',
+							height: '64rpx',
+							objectFit: "cover",
+							top: '23rpx',
+							left: '33rpx',
+							borderRadius: '32rpx',
+							border: '3rpx solid #fff'
+						}
+					}, {
+						type: 'text',
+						text: app_name,
+						css: {
+							position: 'absolute',
+							bottom: '176rpx',
+							left: '50rpx',
+							fontSize: '28rpx',
+							color: '#333',
+							textAlign: 'left'
+						}
+					}, {
+						type: 'text',
+						text: `微信扫一扫立即使用`,
+						css: {
+							position: 'absolute',
+							bottom: '122rpx',
+							left: '50rpx',
+							fontSize: '28rpx',
+							color: '#333',
+							textAlign: 'left'
+						}
+					}, {
+						type: 'image',
+						// 	cover 改为 qr_code
+						src: qr_code,
+						css: {
+							width: '242rpx',
+							height: '242rpx',
+							position: 'absolute',
+							bottom: '40rpx',
+							right: '45rpx',
+							borderRadius: '121rpx'
+						}
+					}]
+				}
+				
+				// 渲染
+				this.$refs.painter.render(poster);
+				// 生成图片
+				this.$refs.painter.canvasToTempFilePathSync({
+					fileType: "jpg",
+					quality: 1,
+					success: (res) => {
+						that.$util.hideAll()
+						this.src = res.tempFilePath
+					},
+				});
+			},
+			async extraImage() {
+				const p2 = this.widget.canvasToTempFilePath();
+				p2.then(res => {
+					this.src = res.tempFilePath
+				});
+			},
+			previewImage() {
+				let finalPath = this.src;
+				uni.previewImage({
+					current: finalPath,
+					urls: [finalPath]
+				})
+			},
+			async saveImage() {
+				await this.$util.checkAuth({
+					type: "writePhotosAlbum"
+				});
+				let filePath = this.src;
+				let [err, success] = await uni.saveImageToPhotosAlbum({
+					filePath
+				})
+				if (err) return;
+				uni.showToast({
+					icon: 'none',
+					title: '保存成功'
+				})
+			},
+			toPreviewSave() {
+				// #ifdef H5
+				this.previewImage()
+				// #endif
+				// #ifndef H5
+				this.saveImage()
+				// #endif
+			}
+		}
+
+	}
+</script>
+
+<style>
+	.code-img {
+		width: 652rpx;
+		height: 966rpx;
+		margin: 20rpx auto;
+		border-radius: 20rpx;
+	}
+
+	.save-btn {
+		width: 490rpx;
+		height: 80rpx;
+		margin: 68rpx auto;
+	}
+</style>
\ No newline at end of file
diff --git a/user/pages/coupon/share.vue b/user/pages/coupon/share.vue
new file mode 100644
index 0000000..f389b94
--- /dev/null
+++ b/user/pages/coupon/share.vue
@@ -0,0 +1,428 @@
+<template>
+	<view class="user-coupon-share" v-if="isLoad">
+		<!-- #ifdef H5 -->
+		<view @tap="$util.goUrl({url:`/pages/service`,openType:`reLaunch`})" class="abs"
+			:class="[{'back-user-ios none': configInfo.isIos},{'back-user-android none': !configInfo.isIos}]"
+			style="z-index: 1;right:30rpx;" v-if="options.pid">
+			<view class="iconshouye iconfont"></view>
+			<view class="back-user_text">回到首页</view>
+		</view>
+		<!-- #endif -->
+		<image mode="aspectFill" class="coupon-img" :src="shareImg"></image>
+
+		<view class="coupon-content">
+			<view class="flex-center flex-column">
+				<view class="flex-center f-paragraph pt-lg pb-md" :style="{color:primaryColor}">
+					{{detail.status == 1 ? '距活动结束还剩':'活动已结束'}}
+				</view>
+				<view class="count-down">
+					<countdown type="2" :targetTime="over_time_text" @callback="countEnd">
+					</countdown>
+				</view>
+				<view class="space-lg"></view>
+				<view class="space-lg"></view>
+				<!-- status 1进行中，2成功，3失败 -->
+				<view class="ml-lg mr-lg pt-lg pb-sm pl-lg pr-lg rel radius-20" style="background: #FFFAF4;">
+					<view class="menu-img mt-lg abs">
+						<image mode="aspectFill" class="menu-img" src="https://lbqny.migugu.com/admin/anmo/coupon/menu.png"></image>
+						<view class="menu-title flex-center abs" :style="{color:primaryColor}">邀请记录</view>
+					</view>
+					<view class="space-lg"></view>
+					<view class="space-lg"></view>
+					<view class="flex-center f-desc pb-md" :style="{color:primaryColor}">
+						<view class="user-item">用户</view>
+						<view class="time-item">时间</view>
+					</view>
+					<image mode="aspectFill" class="line-img" src="https://lbqny.migugu.com/admin/anmo/coupon/line.png"></image>
+					<scroll-view scroll-y class="user-list-info" v-if="record_list.data.length > 0">
+						<view class="user-list flex-between f-desc c-title b-1px-b"
+							v-for="(item,index) in record_list.data" :key="index">
+							<view class="flex-y-center pt-md pb-md">
+								<image mode="aspectFill" class="avatar radius" :src="item.avatarUrl"></image>
+								<view class="ml-md max-300 ellipsis">{{item.nickName || `用户${item.id}`}}</view>
+							</view>
+							<view>{{item.create_time}}</view>
+						</view>
+					</scroll-view>
+					<abnor percent="70%" v-if="record_list.data.length == 0"></abnor>
+					<view class="space-sm"></view>
+
+
+					<!-- #ifndef H5 -->
+					<auth :needAuth="userInfo && (!userInfo.phone || !userInfo.nickName)" :must="true"
+						:type="!userInfo.phone ? 'phone':'userInfo'" @go="toShare" v-if="detail.status == 1">
+						<view class="share-img mt-lg rel">
+							<image mode="aspectFill" class="share-img" src="https://lbqny.migugu.com/admin/anmo/coupon/btn.png"></image>
+							<view class="share-title flex-center abs" :style="{color:primaryColor}">
+								{{detail.user_id == userInfo.id?'邀请有奖': userInfo.nickName ?'帮TA邀请':'我要参加'}}
+							</view>
+						</view>
+					</auth>
+
+					<view class="share-img grayscale mt-lg rel" v-else>
+						<image mode="aspectFill" class="share-img" src="https://lbqny.migugu.com/admin/anmo/coupon/btn.png"></image>
+						<view class="share-title flex-center abs" :style="{color:primaryColor}">
+							{{detail.user_id == userInfo.id?'邀请有奖': userInfo.nickName ?'帮TA邀请':'我要参加'}}
+						</view>
+					</view>
+					<!-- #endif -->
+
+				</view>
+				<view class="mt-md ml-lg mr-lg pt-lg pb-lg pl-lg pr-lg rel radius-20" style="background: #FFFAF4;"
+					v-if="detail.id">
+					<view class="atv-rule pd-md radius-16" :style="{border: `1px solid ${primaryColor}`}">
+						<view class="flex-center f-paragraph pt-sm pb-md" :style="{color:primaryColor}">活动规则</view>
+						<view class="f-desc c-desc">1、活动总计可发起{{detail.atv_num}}次；</view>
+						<view class="f-desc c-desc" v-if="detail.to_inv_user == 1">2、被推荐人授权用户信息后即可获得相应奖励；</view>
+						<view class="f-desc c-desc">
+							{{detail.to_inv_user == 1?3:2}}、活动发起人每成功邀请{{detail.inv_user_num}}位好友授权用户信息后，即可获得以下卡券：
+						</view>
+						<view class="flex-warp f-desc c-desc" v-for="(item,index) in detail.coupon" :key="index">
+							<view>（{{index*1+1}}）卡券：{{item.title}}；数量：x{{item.num}}</view>
+						</view>
+						<view class="space-md"></view>
+					</view>
+				</view>
+				<view class="space-footer"></view>
+			</view>
+		</view>
+
+		<uni-popup ref="show_share_item" type="bottom">
+			<view class="popup-share pd-lg f-desc c-desc fill-base">
+				<view class="flex-center">
+					<!-- #ifdef MP-WEIXIN -->
+					<button open-type="share" class="clear-btn list-item flex-center flex-column">
+						<image mode="aspectFill" class="item-image" src="https://lbqny.migugu.com/admin/anmo/coupon/wechat.png"></image>
+						<view style="font-size: 26rpx;color:#666;">分享给好友</view>
+					</button>
+					<view @tap.stop="toPoster" class="list-item flex-center flex-column">
+						<image mode="aspectFill" class="item-image" src="https://lbqny.migugu.com/admin/anmo/coupon/picture.png"></image>
+						<view>生成海报码</view>
+					</view>
+					<!-- #endif -->
+					<!-- #ifndef MP-WEIXIN -->
+					<view @tap.stop="toAppShare(1)" class="list-item flex-center flex-column">
+						<image mode="aspectFill" class="item-image" src="https://lbqny.migugu.com/admin/anmo/coupon/wechat.png"></image>
+						<view style="font-size: 26rpx;color:#666;">分享给好友</view>
+					</view>
+					<view @tap.stop="toAppShare(2)" class="list-item flex-center flex-column">
+						<image mode="aspectFill" class="item-image" src="https://lbqny.migugu.com/admin/anmo/coupon/wechat-moments.png"></image>
+						<view>分享到朋友圈</view>
+					</view>
+					<!-- #endif -->
+				</view>
+				<view class="space-footer"></view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	import countdown from '@/components/min-countdown.vue'
+	import siteInfo from '@/siteinfo.js';
+	export default {
+		components: {
+			countdown
+		},
+		data() {
+			return {
+				shareImg: 'https://lbqny.migugu.com/admin/anmo/coupon/bg.png',
+				isLoad: false,
+				options: {},
+				detail: {
+					end_time: ''
+				},
+				record_list: {},
+				qr_code: ''
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			commonOptions: state => state.user.commonOptions,
+			userInfo: state => state.user.userInfo,
+			isGzhLogin: state => state.user.isGzhLogin,
+			over_time_text() {
+				return new Date().getTime() + this.detail.end_time * 1000
+			}
+		}),
+		async onLoad(options) {
+			this.$util.showLoading()
+			options = await this.updateCommonOptions(options)
+			this.options = options
+			// #ifdef MP-WEIXIN
+			uni.hideShareMenu()
+			// #endif
+			await this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onShareAppMessage(e) {
+			let {
+				id,
+				share_img: imageUrl
+			} = this.detail
+			let {
+				id: pid = 0
+			} = this.userInfo
+			let path =
+				`/user/pages/coupon/share?pid=${pid}&coupon_atv_id=${id}`
+			this.$util.log(path)
+			this.$refs.show_share_item.close()
+			return {
+				title: '',
+				imageUrl,
+				path,
+			}
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getUserInfo', 'updateCommonOptions']),
+			...mapMutations(['updateUserItem']),
+			async initIndex(refresh = false) {
+				if (!this.configInfo.id || refresh) {
+					await this.getConfigInfo()
+				}
+				let {
+					id: uid = 0
+				} = this.userInfo
+				let {
+					isGzhLogin
+				} = this
+				// #ifdef H5
+				if (isGzhLogin && !uid) {
+					setTimeout(() => {
+						this.getDetail()
+					}, 1000)
+				} else {
+					this.getDetail()
+				}
+				// #endif
+				// #ifndef H5
+				await this.getDetail()
+				// #endif
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					setTimeout(() => {
+						this.toAppShare()
+					}, 1200)
+				}
+				// #endif
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			async getDetail() {
+				let {
+					coupon_atv_id = 0
+				} = this.options
+				let {
+					record_list,
+					atv_info
+				} = await this.$api.mine.couponAtvInfo({
+					id: coupon_atv_id
+				})
+				if (atv_info.status !== 1) {
+					atv_info.end_time = 0
+				}
+				this.detail = atv_info
+				this.record_list = record_list
+				this.isLoad = true
+				this.$util.hideAll()
+			},
+			countEnd() {
+				this.$util.log("倒计时完了")
+				setTimeout(() => {
+					this.initRefresh()
+					this.$util.back()
+				}, 1000)
+			},
+			async toShare() {
+				if (this.detail.status != 1) return
+				// #ifndef APP-PLUS
+				if (!this.qr_code) {
+					this.$util.showLoading()
+					let {
+						id: coupon_atv_id
+					} = this.detail
+					let qr_code = await this.$api.mine.atvQr({
+						page: 'user/pages/coupon/share',
+						coupon_atv_id
+					})
+					this.$util.hideAll()
+					this.qr_code = qr_code
+				}
+				// #endif
+				this.$refs.show_share_item.open()
+				if (this.detail.user_id == this.userInfo.id) return
+				this.getDetail()
+			},
+			toPoster() {
+				this.$refs.show_share_item.close()
+				this.$util.goUrl({
+					url: `/user/pages/coupon/poster`
+				})
+			},
+			toAppShare(type = 1) {
+				let {
+					id,
+					share_img: imageUrl,
+					status
+				} = this.detail
+				let {
+					id: pid = 0
+				} = this.userInfo
+				let methodModel = status * 1 == 1 ? 'showOptionMenu' : 'hideOptionMenu'
+				let title = '邀请有礼'
+				let summary = '邀请新人 获得福利'
+
+				let {
+					siteroot
+				} = siteInfo
+				let url = siteroot.split('/index.php')[0]
+				let href = `${url}/h5/#/user/pages/coupon/share?coupon_atv_id=${id}&pid=${pid}`
+
+				// #ifdef H5
+				this.$jweixin.wxReady(() => {
+					this.$jweixin[methodModel]()
+					this.$jweixin.shareAppMessage(title, summary, href, imageUrl)
+					this.$jweixin.shareTimelineMessage(title, href, imageUrl)
+				})
+				// #endif
+				// #ifdef APP-PLUS
+				this.$refs.show_share_item.close()
+				let scene = type == 1 ? 'WXSceneSession' : 'WXSceneTimeline'
+				uni.share({
+					provider: "weixin",
+					scene,
+					type: 0,
+					href,
+					title,
+					summary,
+					imageUrl,
+					success: function(res) {
+						console.log("success:" + JSON.stringify(res));
+					},
+					fail: function(err) {
+						console.log("fail:" + JSON.stringify(err));
+					}
+				});
+				// #endif
+			},
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.user-coupon-share {
+		.coupon-img {
+			width: 750rpx;
+			height: 560rpx;
+		}
+
+		.coupon-content {
+			width: 750rpx;
+			min-height: 1431rpx;
+			background: linear-gradient(0deg, #A40035 0%, #FFAE89 100%);
+
+			.count-down {
+				height: 56rpx;
+			}
+
+			.menu-img {
+				width: 426rpx;
+				height: 100rpx;
+			}
+
+			.menu-img.abs {
+				top: -56rpx;
+				left: 50%;
+				margin-left: -213rpx;
+			}
+
+			.menu-title {
+				width: 426rpx;
+				height: 90rpx;
+				font-size: 36rpx;
+				top: 0;
+			}
+
+			.line-img {
+				width: 630rpx;
+				height: 1rpx;
+			}
+
+			.user-item {
+				width: 360rpx;
+			}
+
+			.time-item {
+				width: 220rpx;
+			}
+
+			.user-list-info {
+				/* #ifdef H5 */
+				height: 746rpx;
+				/* #endif */
+				/* #ifndef H5 */
+				height: 576rpx;
+				/* #endif */
+
+				.user-list {
+					.avatar {
+						width: 56rpx;
+						height: 56rpx;
+						background: #FFAE89;
+					}
+				}
+
+			}
+
+
+			.share-img {
+				width: 541rpx;
+				height: 140rpx;
+				margin: 0 auto;
+			}
+
+			.share-title {
+				width: 541rpx;
+				height: 125rpx;
+				font-size: 36rpx;
+				top: 0;
+			}
+
+			.atv-rule {
+				transform: rotateZ(360deg);
+			}
+
+		}
+
+		.popup-share {
+			.list-item {
+				width: 50%;
+
+				.item-image {
+					width: 66rpx;
+					height: 66rpx;
+				}
+			}
+		}
+
+	}
+</style>
diff --git a/user/pages/coupon/use.vue b/user/pages/coupon/use.vue
new file mode 100644
index 0000000..da9d70c
--- /dev/null
+++ b/user/pages/coupon/use.vue
@@ -0,0 +1,187 @@
+<template>
+	<view class="user-coupon-use">
+		<view @tap.stop="toUse(index)" class="list-item rel mt-md ml-lg mr-lg fill-base radius-16"
+			v-for="(item,index) in list.data" :key="index">
+			<view class="item-title flex-center pl-md pr-md abs f-paragraph c-warning">{{item.title}}</view>
+			<view class="mt-lg pd-lg">
+				<view class="flex-between">
+					<view class="f-caption c-caption">
+						<view class="flex-y-baseline">
+							<view class="flex-y-baseline c-warning">¥<view class="f-md-title">{{item.discount}}</view>
+							</view>
+							<view class="ml-sm">{{item.type==0?`满${item.full}元可用`:'无门槛'}}</view>
+						</view>
+						<view>数量：x{{item.num}}</view>
+					</view>
+					<view class="use-btn flex-center f-caption radius"
+						:style="{color: primaryColor, border: `1rpx solid ${primaryColor}`}">
+						立即使用
+					</view>
+				</view>
+				<view class="f-caption c-caption mt-sm">有效期：{{item.start_time}}</view>
+			</view>
+			<view @tap.stop="toShowItem(index)"
+				class="flex-between fill-space f-caption c-caption pt-md pb-md pl-lg pr-lg b-1px-t">
+				<view>查看详情</view>
+				<i class="iconfont icon-right" :class="[{'rotate-90':!item.is_show},{'rotate-270':item.is_show}]"></i>
+			</view>
+			<view class="pl-lg pr-lg pb-lg fill-space f-desc c-caption" v-if="item.is_show">
+				<view class="flex-warp">
+					<view>使用规则：</view>
+					<view class="flex-1">
+						<text decode="emsp" style="word-break:break-all;">{{item.rule}}</text>
+					</view>
+				</view>
+				<view class="flex-warp mt-md">
+					<view>优惠详情：</view>
+					<view class="flex-1">
+						<text decode="emsp" style="word-break:break-all;">{{item.text}}</text>
+					</view>
+				</view>
+				<view class="flex-warp mt-md">
+					<view>限用服务：</view>
+					<view class="flex-1">
+						<view :class="[{'mt-sm':aindex!=0}]" v-for="(aitem,aindex) in item.service" :key="index">
+							{{aitem.title}}
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor type="DATA" v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+
+		<view class="space-max-footer"></view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		data() {
+			return {
+				options: {},
+				param: {
+					page: 1,
+					coach_id: ''
+				},
+				list: {
+					data: []
+				},
+				loading: true
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			userInfo: state => state.user.userInfo,
+		}),
+		async onLoad() {
+			this.coach_id = this.$util.getPage(-1).options.id
+			await this.initIndex()
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			...mapMutations(['']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				await this.getList()
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			async getList() {
+				let {
+					list: oldList,
+					param,
+					coach_id
+				} = this
+				param.coach_id = coach_id
+				let newList = await this.$api.order.couponList(param);
+				newList.data.map(item => {
+					item.is_show = false
+				})
+
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+			},
+			toShowItem(index) {
+				let {
+					is_show
+				} = this.list.data[index]
+				this.list.data[index].is_show = !is_show
+			},
+			toUse(index) {
+				let {
+					id
+				} = this.list.data[index]
+				this.$util.getPage(-1).orderInfo.coupon_id = id
+				this.$util.back()
+				setTimeout(() => {
+					this.$util.goUrl({
+						url: 1,
+						openType: 'navigateBack'
+					})
+				}, 1000)
+			},
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.user-coupon-use {
+		.list-item {
+			overflow: hidden;
+
+			.item-title {
+				top: 0;
+				left: 0;
+				height: 50rpx;
+				background: #FFE2E2;
+				border-radius: 15rpx 0 15rpx 0;
+			}
+
+			.use-btn {
+				width: 140rpx;
+				height: 56rpx;
+				transform: rotateZ(360deg);
+			}
+		}
+	}
+</style>
diff --git a/user/pages/detail.vue b/user/pages/detail.vue
new file mode 100644
index 0000000..b5c84dc
--- /dev/null
+++ b/user/pages/detail.vue
@@ -0,0 +1,308 @@
+<template>
+	<view class="pages-home rel" v-if="detail.id">
+		<!-- #ifdef H5 -->
+		<view @tap="$util.goUrl({url:`/pages/service`,openType:`reLaunch`})" class="abs"
+			:class="[{'back-user-ios': configInfo.isIos},{'back-user-android': !configInfo.isIos}]"
+			style="margin-top:25rpx;z-index: 1;" v-if="options.pid">
+			<view class="iconshouye iconfont"></view>
+			<view class="back-user_text">回到首页</view>
+		</view>
+		<!-- #endif -->
+		<banner :list="detail.imgs" :margin="0" :autoplay="true" :height="562" :indicatorActiveColor="primaryColor">
+		</banner>
+		<view class="fill-base pd-lg">
+			<view class="f-sm-title c-title text-bold">{{detail.title}}</view>
+			<view class="f-caption c-caption mt-sm" v-if="detail.material_price*1>0">物料费 ¥{{detail.material_price}}
+			</view>
+			<view class="flex-y-baseline f-desc c-caption mt-sm">
+				<view class="flex-y-baseline flex-1">
+					<view class="flex-y-baseline f-icontext c-orange text-bold mr-sm">
+						<b class="f-paragraph c-orange">￥</b>
+						<view class="f-big-title">
+							{{detail.price}}
+						</view>
+					</view>
+					<view class="text-delete mr-md" v-if="detail.init_price">¥{{detail.init_price}}</view>
+					<view class="flex-y-baseline flex-1">
+						<i class="iconfont icon-shijian mr-sm" :style="{ color: primaryColor }"></i>
+						{{detail.time_long}}分钟 
+					</view>					
+					<view>超{{detail.total_sale}}人选择</view>	
+				</view>
+			</view>		
+			<view class="time-label flex-y-center f-paragraph mt-lg">
+				<view class="near-time flex-center c-base pl-lg pr-lg pt-md pb-md rel" >
+					<view class="bg abs" :style="{background:primaryColor}"></view>
+					<image mode="aspectFill" class="tp-img mr-lg" src="/static/img/axg.png"></image>
+					<view @tap.stop="toJump('ftList')" v-for="(item) in ftList" class="ft">
+						<i class="iconfont" :class="item.icon" :style="{color:primaryColor}"></i>
+						<span class="c-title ml-sm">{{ item.text }}</span>
+					</view>	
+				</view>
+			</view>			
+		</view>
+		<view class="space-md"></view>
+		<tab @change="handerTabChange" :list="tabList" :activeIndex="activeIndex*1" :activeColor="primaryColor"
+			width="33.3%" height="100rpx"></tab>
+		<view class="space-md"></view>
+		<view class="fill-base pd-lg f-paragraph c-desc">
+			<view class="c-title text-bold mb-md">{{tabList[activeIndex].title}}</view>
+			<parser :html="detail[rule[activeIndex]]" @linkpress="linkpress" show-with-animation lazy-load>加载中...
+			</parser>
+		</view>
+
+		<view class="space-max-footer"></view>
+		<fix-bottom-button
+			@confirm="$util.goUrl({url:`/user/pages/choose-technician?id=${options.id}&store_id=${options.store_id}`})"
+			:text="[{type:'confirm',text:'选择'+ $t('action.attendantName'),isAuth:true}]" bgColor="#fff">
+		</fix-bottom-button>
+
+		<!-- #ifdef APP-PLUS -->
+		<view @tap.stop="toAppShare"
+			class="common-share-btn detail fix flex-center flex-column c-base box-shadow radius"
+			:style="{background:primaryColor}" v-if="userInfo.id">
+			<i class="iconfont iconweixin"></i>
+			<view class="f-icontext">分享</view>
+		</view>
+		<view class="space-max-footer"></view>
+		<!-- #endif -->
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	import siteInfo from '@/siteinfo.js';
+	import parser from "@/components/jyf-Parser/index"
+	export default {
+		components: {
+			parser
+		},
+		data() {
+			return {
+				options: {},
+				activeIndex: 0,
+				tabList: [{
+					title: '项目介绍',
+					id: 0
+				}, {
+					title: '禁忌说明',
+					id: 1,
+				}, {
+					title: '下单须知',
+					id: 2
+				}],
+				ftList: [{
+					icon: 'icon-kzj',
+					text: '实名认证'
+				}, {
+					icon: 'icon-kpk',
+					text: '爽约包赔'
+				}, {
+					icon: 'icon-kzz',
+					text: '资质证书'
+				}],				
+				rule: {
+					0: 'introduce',
+					1: 'explain',
+					2: 'notice'
+				},
+				detail: {},
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+			isGzhLogin: state => state.user.isGzhLogin,
+		}),
+		onLoad(options) {
+			this.$util.showLoading()
+			this.options = options
+			this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onShareAppMessage(e) {
+			let {
+				id: pid = 0
+			} = this.userInfo
+			let {
+				id,
+				title,
+				cover: imageUrl
+			} = this.detail
+			let path = `/user/pages/detail?pid=${pid}&id=${id}`
+			this.$util.log(path)
+			return {
+				title,
+				imageUrl,
+				path,
+			}
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getUserInfo']),
+			...mapMutations([]),
+			async initIndex(refresh = false) {
+				let {
+					pid = 0
+				} = this.options
+				let {
+					isGzhLogin
+				} = this
+				let {
+					id: uid = 0
+				} = this.userInfo
+				if (pid && !uid) {
+					// #ifdef H5
+					if (isGzhLogin) {
+						setTimeout(() => {
+							this.getUserInfo()
+						}, 1000)
+					} else {
+						this.getUserInfo()
+					}
+					// #endif
+					// #ifndef H5
+					await this.getUserInfo()
+					// #endif 
+				}
+				if (!this.configInfo.id || refresh) {
+					await this.getConfigInfo()
+				}
+				await this.getDetail()
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					setTimeout(() => {
+						this.toAppShare()
+					}, 1200)
+				}
+				// #endif
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			toAppShare() {
+				let {
+					id: pid = 0
+				} = this.userInfo
+				let {
+					id,
+					title,
+					cover: imageUrl
+				} = this.detail
+				let summary = ''
+
+				let {
+					siteroot
+				} = siteInfo
+				let url = siteroot.split('/index.php')[0]
+				let href = `${url}/h5/#/user/pages/detail?id=${id}&pid=${pid}`
+
+				// #ifdef H5
+				this.$jweixin.wxReady(() => {
+					this.$jweixin.showOptionMenu()
+					this.$jweixin.shareAppMessage(title, summary, href, imageUrl)
+					this.$jweixin.shareTimelineMessage(title, href, imageUrl)
+				})
+				// #endif
+				// #ifdef APP-PLUS
+				uni.share({
+					provider: "weixin",
+					scene: 'WXSceneSession',
+					type: 0,
+					href,
+					title,
+					summary,
+					imageUrl,
+					success: function(res) {
+						console.log("success:" + JSON.stringify(res));
+					},
+					fail: function(err) {
+						console.log("fail:" + JSON.stringify(err));
+					}
+				});
+				// #endif
+			},
+			async getDetail() {
+				let {
+					id
+				} = this.options
+				this.detail = await this.$api.service.serviceInfo({
+					id
+				});
+				this.$util.hideAll()
+			},
+			handerTabChange(index) {
+				this.activeIndex = index;
+			},
+			linkpress(res) {
+				// #ifdef APP-PLUS
+				this.$util.goUrl({
+					url: res.href,
+					openType: 'web'
+				})
+				// #endif
+			},
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.pages-home {
+		.list-item {
+			.item-btn {
+				width: 129rpx;
+				height: 54rpx;
+			}
+		}
+				
+		.time-label {
+			.near-text {
+				width: 100%;
+				height: 33rpx;
+				background: #F5F5F5;
+			}
+
+			.near-time {
+				width: 100%;
+				height: 86rpx;
+
+				.bg {
+					opacity: 0.1;
+					top: 0;
+					left: 0;
+					right: 0;
+					bottom: 0;
+					z-index: 1;
+					border-radius: 10rpx;
+				}
+			}
+			.ft{
+				display: flex;
+				align-items: center;
+				width: 100%;
+			}
+
+			.tp-img{
+				width: 183px;
+				height: 16px;
+			}			
+		}	
+	}	
+</style>
\ No newline at end of file
diff --git a/user/pages/distribution/agent.vue b/user/pages/distribution/agent.vue
new file mode 100644
index 0000000..f5ff365
--- /dev/null
+++ b/user/pages/distribution/agent.vue
@@ -0,0 +1,178 @@
+<template>
+	<view>
+		<fixed>
+			<search @input="toSearch" type="input" :padding="30" :radius="0" placeholder="请输入代理商姓名">
+			</search>
+		</fixed>
+		<view @tap.stop="toChangeItem(index)"
+			class="list-item fill-base pt-lg pb-lg pl-md pr-lg flex-center mt-md ml-md mr-md radius-16"
+			v-for="(item,index) in list.data" :key="index">
+			<i class="iconfont mr-md"
+				:class="[{'icon-xuanze':check_admin.id!=item.id},{'icon-radio-fill':check_admin.id==item.id}]"
+				:style="{color:check_admin.id==item.id?primaryColor:''}"></i>
+			<view class="flex-1 flex-center">
+				<image class="avatar radius" :src="item.avatarUrl"></image>
+				<view class="flex-1 ml-md">
+					<view class="f-title c-title text-bold ellipsis" style="max-width:494rpx">{{item.agent_name}}</view>
+					<view class="flex-between mt-sm">
+						<view class="city-btn flex-center f-icontext rel" :style="{color:primaryColor}">
+							<view class="bg abs" :style="{background:primaryColor}"></view>
+							{{cityType[item.city_type]}}代理
+						</view>
+						<view></view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+		<view class="space-max-footer"></view>
+		<fix-bottom-button @confirm="toConfirm" :text="[{text:'确定',type:'confirm'}]" bgColor="#fff">
+		</fix-bottom-button>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		data() {
+			return {
+				loading: true,
+				isLoad: false,
+				cityType: ['', '城市', '区县', '省'],
+				param: {
+					page: 1,
+					limit: 10,
+					status: 0
+				},
+				list: {
+					data: []
+				},
+				check_admin: {}
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad() {
+			let {
+				check_admin
+			} = this.$util.getPage(-1)
+			this.check_admin = check_admin
+			this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				this.getList();
+			},
+			handerTabChange(index) {
+				this.activeIndex = index
+				this.param.status = index
+				this.getList();
+			},
+			toSearch(val) {
+				this.param.page = 1
+				this.param.nickName = val
+				this.check_admin = {}
+				this.getList()
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			async getList() {
+				this.$util.showLoading()
+				let {
+					list: oldList,
+					param
+				} = this
+				let newList = await this.$api.mine.adminList(param)
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.isLoad = true
+				this.loading = false
+				this.$util.hideAll()
+			},
+			toChangeItem(index) {
+				this.check_admin = this.list.data[index]
+			},
+			toConfirm() {
+				let {
+					id = 0,
+				} = this.check_admin
+				if (!id) {
+					this.$util.showToast({
+						title: `请选择代理商`
+					})
+					return
+				}
+				this.$util.getPage(-1).check_admin = this.check_admin
+				this.$util.goUrl({
+					url: 1,
+					openType: `navigateBack`
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.list-item {
+		.avatar {
+			width: 94rpx;
+			height: 94rpx;
+		}
+
+
+		.city-btn {
+			height: 32rpx;
+			padding: 0 6rpx 0 6rpx;
+
+			.bg {
+				opacity: 0.1;
+				border-radius: 5rpx;
+				top: 0;
+				left: 0;
+				right: 0;
+				bottom: 0;
+				z-index: 1;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/user/pages/distribution/apply.vue b/user/pages/distribution/apply.vue
new file mode 100644
index 0000000..231b4cd
--- /dev/null
+++ b/user/pages/distribution/apply.vue
@@ -0,0 +1,170 @@
+<template>
+	<view class="apply-pages" v-if="isLoad">
+		<view class="apply-form">
+			<view class="fill-base mt-md radius-16">
+				<view class="flex-between pl-lg pr-lg b-1px-b">
+					<view class="item-text">您的姓名</view>
+					<input v-model="form.user_name" type="text" class="item-input flex-1" maxlength="20"
+						:placeholder="rule[0].errorMsg" />
+				</view>
+				<view class="flex-between pl-lg pr-lg b-1px-b">
+					<view class="item-text">手机号码</view>
+					<input v-model="form.mobile" type="text" class="item-input flex-1"
+						:placeholder="rule[1].errorMsg" />
+				</view>
+			</view>
+			<view class="fill-base mt-md radius-16">
+				<view class="flex-between pl-lg pr-lg">
+					<view class="item-text">备注信息</view>
+					<input :disabled="true" type="text" class="item-input flex-1" />
+				</view>
+				<textarea v-model="form.text" class="item-textarea pd-lg" maxlength="300" placeholder="输入备注信息" />
+				<view class="text-right pb-lg pr-lg">
+					{{form.text.length>300?300:form.text.length}}/300
+				</view>
+			</view>
+		</view>
+
+		<view class="space-max-footer"></view>
+
+		<fix-bottom-button @confirm="submit" :text="[{text:'确定申请',type:'confirm',isAuth:true}]" bgColor="#fff">
+		</fix-bottom-button>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		data() {
+			return {
+				cityIndex: 0,
+				cityList: [],
+				isLoad: false,
+				options: {},
+				form: {
+					id: 0,
+					user_name: '', //姓名 
+					mobile: '', //手机号  
+					text: '', //备注 
+				},
+				rule: [{
+						name: "user_name",
+						checkType: "isNotNull",
+						errorMsg: "请输入您的真实姓名",
+						regType: 2
+					},
+					{
+						name: "mobile",
+						checkType: "isMobile",
+						errorMsg: "请输入常用手机号码"
+					}
+				],
+				lockTap: false
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+			location: state => state.user.location,
+
+		}),
+		async onLoad(options) {
+			this.$util.showLoading()
+			this.options = options
+			await this.initIndex()
+			this.isLoad = true
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getUserInfo']),
+			...mapMutations(['updateUserItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				if (!this.configInfo.id || refresh) {
+					await this.getConfigInfo()
+				}
+				let data = await this.$api.mine.resellerInfo()
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				if (!data.id) {
+					this.$util.hideAll()
+					return
+				}
+				for (let key in this.form) {
+					this.form[key] = data[key]
+				}
+				this.$util.hideAll()
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			//表单验证
+			validate(param) {
+				let validate = new this.$util.Validate();
+				this.rule.map(item => {
+					let {
+						name,
+					} = item
+					validate.add(param[name], item);
+				})
+				let message = validate.start();
+				return message;
+			},
+			async submit() {
+				let param = this.$util.deepCopy(this.form)
+				let msg = this.validate(param);
+				if (msg) {
+					this.$util.showToast({
+						title: msg
+					});
+					return;
+				}
+				if (this.lockTap) return
+				this.lockTap = true
+				this.$util.showLoading()
+				param.text = param.text.length > 300 ? param.text.substring(0, 300) : param.text
+				try {
+					await this.$api.mine.applyReseller(param)
+					this.$util.hideAll()
+					this.$util.showToast({
+						title: `提交成功`
+					});
+					setTimeout(() => {
+						if (getCurrentPages().length > 1) {
+							this.$util.back()
+						}
+						this.$util.goUrl({
+							url: '/user/pages/apply-result?type=2',
+							openType: `redirectTo`
+						})
+					}, 1000)
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+</style>
diff --git a/user/pages/distribution/bind-technician.vue b/user/pages/distribution/bind-technician.vue
new file mode 100644
index 0000000..6a95868
--- /dev/null
+++ b/user/pages/distribution/bind-technician.vue
@@ -0,0 +1,255 @@
+<template>
+	<view class="pt-md" style="background-color: #F4F6F7;">
+		<view class="hideCanvasView">
+			<l-painter class="hideCanvas" ref="painter" useCORS />
+		</view>
+		<block v-if="src">
+			<image :src="src" class="code-img ml-md" @tap="previewImage"></image>
+			<view class="space-max-footer"></view>
+			<fix-bottom-button @cancel="$util.goUrl({url:`/user/pages/distribution/share-set`})"
+				@confirm="toPreviewSave"
+				:text="options.type*1>0?[{text: '分享设置',type:'cancel'},{text: confirmText,type:'confirm'}]:[{text: confirmText,type:'confirm'}]"
+				bgColor="#fff" :classType="2">
+			</fix-bottom-button>
+		</block>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions
+	} from 'vuex';
+	export default {
+		components: {},
+		props: {
+
+		},
+		data() {
+			return {
+				options: {},
+				// #ifdef H5
+				confirmText: '长按上图保存图片',
+				// #endif
+				// #ifndef H5
+				confirmText: '保存图片至相册',
+				// #endif
+				src: '',
+				admin_id: 0,
+				check_admin: {
+					id: 0,
+					agent_name: '平台'
+				}
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+			mineInfo: state => state.user.mineInfo,
+		}),
+		async onLoad(options) {
+			this.options = options
+			// #ifdef H5
+			if (this.$jweixin.isWechat()) {
+				await this.$jweixin.initJssdk();
+				this.$jweixin.wxReady(() => {
+					this.$jweixin.hideOptionMenu()
+				})
+			}
+			// #endif
+			this.$util.showLoading()
+			await this.getConfigInfo()
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+			let title = '邀请绑定' + this.$t('action.attendantName')
+			uni.setNavigationBarTitle({
+				title
+			})
+			let that = this
+			setTimeout(() => {
+				that.renderToCanvas()
+			}, 1000)
+		},
+		methods: {
+			...mapActions(['getConfigInfo']),
+			initRefresh() {
+				this.src = ''
+				this.$util.showLoading()
+				this.renderToCanvas(true)
+			},
+			async renderToCanvas(refresh = false) {
+				let that = this;
+				let {
+					type = 0
+				} = that.options
+				let methodModel = type == 1 ? 'resellerInvCoachQr' : 'adminCoachQr'
+				let {
+					admin_id = 0,
+					check_admin = {}
+				} = that
+				
+				let {
+					id = 0
+				} = check_admin
+				if (refresh && type == 1 && id) {
+					admin_id = id
+				}
+				let param = type == 1 ? {admin_id:that.userInfo.id} : {};
+				
+				
+				let qr_code = await this.$api.mine[methodModel](param)
+				
+				
+
+				let {
+					bind_technician_img = ''
+				} = this.configInfo
+
+				let cover = bind_technician_img || 'https://lbqnyv2.migugu.com/bianzu18.png'
+
+				let {
+					nickName,
+					avatarUrl
+				} = this.userInfo
+				let qr_radius = '0rpx'
+				// #ifdef MP-WEIXIN
+				qr_radius = '145rpx'
+				// #endif
+
+				let poster = {
+					css: {
+						width: '710rpx',
+						height: '1278rpx',
+					},
+					views: [{
+							type: 'image',
+							src: cover,
+							css: {
+								width: '710rpx',
+								height: '1138rpx',
+								objectFit: "cover",
+								top: '0rpx',
+								left: '0rpx',
+								position: 'absolute'
+							}
+						},
+						{
+							type: 'view',
+							css: {
+								background: '#fff',
+								width: '710rpx',
+								height: '140rpx',
+								bottom: '0rpx',
+								left: '0rpx',
+								position: 'absolute'
+							},
+							views: [{
+									type: 'image',
+									src: avatarUrl,
+									css: {
+										position: 'absolute',
+										width: '94rpx',
+										height: '94rpx',
+										objectFit: "cover",
+										borderRadius: '50rpx',
+										bottom: '23rpx',
+										left: '20rpx'
+									}
+								},
+								{
+									type: 'text',
+									text: nickName,
+									css: {
+										position: 'absolute',
+										bottom: '70rpx',
+										left: '130rpx',
+										width: '350rpx',
+										fontSize: '32rpx',
+										fontWeight: '300',
+										color: '#0C0C0C'
+									}
+								},
+								{
+									type: 'text',
+									text: '邀请您成为' + this.$t('action.attendantName') + ' 快快扫码加盟我们吧!',
+									css: {
+										position: 'absolute',
+										bottom: '25rpx',
+										left: '130rpx',
+										width: '750rpx',
+										fontSize: '26rpx',
+										color: '#999999',
+									}
+								}
+							],
+						},
+						{
+							type: 'image',
+							src: qr_code,
+							css: {
+								position: 'absolute',
+								width: '290rpx',
+								height: '290rpx',
+								bottom: '366rpx',
+								left: '210rpx',
+								background: '#ffffff',
+								borderRadius: qr_radius
+							}
+						},
+
+					]
+				}
+				// 渲染
+				this.$refs.painter.render(poster);
+				// 生成图片
+				this.$refs.painter.canvasToTempFilePathSync({
+					fileType: "jpg",
+					quality: 1,
+					success: (res) => {
+						that.$util.hideAll()
+						this.src = res.tempFilePath
+					},
+				});
+
+			},
+			previewImage() {
+				let finalPath = this.src;
+				uni.previewImage({
+					current: finalPath,
+					urls: [finalPath]
+				})
+			},
+			async saveImage() {
+				await this.$util.checkAuth({
+					type: "writePhotosAlbum"
+				});
+				let filePath = this.src;
+				let [err, success] = await uni.saveImageToPhotosAlbum({
+					filePath
+				})
+				if (err) return;
+				uni.showToast({
+					icon: 'none',
+					title: '保存成功'
+				})
+			},
+			toPreviewSave() {
+				// #ifdef H5
+				this.previewImage()
+				// #endif
+				// #ifndef H5
+				this.saveImage()
+				// #endif
+			}
+		}
+	}
+</script>
+
+<style>
+	.code-img {
+		width: 710rpx;
+		height: 1278rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/user/pages/distribution/income.vue b/user/pages/distribution/income.vue
new file mode 100644
index 0000000..aa51810
--- /dev/null
+++ b/user/pages/distribution/income.vue
@@ -0,0 +1,349 @@
+<template>
+	<view class="user-distribution-income rel" v-if="isLoad">
+		<view class="bg abs" :style="{background: `linear-gradient(180deg, ${primaryColor} 0%, ${subColor} 100%)`}"></view>
+		<view class="flex-center pd-lg rel">
+			<image mode="aspectFill" class="avatar radius"
+				:src="detail.avatarUrl || `https://lbqny.migugu.com/admin/anmo/mine/default_user.png`">
+			</image>
+			<view class="flex-1 ml-lg f-md-title c-base ellipsis">{{detail.nickName}}</view>
+		</view>
+
+		<view class="mine-menu-list fill-base radius-16 rel" style="margin-top: 0;">
+			<view @tap.stop="$refs.show_rule_item.open()" class="abs close-info flex-center">
+				<i class="iconfont iconwentifankui1" :style="{color:primaryColor}"></i>
+			</view>
+			<view class="flex-warp pt-md">
+				<view class="item-child flex-center flex-column"
+					:class="[{'b-1px-b':index<2},{'b-1px-r':index>1&&index<4}]"
+					:style="{width:index<2?'50%':'33.33%',padding:index<2?'20rpx 0 30rpx 0':'10rpx 0'}"
+					v-for="(item, index) in countList" :key="index">
+					<view class="f-sm-title c-title text-bold">{{detail[item.key]}}</view>
+					<view class="f-icontext c-caption">{{ item.text }}</view>
+				</view>
+			</view>
+			<view class="flex-center pt-md" style="padding-bottom: 35rpx;">
+				<view @tap.stop="$util.goUrl({url:`/user/pages/cash-out?type=distribution`})"
+					class="cash-btn flex-center f-mini-title c-base radius" :style="{background: `linear-gradient(68deg, ${primaryColor}, ${subColor})`}">
+					我要提现
+				</view>
+			</view>
+		</view>
+
+		<view class="mine-menu-list fill-base mt-md radius-16">
+			<view class="flex-warp pt-md">
+				<view @tap.stop="toJump('toolList', index)" class="item-child flex-center flex-column f-caption c-title"
+					style="margin:10rpx 0 20rpx 0" v-for="(item, index) in toolList" :key="index">
+					<i class="iconfont c-title" :class="item.icon" :style="{color:primaryColor}"></i>
+					<view class="mt-sm">{{ item.text }}</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="mine-menu-list fill-base mt-md radius-16">
+			<view class="flex-warp pt-md">
+				<view class="item-child f-caption c-title" style="width:50%;margin:10rpx 0 20rpx 0"
+					:style="{paddingLeft:index%2==0?'70rpx':'120rpx'}" v-for="(item, index) in dataList" :key="index">
+					<view class="f-icontext" style="color: #777D8D;">{{ item.text }}</view>
+					<view class="f-sm-title c-title text-bold">{{detail[item.key]}}</view>
+				</view>
+			</view>
+		</view>
+		<view @tap.stop="$util.goUrl({url:`/user/pages/distribution/bind-technician?type=1`})"
+			class="mine-menu-list fill-base mt-md radius-16" style="
+background: linear-gradient(90deg, #FFE9E9 0%, #FFFFFF 100%);">
+			<view class="flex-center pd-lg">
+				<image mode="aspectFill" class="avatar radius"
+					src="https://lbqny.migugu.com/admin/anmo/mine/income.png">
+				</image>
+				<view class="flex-1 flex-between ml-lg">
+					<view>
+						<view class="f-mini-title c-title text-bold">推荐收入</view>
+						<view class="f-caption" style="color: #777D8D;">
+							推荐{{$t('action.attendantName')}}享佣金
+						</view>
+					</view>
+					<view class="share-btn flex-center f-desc c-base radius">前往邀请</view>
+				</view>
+			</view>
+		</view>
+		<view @tap.stop="$util.goUrl({url:`/user/pages/distribution/poster`})"
+			class="mine-menu-list fill-base mt-md radius-16" style="
+background: linear-gradient(90deg, #FFE9E9 0%, #FFFFFF 100%);">
+			<view class="flex-center pd-lg">
+				<image mode="aspectFill" class="avatar radius"
+					src="https://lbqny.migugu.com/admin/anmo/mine/income.png">
+				</image>
+				<view class="flex-1 flex-between ml-lg">
+					<view>
+						<view class="f-mini-title c-title text-bold">推荐收入</view>
+						<view class="f-caption" style="color: #777D8D;">
+							推荐新用户享佣金
+						</view>
+					</view>
+					<view class="share-btn flex-center f-desc c-base radius">前往邀请</view>
+				</view>
+			</view>
+		</view>
+		<view class="space-footer"></view>
+
+
+		<uni-popup ref="show_rule_item" type="center" :maskClick="false">
+			<view class="common-popup-content fill-base pd-lg radius-34">
+				<view class="title">规则说明</view>
+				<view class="f-desc c-title mt-lg">
+					可提现金额为已完成订单后的结算金额；未入账金额为未完成的订单，待提现佣金
+				</view>
+				<view class="button">
+					<view @tap.stop="$refs.show_rule_item.close()" class="item-child c-base"
+						:style="{background: primaryColor,color:'#fff'}">知道了</view>
+				</view>
+			</view>
+		</uni-popup>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	import tabbar from "@/components/tabbar.vue"
+	export default {
+		components: {
+			tabbar
+		},
+		data() {
+			return {
+				countList: [{
+					key: 'new_cash',
+					text: '可提现(元)'
+				}, {
+					key: 'not_recorded',
+					text: '未入账(元)'
+				}, {
+					key: 'cash',
+					text: '累计佣金(元)'
+				}, {
+					key: 'wallet_cash',
+					text: '已提现(元)'
+				}, {
+					key: 'order_cash',
+					text: '总成交金额(元)'
+				}],
+				toolList: [{
+					icon: 'iconyongjinliushui',
+					text: '佣金流水',
+					url: '/user/pages/stored/commission'
+				}, {
+					icon: 'iconwodeyaoqing',
+					text: '我的邀请',
+					url: '/user/pages/distribution/team'
+				}, {
+					icon: 'icontixianjilu',
+					text: '提现记录',
+					url: '/user/pages/distribution/record?type=1'
+				}],
+				dataList: [{
+					key: 'today_order_count',
+					text: '今日成交订单'
+				}, {
+					key: 'total_order_count',
+					text: '累计成交订单'
+				}, {
+					key: 'today_coach_count',
+					text: '今日新增' + this.$t('action.attendantName')
+				}, {
+					key: 'total_coach_count',
+					text: '累计入驻' + this.$t('action.attendantName')
+				}, {
+					key: 'today_user_count',
+					text: '今日邀请粉丝'
+				}, {
+					key: 'total_user_count',
+					text: '累计邀请粉丝'
+				}],
+				detail: {},
+				isLoad: false
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			commonOptions: state => state.user.commonOptions,
+			userInfo: state => state.user.userInfo,
+			mineInfo: state => state.user.mineInfo,
+		}),
+		onLoad() {
+			this.initIndex()
+		},
+		onUnload() {
+			this.$util.back()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		methods: {
+			...mapMutations([]),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				this.$util.showLoading()
+				this.detail = await this.$api.mine.partnerIndex()
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				this.isLoad = true
+				this.$util.hideAll()
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			toJump(key, index) {
+				let {
+					url,
+					text
+				} = this[key][index]
+				this.$util.log(url)
+				this.$util.toCheckLogin({
+					url
+				})
+			},
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.user-distribution-income {
+		.bg {
+			width: 100%;
+			height: 388rpx;
+		}
+
+		.mine-list {
+			.money-info {
+				font-size: 50rpx;
+
+				.money {
+					font-size: 70rpx;
+				}
+			}
+
+			.cash-out-btn {
+				width: 169rpx;
+				height: 56rpx;
+				margin: 0 auto;
+			}
+
+			.menu-title {
+				height: 90rpx;
+
+				.iconfont {
+					font-size: 24rpx;
+				}
+			}
+
+			.item-child {
+				width: 25%;
+				margin: 10rpx 0;
+
+				.iconfont {
+					font-size: 46rpx;
+				}
+			}
+
+
+		}
+
+
+		.money-count {
+			.item-child {
+				width: 50%;
+			}
+		}
+
+		// 我的订单/其他
+		.mine-menu-list {
+			margin: 20rpx 25rpx 0 25rpx;
+
+			.close-info {
+				width: 80rpx;
+				height: 80rpx;
+				top: 0;
+				right: 0;
+				z-index: 1;
+
+				.iconwentifankui1 {
+					font-size: 32rpx;
+				}
+			}
+
+			.cash-btn {
+				width: 580rpx;
+				height: 70rpx;
+			}
+
+			.avatar {
+				width: 105rpx;
+				height: 105rpx;
+			}
+
+			.share-btn {
+				width: 154rpx;
+				height: 56rpx;
+				background: #FF6124;
+			}
+
+			.item-child {
+				width: 33.33%;
+				margin: 10rpx 0;
+
+				.iconfont {
+					font-size: 86rpx;
+				}
+
+				.item-img {
+					width: 88rpx;
+					height: 88rpx;
+
+					.iconfont {
+						font-size: 44rpx;
+					}
+
+					.item-img {
+						top: 0;
+						left: 0;
+						opacity: 0.1;
+					}
+				}
+			}
+
+			.item-child:nth-child(1).b-1px-b::after {
+				left: 33rpx;
+			}
+
+			.item-child:nth-child(2).b-1px-b::after {
+				right: 33rpx;
+			}
+
+			.item-child.b-1px-r::after {
+				top: 38rpx;
+				bottom: 38rpx;
+			}
+		}
+
+
+	}
+</style>
\ No newline at end of file
diff --git a/user/pages/distribution/poster.vue b/user/pages/distribution/poster.vue
new file mode 100644
index 0000000..a0c14f4
--- /dev/null
+++ b/user/pages/distribution/poster.vue
@@ -0,0 +1,191 @@
+<template>
+	<view class="pt-md" style="background-color: #F4F6F7">
+		<view class="hideCanvasView">
+			<l-painter class="hideCanvas" ref="painter" useCORS />
+		</view>
+		<view class="ml-md" v-if="src">
+			<image :src="src" class="code-img radius-16" @tap="previewImage"></image>
+			<view class="info_text fill-base flex-column mt-sm radius-16">
+				<view class="f-paragraph mt-sm mb-md" style="color:#2F2F2F">
+					邀请3步
+				</view>
+				<view class="flex-between f-paragraph" style="color:#767676">
+					<view class="flex-y-center">
+						1.分享海报
+					</view>
+					<image mode="aspectFill" class="info_text_img"
+						src="https://lbqny.migugu.com/admin/anmo/coupon/btn.png"></image>
+					<view class="flex-y-center">
+						2.微信扫码
+					</view>
+					<image mode="aspectFill" class="info_text_img"
+						src="https://lbqny.migugu.com/admin/anmo/coupon/btn.png"></image>
+					<view class="flex-y-center">
+						3.注册登录
+					</view>
+				</view>
+			</view>
+			<view class="space-max-footer"></view>
+			<fix-bottom-button @confirm="toPreviewSave" :text="[{text: confirmText,type:'confirm'}]" bgColor="#fff"
+				:classType="2">
+			</fix-bottom-button>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions
+	} from 'vuex';
+	export default {
+		components: {},
+		props: {
+
+		},
+		data() {
+			return {
+				// #ifdef H5
+				confirmText: '长按上图保存图片',
+				// #endif
+				// #ifndef H5
+				confirmText: '保存图片至相册',
+				// #endif
+				src: ''
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		async onLoad(options) {
+			// #ifdef H5
+			if (this.$jweixin.isWechat()) {
+				await this.$jweixin.initJssdk();
+				this.$jweixin.wxReady(() => {
+					this.$jweixin.hideOptionMenu()
+				})
+			}
+			// #endif
+			this.$util.showLoading()
+			await this.getConfigInfo()
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+			let that = this
+			setTimeout(() => {
+				that.canvase()
+			}, 1000)
+		},
+		methods: {
+			...mapActions(['getConfigInfo']),
+			async canvase() {
+				let that = this
+				let qr_code = await this.$api.mine.userCommQr({admin_id:that.userInfo.id})
+				let {
+					promotion_poster_img = ''
+				} = this.configInfo
+				let cover = promotion_poster_img || 'https://lbqny.migugu.com/admin/anmo/mine/fx-share.png'
+				let qr_radius = '0rpx'
+				// #ifdef MP-WEIXIN
+				qr_radius = '145rpx'
+				// #endif
+				
+				console.log('-------',qr_code)
+				console.log('-------',cover)
+
+				let poster = {
+					css: {
+						width: '710rpx',
+						height: '1152rpx',
+					},
+					views: [{
+							type: 'image',
+							src: cover,
+							css: {
+								width: '710rpx',
+								height: '1152rpx',
+								objectFit: "cover",
+								top: '0rpx',
+								left: '0rpx',
+								position: 'absolute'
+							}
+						},
+						{
+							type: 'image',
+							src: qr_code,
+							css: {
+								position: 'absolute',
+								width: '290rpx',
+								height: '290rpx',
+								bottom: '70rpx',
+								left: '210rpx',
+								background: '#ffffff',
+								borderRadius: qr_radius
+							}
+						}
+					]
+				}
+				// 渲染
+				this.$refs.painter.render(poster);
+				// 生成图片
+				this.$refs.painter.canvasToTempFilePathSync({
+					fileType: "jpg",
+					quality: 1,
+					success: (res) => {
+						that.$util.hideAll()
+						this.src = res.tempFilePath
+					},
+				});
+			},
+			previewImage() {
+				let finalPath = this.src;
+				uni.previewImage({
+					current: finalPath,
+					urls: [finalPath]
+				})
+			},
+			async saveImage() {
+				await this.$util.checkAuth({
+					type: "writePhotosAlbum"
+				});
+				let filePath = this.src;
+				let [err, success] = await uni.saveImageToPhotosAlbum({
+					filePath
+				})
+				if (err) return;
+				uni.showToast({
+					icon: 'none',
+					title: '保存成功'
+				})
+			},
+			toPreviewSave() {
+				// #ifdef H5
+				this.previewImage()
+				// #endif
+				// #ifndef H5
+				this.saveImage()
+				// #endif
+			}
+		}
+	}
+</script>
+
+<style>
+	.info_text {
+		width: 710rpx;
+		padding: 20rpx 40rpx;
+		box-sizing: border-box;
+	}
+
+	.info_text_img {
+		width: 20rpx;
+		height: 20rpx;
+	}
+
+	.code-img {
+		width: 710rpx;
+		height: 1152rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/user/pages/distribution/record.vue b/user/pages/distribution/record.vue
new file mode 100644
index 0000000..ba08aed
--- /dev/null
+++ b/user/pages/distribution/record.vue
@@ -0,0 +1,242 @@
+<template>
+	<view class="master-income-record" v-if="isLoad">
+		<view class="mine-menu-list c-base" :style="{background:primaryColor}">
+			<view class="space-lg"></view>
+			<view class="space-lg"></view>
+			<view class="flex-center f-caption mt-sm mb-sm">已累计提现金额(元)</view>
+			<view class="money-info flex-center flex-y-baseline">¥<view class="money">{{list.extract_total_price}}
+				</view>
+			</view>
+			<view class="space-md"></view>
+			<view class="space-lg"></view>
+		</view>
+		<view class="fill-base">
+			<tab @change="handerTabChange" :list="tabList" :activeIndex="activeIndex*1" :activeColor="primaryColor"
+				width="25%" height="100rpx"></tab>
+			<view class="ml-lg mr-lg b-1px-b"></view>
+
+			<view class="list-item pd-lg" :class="[{'b-1px-t':index!=0}]" v-for="(item,index) in  list.data"
+				:key="index">
+				<view class="flex-warp">
+					<view class="item-tag mt-sm mr-md radius"
+						:style="{background: item.status == 1 ? primaryColor : item.status==2? subColor :'#999'}">
+					</view>
+					<view class="flex-1">
+						<view class="flex-between">
+							<view class="flex-y-center">
+								<view class="f-title c-title text-bold">{{statusType[item.status]}}</view>
+							</view>
+							<view class="f-caption c-caption">{{item.create_time}}</view>
+						</view>
+						<view class="flex-between mt-sm">
+							<view class="f-caption c-caption">
+								<view>申请提现金额: ¥{{item.total_price}}</view>
+								<view class="flex-y-center">手续费扣除: {{item.tax_point}}%<view class="ml-md">
+										扣费: ¥{{item.service_price}}</view>
+								</view>
+							</view>
+							<view class="f-md-title">{{item.status == 2?'+':'-'}}{{item.apply_price}}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+
+		<view class="space-footer"></view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		data() {
+			return {
+				options: {},
+				isLoad: false,
+				activeIndex: 0,
+				tabList: [{
+					title: '全部',
+					id: 0
+				}, {
+					title: '未到账',
+					id: 1,
+				}, {
+					title: '已到账',
+					id: 2
+				}, {
+					title: '已拒绝',
+					id: 3
+				}],
+				statusType: {
+					1: '未到账',
+					2: '已到账',
+					3: '已拒绝',
+				},
+				param: {
+					page: 1,
+					status: 0
+				},
+				list: {
+					data: []
+				},
+				loading: true,
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+		}),
+		async onLoad(options) {
+			let {
+				type
+			} = options
+			this.options = options
+			let titleArr = ['', '', '服务费', '车费', '渠道商', '代理商', '业务员']
+			uni.setNavigationBarTitle({
+				title: titleArr[type * 1] + '提现记录'
+			})
+			this.$util.showLoading()
+			await this.initIndex()
+			this.isLoad = true
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			...mapMutations([]),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				await this.getList()
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			async getList() {
+				let {
+					list: oldList,
+					param,
+					activeIndex,
+					tabList
+				} = this
+				let status = tabList[activeIndex].id
+				param.status = status
+				let methodArr = {
+					1: {
+						methodKey: 'mine',
+						methodModel: 'walletList'
+					},
+					2: {
+						methodKey: 'technician',
+						methodModel: 'capCashList',
+						type: 1 // 服务费
+					},
+					3: {
+						methodKey: 'technician',
+						methodModel: 'capCashList',
+						type: 2 // 车费
+					},
+					4: {
+						methodKey: 'channel',
+						methodModel: 'walletList'
+					},
+					5: {
+						methodKey: 'agent',
+						methodModel: 'walletList'
+					},
+					6: {
+						methodKey: 'salesman',
+						methodModel: 'walletList'
+					}
+				}
+				let {
+					type: opType
+				} = this.options
+				let {
+					methodKey,
+					methodModel,
+					type = 0
+				} = methodArr[opType]
+				if (type) {
+					param.type = type
+				}
+				let newList = await this.$api[methodKey][methodModel](param);
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+			},
+			handerTabChange(index) {
+				this.activeIndex = index;
+				this.$util.showLoading()
+				this.param.page = 1;
+				this.getList()
+			},
+			toCopy(index) {
+				let {
+					order_code: url
+				} = this.list.data[index]
+				this.$util.goUrl({
+					url,
+					openType: 'copy'
+				})
+			},
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.master-income-record {
+
+		.mine-menu-list {
+
+			.money-info {
+				font-size: 50rpx;
+
+				.money {
+					font-size: 70rpx;
+				}
+			}
+
+		}
+
+		.list-item {
+			.item-tag {
+				width: 24rpx;
+				height: 24rpx;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/user/pages/distribution/share-set.vue b/user/pages/distribution/share-set.vue
new file mode 100644
index 0000000..36d7658
--- /dev/null
+++ b/user/pages/distribution/share-set.vue
@@ -0,0 +1,108 @@
+<template>
+	<view>
+		<view class="pd-lg">
+			<view class="flex-between pb-lg b-1px-b">
+				<view class="flex-y-center">
+					<i class="iconfont iconanmo3" :style="{color:primaryColor}"></i>
+					<view class="f-mini-title c-title ml-sm">为谁拉{{$t('action.attendantName')}}</view>
+				</view>
+				<view @tap.stop="$util.goUrl({url:`/user/pages/distribution/agent`})" class="flex-y-center">
+					<view class="f-mini-title max-300"
+						:class="[{'c-title text-bold':check_admin.id},{'c-caption':!check_admin.id}]">
+						{{check_admin.id ? check_admin.agent_name : '选择代理商'}}
+					</view>
+					<i class="iconfont icon-right ml-sm"></i>
+				</view>
+			</view>
+			<view class="flex-y-center pt-lg pb-lg">
+				<i class="iconfont iconjingjirenshuoming" :style="{color:primaryColor}"></i>
+				<view class="f-mini-title c-title text-bold ml-sm">{{$t('action.attendantName')}}经纪人说明</view>
+			</view>
+			<view class="f-paragraph" style="color:#4A4A4A">
+				{{$t('action.attendantName')}}经纪人申请和审核由平台处理，经纪人邀请{{$t('action.attendantName')}}不限制地区，经纪人邀请{{$t('action.attendantName')}}时，可以选择为某个代理商邀请{{$t('action.attendantName')}}，邀请成功之后，该{{$t('action.attendantName')}}产生了订单，经纪人可获得分佣，分佣由代理商提成部分扣除，例如后台设置经纪人获得5%分佣，某A{{$t('action.attendantName')}}成单后，应该由A{{$t('action.attendantName')}}以及A{{$t('action.attendantName')}}绑定的上级代理商/平台承担分销费用，则该经纪人可获得佣金=订单实际金额*5%
+			</view>
+		</view>
+
+		<view class="space-footer"></view>
+		<fix-bottom-button @cancel="toConfirm(1)" @confirm="toConfirm"
+			:text="[{text:'为平台邀请',type:'cancel'},{text:'为代理商邀请',type:'confirm'}]" bgColor="#fff">
+		</fix-bottom-button>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		data() {
+			return {
+				isLoad: false,
+				check_admin: {
+					id: 0
+				}
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad() {
+			// let {
+			// 	check_admin
+			// } = this.$util.getPage(-1)
+			// this.check_admin = check_admin
+			this.initIndex()
+		},
+		methods: {
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+			},
+			toConfirm(type = 0) {
+				let {
+					id = 0,
+				} = this.check_admin
+				if (type == 0 && !id) {
+					this.$util.showToast({
+						title: `请选择代理商`
+					})
+					return
+				}
+				this.$util.getPage(-1).check_admin = type == 1 ? {
+					id: 0,
+					agent_name: '平台'
+				} : this.check_admin
+				this.$util.back()
+				this.$util.goUrl({
+					url: 1,
+					openType: `navigateBack`
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background: #fff;
+	}
+
+	.icon-right {
+		color: #5A677E;
+		font-size: 22rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/user/pages/distribution/team.vue b/user/pages/distribution/team.vue
new file mode 100644
index 0000000..6072788
--- /dev/null
+++ b/user/pages/distribution/team.vue
@@ -0,0 +1,164 @@
+<template>
+	<view class="user-distribution-team">
+
+		<fixed>
+			<tab @change="handerTabChange" :list="tabList" :activeIndex="activeIndex*1" :activeColor="primaryColor"
+				width="50%" height="100rpx" color="#999999"></tab>
+		</fixed>
+		<view class="list-item flex-center fill-base mt-md ml-md mr-md pd-lg radius-16"
+			v-for="(item,index) in list.data" :key="index">
+			<image mode="aspectFill" class="avatar radius" :src="activeIndex==0 ?item.work_img:item.avatarUrl"></image>
+			<view class="flex-1 ml-md">
+				<block v-if="activeIndex==0">
+					<view class="f-title c-black text-bold ellipsis">
+						{{item.coach_name}}
+					</view>
+					<view class="flex-between">
+						<view class="text flex-y-center f-desc">已接单<view class="ml-sm" :style="{color:primaryColor}">
+								{{item.order_count}}
+							</view>
+						</view>
+						<view class="flex-y-baseline f-desc c-black">
+							{{item.city}}
+						</view>
+					</view>
+					<view class="f-desc c-caption mt-md">所属代理商：{{item.admin_name || '-'}}</view>
+				</block>
+				<view class="f-title c-black text-bold max-500 ellipsis" v-if="activeIndex==1">
+					{{item.nickName}}
+				</view>
+			</view>
+
+		</view>
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+		<view class="space-footer"></view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		data() {
+			return {
+				options: {},
+				tabList: [{
+					id: 1,
+					title: '邀请的' + this.$t('action.attendantName'),
+					methodModel: 'partnerCoachList'
+				}, {
+					id: 2,
+					title: '邀请的用户',
+					methodModel: 'myTeam'
+				}],
+				activeIndex: 0,
+				param: {
+					page: 1,
+				},
+				list: {
+					data: []
+				},
+				loading: true,
+				lockTap: false
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad(options) {
+			this.options = options
+			this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			...mapMutations(['']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				await this.getList()
+			},
+			initRefresh() {
+				this.param.page = 1;
+				this.initIndex(true)
+			},
+			handerTabChange(index) {
+				this.activeIndex = index
+				this.param.status = index
+				this.list.data = []
+				this.getList();
+			},
+			async getList() {
+				let {
+					list: oldList,
+					param,
+					tabList,
+					activeIndex
+				} = this
+				let {
+					methodModel,
+				} = tabList[activeIndex]
+				let newList = await this.$api.mine[methodModel](param)
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.user-distribution-team {
+
+		.list-item {
+			.avatar {
+				width: 124rpx;
+				height: 124rpx;
+			}
+
+			.text {
+				color: #4D4D4D;
+				margin-top: 6rpx;
+			}
+
+			.remove-btn {
+				width: 146rpx;
+				height: 56rpx;
+				transform: rotateZ(360deg);
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/user/pages/feedback/box.vue b/user/pages/feedback/box.vue
new file mode 100644
index 0000000..e65f283
--- /dev/null
+++ b/user/pages/feedback/box.vue
@@ -0,0 +1,209 @@
+<template>
+	<view class="box">
+		<view class="pl-lg pr-lg pb-lg fill-base">
+			<view class="box-item">
+				<view class="box-item-title f-paragraph pb-md text-bold flex">
+					<text class="c-warning f-sm-title">*</text>
+					<text>反馈类型</text>
+				</view>
+				<view class="radius-16 flex-warp">
+					<block v-for="(item,index) in navList" :key="index">
+						<view class="nav-item text-center f-desc c-paragraph mb-md fill-body" @tap="getNavIndex(index)"
+							:class="(index % 3 > 0)&& 'ml-md'"
+							:style="{backgroundColor: index == navIndex ? primaryColor : '' , color:index == navIndex ? '#fff' : ''}">
+							{{item.title}}
+						</view>
+					</block>
+				</view>
+			</view>
+			<view class="box-item">
+				<view class="box-item-title">
+					<view class="text-bold f-paragraph">订单编号</view>
+					<view class="c-caption f-caption pt-md pb-lg">若涉及订单, 填入订单号有助解决问题(订单详情页可复制)</view>
+				</view>
+				<view class="pr-lg pl-lg fill-body radius-16 f-paragraph flex-between box-item-cont">
+					<input type="number" placeholder="请输入订单号" @input="getInput" v-model="param.order_code" />
+				</view>
+			</view>
+			<view class="box-item pt-md">
+				<view class="box-item-title f-paragraph pb-sm text-bold flex">
+					<text class="c-warning f-sm-title">*</text>
+					<text>反馈内容</text>
+				</view>
+				<view class="pd-lg radius-16 fill-body" style="overflow: hidden;">
+					<textarea style="width: 100%;" class="c-paragraph" cols="30" rows="10"
+						placeholder="您宝贵的建议，是我们不断进步的动力！请详细描述遇到的问题" :value="param.content" maxlength="1000"
+						@input="bindInput"></textarea>
+					<view class="pt-md text-right c-5A677E f-paragraph">
+						{{param.content.length > 1000 ? 1000 : param.content.length}} / 1000
+					</view>
+				</view>
+			</view>
+			<view class="box-item mt-md">
+				<upload @upload="imgUpload" :imagelist="param.images" imgtype="images" @del="imgUpload" text="上传图片"
+					:imgsize="3"></upload>
+			</view>
+			<view class="box-item mt-md">
+				<upload @upload="imgUpload" @del="imgUpload" :imagelist="param.video_url" filetype="video"
+					imgtype="video_url" text="上传视频" :imgsize="1" :videoSize="30">
+				</upload>
+			</view>
+			<view class="f-desc c-caption pb-sm">*最多只能上传3张图片、1个视频（视频只支持30兆以内）</view>
+		</view>
+		<view class="f-caption c-warning pd-lg">注: 您反馈的意见问题，平台不会透露给他人，保护您的隐私</view>
+		<view class="space-max-footer"></view>
+
+		<fix-bottom-button @cancel="$util.goUrl({url:`/user/pages/feedback/list`})" @confirm="confirm"
+			:text="[{text:'反馈记录',type:'cancel'},{text:'提交反馈',type:'confirm',isAuth:true}]" bgColor="#fff"
+			:classType="2">
+		</fix-bottom-button>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		data() {
+			return {
+				param: {
+					content: '',
+					type_name: '', //反馈类型
+					order_code: '', //订单号
+					images: [],
+					video_url: []
+				},
+				navList: [{
+						title: '订单问题'
+					},
+					{
+						title: '功能问题'
+					},
+					{
+						title: '账号问题'
+					},
+					{
+						title: '操作问题'
+					},
+					{
+						title: 'BUG反馈'
+					},
+					{
+						title: '其他'
+					},
+				],
+				navIndex: -1
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad() {
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+			this.initIndex()
+		},
+		methods: {
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+			},
+			bindInput(e) {
+				this.$nextTick(function() {
+					this.param.content = e.detail.value;
+				})
+			},
+			imgUpload(e) {
+				let {
+					imagelist,
+					imgtype
+				} = e;
+				this.param[imgtype] = imagelist;
+			},
+			confirm() {
+				let {
+					content,
+					images,
+					video_url
+				} = this.param
+				let param = this.$util.deepCopy(this.param)
+				param.type_name = this.navIndex >= 0 && this.navList[this.navIndex].title
+				if (images.length) {
+					param.images = images.map(item => {
+						return item.path
+					})
+				}
+				if (video_url.length) {
+					param.video_url = video_url[0].path
+				}
+				if (!param.type_name) {
+					return this.$util.showToast({
+						title: '请选择反馈类型'
+					})
+				}
+				if (!content.trim()) {
+					return this.$util.showToast({
+						title: '请输入反馈内容'
+					})
+				}
+				this.$util.showLoading()
+				this.$api.mine.addFeedback(param).then(res => {
+					this.$util.hideAll()
+					this.$util.goUrl({
+						url: `/user/pages/feedback/success`,
+						openType: 'redirectTo'
+					})
+				})
+			},
+			getNavIndex(index) {
+				this.navIndex = index
+			},
+			getInput(e) {
+				this.$nextTick(function() {
+					this.param.order_code = e.detail.value.replace(/\D/g, '')
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.box-item {
+		.box-item-title {
+			padding-top: 40rpx;
+		}
+
+		.box-item-cont {
+			height: 110rpx;
+
+			input {
+				width: 100%;
+				height: 100%;
+			}
+		}
+
+		.c-5A677E {
+			color: #5A677E;
+		}
+
+		.nav-item {
+			width: calc((100% - 40rpx) / 3);
+			height: 68rpx;
+			line-height: 68rpx;
+			border-radius: 68rpx;
+		}
+	}
+</style>
diff --git a/user/pages/feedback/detail.vue b/user/pages/feedback/detail.vue
new file mode 100644
index 0000000..557317a
--- /dev/null
+++ b/user/pages/feedback/detail.vue
@@ -0,0 +1,120 @@
+<template>
+	<view class="box">
+		<view class="pl-lg pr-lg pb-lg fill-base">
+			<view class="box-item">
+				<view class="box-item-title f-paragraph pb-md text-bold flex">反馈类型</view>
+				<view class="radius-10 rel box-item-cont text-center">
+					<view class="box-item-bg" :style="{backgroundColor:primaryColor }"></view>
+					<text class="abs f-caption box-item-cont-text" :style="{color:primaryColor}">{{feedInfo.type_name}}</text>
+				</view>
+			</view>
+			<view class="box-item pt-md">
+				<view class="box-item-title f-paragraph pb-md text-bold flex">订单编号</view>
+				<view class="c-paragraph f-mini-title">{{feedInfo.order_code || '无'}}</view>
+			</view>
+			<view class="box-item pt-md">
+				<view class="box-item-title f-paragraph pb-md text-bold flex">反馈内容</view>
+				<view class="c-paragraph box-item-content f-paragraph fill-body pd-lg radius-16" >{{feedInfo.content || '无'}}</view>
+			</view>
+			<view class="box-item pt-md flex" v-if="feedInfo.images&&feedInfo.images.length">
+				<bolck v-for="(item,index) in feedInfo.images" :key="index">
+					<image @tap="$util.previewImage({current:item ,urls:feedInfo.images})" :src="item" mode="aspectFill" class="item-image radius-16" :class="index > 0 && 'ml-md'"></image>
+				</bolck>
+			</view>
+			<view class="box-item pt-md flex" v-if="feedInfo.video_url">
+				<video :src="feedInfo.video_url" class="item-image radius-16"></video>
+			</view>
+			<view class="c-caption f-caption pt-md">注: 您反馈的意见问题，平台不会透露给他人，保护您的隐私</view>
+			<view class="box-item pt-md" v-if="feedInfo.status == 2">
+				<view class="box-item-title f-paragraph pb-md text-bold flex">平台回复</view>
+				<view class="c-paragraph f-paragraph fill-body pd-lg radius-16" style="white-space: pre-wrap">{{feedInfo.reply_content || '无'}}</view>
+			</view>
+		</view>
+		<view class="space-footer"></view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		data() {
+			return {
+				options: {},
+				feedInfo:{}
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad(options) {
+			this.options = options
+			this.initIndex()
+		},
+		methods: {
+			async initIndex(refresh = false){
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				this.$util.showLoading()
+				let { id } = this.options
+				this.feedInfo = await this.$api.mine.feedbackInfo({id})
+				this.$util.hideAll()
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page{
+		background-color: #fff;
+	}
+	.box-item {
+		.box-item-title {
+			padding-top: 40rpx;
+		}
+		.c-5A677E {
+			color: #5A677E;
+		}
+		.box-item-cont{
+			line-height: 47rpx;
+			height: 47rpx;
+			width: 146rpx;
+			overflow: hidden;
+			.box-item-bg{
+				width: 146rpx;
+				height: 47rpx;
+				opacity: 0.1;
+			}
+			.box-item-cont-text{
+				left: 0;
+				line-height: 47rpx;
+				top: 0;
+				width: 100%;
+			}
+		}
+		.item-image{
+			width: 216rpx;
+			height: 216rpx;
+		}
+		.box-item-content{
+			white-space: pre-wrap;
+			max-height: 400rpx;
+			overflow-y: scroll;
+		}
+	}
+</style>
diff --git a/user/pages/feedback/list.vue b/user/pages/feedback/list.vue
new file mode 100644
index 0000000..a9d3dcf
--- /dev/null
+++ b/user/pages/feedback/list.vue
@@ -0,0 +1,178 @@
+<template>
+	<view>
+		<fixed>
+			<tab @change="handerTabChange" :isLine="true" :list="tabList" :activeIndex="activeIndex*1" color="#9D9D9D"
+				:activeColor="primaryColor" :width="100/tabList.length + '%'" height="100rpx" :numberType="2"></tab>
+		</fixed>
+		<view class="pd-md">
+			<view class="pl-lg pr-lg pb-lg fill-base radius-16 mb-md rel item-box" v-for="(item,index) in list.data" :key="index">
+				<view class="abs type-name text-center flex-center">
+					<view :style="{backgroundColor:primaryColor}" class="taye-name-bg"></view>
+					<text class="c-base f-caption" style="z-index: 9;" :style="{color:primaryColor}">{{item.type_name}}</text>
+				</view>
+				<view class="item-nav flex-between ">
+					<text class="f-paragraph text-bold">订单号 {{item.order_code || '无'}}</text>
+					<text :style="{color:primaryColor}" v-if="item.status == 1">未处理</text>
+					<text class="c-caption" v-else>已处理</text>
+				</view>
+				<view class="item-cont radius-16 pd-lg">
+					<view class="f-paragraph text-bold pb-md">反馈内容</view>
+					<view class="c-paragraph ellipsis-2" style="white-space: pre-wrap;">{{item.content}}</view>
+				</view>
+				<view class="flex pt-lg" style="justify-content:flex-end;" 
+				@tap="$util.goUrl({url:`/user/pages/feedback/detail?id=${item.id}`})">
+					<view class="reply f-desc c-base text-center" :style="{backgroundColor:primaryColor}">查看详情</view>
+				</view>
+			</view>
+		</view>
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+		<view class="space-footer"></view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		data() {
+			return {
+				tabList: [{
+					title: '全部反馈',
+					sort: 'top desc',
+					sign: 1,
+				}, {
+					title: '未处理',
+					sort: 'price',
+					sign: 0,
+					number: 0,
+				}, {
+					title: '已处理',
+					sort: 'total_sale',
+					sign: 0,
+				}],
+				activeIndex: 0,
+				loading: true,
+				isLoad: false,
+				param: {
+					page: 1,
+					limit: 10,
+					status: 0
+				},
+				list: {
+					data: []
+				}
+
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad() {
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+			this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			handerTabChange(index) {
+				this.activeIndex = index
+				this.param.status = index
+				this.initIndex();
+			},
+
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			async initIndex(refresh = false){
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				
+				this.getList()
+			},
+			async getList() {
+				this.$util.showLoading()
+				let {
+					list: oldList,
+					param
+				} = this
+				let newList = await this.$api.mine.listFeedback(param)
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.tabList[1].number = newList.wait
+				this.isLoad = true
+				this.loading = false
+				this.$util.hideAll()
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss">
+	.item-nav {
+		height: 96rpx;
+	}
+	.item-box{
+		padding-top: 80rpx;
+	}
+	.item-cont {
+		background-color: #F7F8FA;
+		min-height: 218rpx;
+	}
+	.type-name{
+		top: 0;
+		left: 0;
+		width: 146rpx;
+		height: 47rpx;
+		line-height: 47rpx;
+		overflow: hidden;
+		border-bottom-right-radius: 16rpx;
+		border-top-left-radius: 16rpx;
+		.taye-name-bg{
+			position: absolute;
+			width: 100%;
+			height: 100%;
+			left: 0;
+			top: 0;
+			opacity: 0.1;
+		}
+	}
+	.reply{
+		width: 140rpx;
+		height: 56rpx;
+		line-height: 56rpx;
+		border-radius: 56rpx;
+	}
+</style>
diff --git a/user/pages/feedback/success.vue b/user/pages/feedback/success.vue
new file mode 100644
index 0000000..e047c1c
--- /dev/null
+++ b/user/pages/feedback/success.vue
@@ -0,0 +1,65 @@
+<template>
+	<view>
+		<view class="header flex-center pt-md">
+			<image src="https://lbqny.migugu.com/admin/shop/succ.png" mode="aspectFill"></image>
+		</view>
+		<view class="as-box-cont text-bold text-center">提交成功</view>
+		<view class="f-mini-title c-caption text-center pl-lg pr-lg pt-sm">您已经成功提交申请，审核进度和结果可在反馈记录里查看。</view>
+		<view class="as-btn c-base f-mini-title text-center ml-lg mr-lg" :style="{backgroundColor:primaryColor}"
+		@tap="$util.goUrl({url:`/user/pages/feedback/list`})">查看反馈记录</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		data() {
+			return {}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad() {
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+			this.initIndex()
+		},
+		methods:{
+			async initIndex(refresh = false){
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+			}
+		}
+	}
+</script>
+
+<style>
+	.header image{
+		width: 260rpx;
+		height: 260rpx;
+	}
+	.as-btn{
+		margin-top: 98rpx;
+		height: 84rpx;
+		line-height: 84rpx;
+		border-radius: 84rpx;
+	}
+	.as-box-cont{
+		padding-top: 40rpx;
+		font-size: 46rpx;
+	}
+</style>
diff --git a/user/pages/gzh.vue b/user/pages/gzh.vue
new file mode 100644
index 0000000..ad7900d
--- /dev/null
+++ b/user/pages/gzh.vue
@@ -0,0 +1,124 @@
+<template>
+	<view class="mine-pages-gzh flex-center flex-column" v-if="isLoad">
+		<view v-if="!userInfo.id">
+			<image mode="widthFix" class="web-code-img" :src="configInfo.web_code_img" v-if="configInfo.web_code_img">
+			</image>
+			<view class="gzh-img-info rel" v-else>
+				<image mode="aspectFill" class="gzh-img" :src="gzh_img"></image>
+				<view class="none-text f-title flex-center abs" v-if="!configInfo.web_code_img">商家还没有放公众号二维码哟~</view>
+			</view>
+	</view>
+	<view v-else>
+		<view @tap.stop="$util.goUrl({url:`/pages/service`,openType:`redirectTo`})"
+			class="home-btn flex-center f-sm-title c-base radius" :style="{background:primaryColor}"
+			v-if="configInfo.web_code_img">直接进入首页</view>
+	</view>
+		
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		data() {
+			return {
+				isLoad: false,
+				options: {},
+				gzh_img: 'https://lbqny.migugu.com/admin/anmo/mine/web-code-img.png'
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+			isGzhLogin: state => state.user.isGzhLogin,
+		}),
+		async onLoad(options) {
+			options = await this.updateCommonOptions(options)
+			this.options = options
+			await this.initIndex()
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getUserInfo', 'updateCommonOptions']),
+			...mapMutations(['updateConfigItem']),
+			async initIndex() {
+				let {
+					isGzhLogin
+				} = this
+				console.log(this.userInfo)
+				// #ifdef H5
+				if (isGzhLogin) {
+					setTimeout(() => {
+						this.getUserInfo()
+					}, 1000)
+				} else {
+					this.getUserInfo()
+				}
+				console.log(this.userInfo)
+				// #endif
+				// #ifndef H5
+				await this.getUserInfo()
+				// #endif  
+				await this.getConfigInfo()
+				console.log(this.userInfo)
+				let {
+					channel_id = 0
+				} = this.options
+				let {
+					id: uid
+				} = this.userInfo
+				if (channel_id && uid) {
+					await this.$api.user.bindChannel({
+						channel_id
+					})
+				}
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				this.isLoad = true
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	page {
+		background: #FEFFFE;
+	}
+
+	.mine-pages-gzh {
+		.web-code-img {
+			width: 750rpx;
+		}
+
+		.gzh-img-info {
+			width: 536rpx;
+			height: 552rpx;
+			margin-top: 114rpx;
+
+			.gzh-img {
+				width: 536rpx;
+				height: 552rpx;
+				border-radius: 30rpx;
+			}
+
+			.none-text {
+				width: 536rpx;
+				color: #2E2E31;
+				bottom: -20rpx;
+			}
+		}
+
+		.home-btn {
+			width: 690rpx;
+			height: 90rpx;
+			margin-top: 126rpx;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/user/pages/information.vue b/user/pages/information.vue
new file mode 100644
index 0000000..59a3544
--- /dev/null
+++ b/user/pages/information.vue
@@ -0,0 +1,70 @@
+<template>
+	<view class="user-pages-information fill-base" v-if="isLoad">
+		<view class="pd-lg f-paragraph">
+			<parser :html="detail.information_protection" @linkpress="linkpress" show-with-animation lazy-load>加载中...
+			</parser>
+		</view>
+		<view class="space-footer"></view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	import parser from "@/components/jyf-Parser/index"
+	export default {
+		components: {
+			parser
+		},
+		data() {
+			return {
+				options: {},
+				isLoad: false,
+				detail: {}
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+			loginPage: state => state.user.loginPage,
+		}),
+		onLoad(options) {
+			this.options = options
+			this.$util.showLoading()
+			this.initIndex()
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getUserInfo']),
+			...mapMutations(['updateUserItem']),
+			async initIndex(refresh = false) {
+				let data = await this.$api.base.getConfig()
+				this.detail = data
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				this.$util.hideAll()
+				this.isLoad = true
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			linkpress(res) {
+				// #ifdef APP-PLUS
+				this.$util.goUrl({
+					url: res.href,
+					openType: 'web'
+				})
+				// #endif
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+</style>
diff --git a/user/pages/logout.vue b/user/pages/logout.vue
new file mode 100644
index 0000000..0449c9e
--- /dev/null
+++ b/user/pages/logout.vue
@@ -0,0 +1,99 @@
+<template>
+	<view class="mine-pages-setting">
+		<view class="flex-center flex-column fill-base mt-lg ml-lg mr-lg radius-24">
+			<image mode="aspectFill" class="logout-img" src="https://lbqny.migugu.com/admin/anmo/mine/logout.png"></image>
+			<view class="f-title c-title text-bold mb-lg">账户注销，将放弃以下权益和财产</view>
+			<view class="f-desc c-caption pb-lg" style="padding-right: 50rpx;" v-html="text"></view>
+		</view>
+		<view class="pd-lg f-desc c-title">为保护您的权益，请确保您所有订单均已完成且无纠纷，否则将暂时无法进行注销操作</view>
+
+		<fix-bottom-button @confirm="toLoginOut" :text="[{ text: '已清楚风险, 确认注销', type: 'confirm' }]" bgColor="#fff">
+		</fix-bottom-button>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		data() {
+			return {
+				isLoad: false,
+				options: {},
+				text: `1、账号将无法登录<br>2、历史订单将无法查询<br>3、放弃钱余额、卡券等资产<br>`,
+				user_info: {}
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			userInfo: state => state.user.userInfo,
+		}),
+		async onLoad() {
+			// #ifdef H5
+			if (this.$jweixin.isWechat()) {
+				await this.$jweixin.initJssdk();
+				this.$jweixin.wxReady(() => {
+					this.$jweixin.hideOptionMenu()
+				})
+			}
+			// #endif
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+		},
+		methods: {
+			...mapActions(['getUserInfo']),
+			...mapMutations(['updateUserItem', 'updateServiceItem', 'updateTechnicianItem', 'updateOrderItem']),
+			async toLoginOut() {
+				await this.$api.user.delUserInfo()
+				this.$util.showToast({
+					title: `注销成功`
+				})
+				let methodArr = ['updateServiceItem', 'updateTechnicianItem', 'updateOrderItem']
+				methodArr.map(item => {
+					this[item]({
+						key: 'pageActive',
+						val: false
+					})
+				})
+
+				let arr = ['autograph', 'userInfo', 'location', 'appLogin', 'loginType',
+					'isGzhLogin', 'isShowLogin', 'mineInfo', 'coachInfo', 'userPageType',
+				]
+				arr.map(key => {
+					this.updateUserItem({
+						key,
+						val: key === 'isShowLogin' ? true : key === 'userPageType' ? 1 : ''
+					})
+				})
+
+				setTimeout(() => {
+					this.$util.goUrl({
+						url: `/pages/service`,
+						openType: `reLaunch`
+					})
+				}, 1000)
+			}
+
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.mine-pages-setting {
+		.logout-img {
+			width: 165rpx;
+			height: 160rpx;
+			margin-top: 70rpx;
+		}
+
+		.iconfont {
+			color: #999
+		}
+	}
+</style>
diff --git a/user/pages/merchant-info.vue b/user/pages/merchant-info.vue
new file mode 100644
index 0000000..3a9d8d6
--- /dev/null
+++ b/user/pages/merchant-info.vue
@@ -0,0 +1,109 @@
+<template>
+	<view class="merchant-info ml-lg mr-lg" v-if="detail.id">
+		<view class="flex-y-center pt-lg pb-lg f-mini-title c-title">
+			<i class="iconfont icondianpu" style="margin-right: 6rpx;"></i>
+			<view class="text-bold">{{detail.agent_name}}</view>
+			<view class="mearchant-label flex-center f-icontext ml-md c-base rel" :style="{color:primaryColor}">
+				<view class="bg abs" :style="{background:primaryColor}"></view>
+				签约商家
+			</view>
+		</view>
+		<view class="flex-y-center f-paragraph c-paragraph text-bold mt-md mb-lg">营业执照
+			<view class="f-caption c-caption ml-sm" v-if="!detail.license">暂未设置</view>
+		</view>
+		<view class="license-info flex-center mt-md f-paragraph c-paragraph radius-18" v-if="detail.license">
+			<image @tap.stop="$util.previewImage({current:detail.license,urls:[detail.license]})" mode="aspectFill"
+				class="img-item radius-16" :src="detail.license">
+			</image>
+		</view>
+		<view class="space-footer"></view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		data() {
+			return {
+				options: {},
+				detail: {},
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad(options) {
+			this.options = options
+			this.initIndex()
+		},
+		methods: {
+			...mapMutations(['updateUserItem']),
+			async initIndex() {
+				// #ifdef H5
+				if (this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				await this.getDetail()
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+			},
+			async getDetail() {
+				let {
+					id
+				} = this.options
+				let data = await this.$api.agent.agentInfo({
+					admin_id: id
+				})
+				this.detail = data
+				this.$util.hideAll()
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	page {
+		background: #fff;
+	}
+
+	.merchant-info {
+		.mearchant-label {
+			width: 100rpx;
+			height: 34rpx;
+			border-radius: 4rpx;
+
+			.bg {
+				opacity: 0.1;
+				top: 0;
+				left: 0;
+				right: 0;
+				bottom: 0;
+				z-index: 1;
+				border-radius: 4rpx;
+			}
+		}
+
+		.license-info {
+			height: 345rpx;
+			background: #F4F4F4;
+		}
+
+		.img-item {
+			width: 315rpx;
+			height: 232rpx;
+		}
+
+	}
+</style>
\ No newline at end of file
diff --git a/user/pages/order.vue b/user/pages/order.vue
new file mode 100644
index 0000000..50889c6
--- /dev/null
+++ b/user/pages/order.vue
@@ -0,0 +1,954 @@
+<template>
+	<view class="order-pages" v-if="orderInfo.coach_id">
+
+
+		<view class="mt-lg ml-lg mr-lg fill-base radius-16"
+			v-if="configInfo.plugAuth.store && orderInfo.is_store == 1 ">
+			<view class="flex-between pd-lg">
+				<view class="f-title c-title text-bold">服务方式</view>
+				<view class="flex-center">
+					<view @tap.stop="toChangeItem(index,3)" class="flex-center service-type-item c-caption"
+						:class="[{'ml-lg':index!=0}]"
+						:style="{background:serviceTypeInd == index ? `linear-gradient(68deg, ${primaryColor}, ${subColor})`:'',color:serviceTypeInd == index ? '#fff':''}"
+						v-for="(item,index) in serviceTypeList" :key="index">
+						{{item.title}}
+					</view>
+				</view>
+			</view>
+		</view>
+
+
+		<view v-if="orderInfo.order_goods && orderInfo.order_goods.length > 0">
+
+			<block v-if="serviceTypeList[serviceTypeInd].id === 1">
+
+				<view class="store-info mt-md ml-lg mr-lg pd-lg  fill-base radius-16">
+					<view class="f-mini-title c-title text-bold pb-md">
+						{{orderInfo.store_info.title}}
+					</view>
+					<view class="flex-between">
+						<view class="flex-y-center" style="color: #303030;">
+							<i class="iconfont icondizhi1 mr-sm"></i>
+							<view class="c-title flex-1 mr-md">
+								<span>{{orderInfo.store_info.address || `暂未设置门店地址`}}</span>
+								<span @tap.stop="$util.goUrl({url:orderInfo.store_info.address,openType:'copy'})"
+									class="copy-btn span radius-5 f-icontext ml-sm"
+									:style="{color:primaryColor,borderColor:primaryColor}"
+									v-if="orderInfo.store_info.address">复制</span>
+							</view>
+						</view>
+						<view class="flex-center">
+							<view @tap.stop="$util.goUrl({url:orderInfo.store_info.phone,openType:'call'})"
+								class="item-icon rel flex-center radius-16">
+								<view class="item-icon radius-16 abs" :style="{background:primaryColor}"></view>
+								<i class="iconfont icondadianhua_1" :style="{color:primaryColor}"></i>
+							</view>
+							<view @tap.stop="toMap" class="item-icon rel flex-center radius-16 ml-md"
+								v-if="orderInfo.store_info.address">
+								<view class="item-icon radius-16 abs" :style="{background:primaryColor}"></view>
+								<i class="iconfont icondizhi_1" :style="{color:primaryColor}"></i>
+							</view>
+						</view>
+					</view>
+				</view>
+
+				<view class="mt-md ml-lg mr-lg pl-lg pr-lg fill-base radius-16">
+					<view class="flex-between b-1px-b">
+						<view class="item-text flex-y-center"><i class="iconfont icon-required c-warning"></i>姓名</view>
+						<input v-model="form.user_name" type="text" class="item-input flex-1" maxlength="20"
+							:placeholder="rule[0].errorMsg" />
+					</view>
+					<view class="flex-between">
+						<view class="item-text flex-y-center"><i class="iconfont icon-required c-warning"></i>手机号</view>
+						<input v-model="form.user_phone" type="text" class="item-input flex-1"
+							:placeholder="rule[1].errorMsg" />
+					</view>
+				</view>
+
+			</block>
+
+			<view @tap.stop="$util.goUrl({url:`/user/pages/address/list?check=1`})"
+				class="address-info flex-warp mt-md ml-lg mr-lg pd-lg fill-base radius-16"
+				v-if="serviceTypeList[serviceTypeInd].id === 0">
+				<view class="address-icon flex-center c-base radius"
+					:style="{background:`linear-gradient(to right, ${subColor}, ${primaryColor})`}"><i
+						class="iconfont iconjuli"></i></view>
+				<view class="flex-1 flex-between ml-md">
+					<view class="max-500">
+						<block v-if="orderInfo.address_info.id">
+							<view class="flex-y-baseline username c-title text-bold">
+								{{orderInfo.address_info.user_name}}
+								<view class="ml-md f-desc c-caption">{{orderInfo.address_info.mobile}}</view>
+							</view>
+							<view class="f-desc c-title ellipsis">
+								{{`${orderInfo.address_info.address} ${orderInfo.address_info.address_info}`}}
+							</view>
+						</block>
+						<block v-else>
+							<view class="username c-title text-bold">请选择地址</view>
+						</block>
+					</view>
+					<i class="iconfont icon-right"></i>
+				</view>
+			</view>
+
+
+			<view class="mt-md ml-lg mr-lg pl-lg pr-lg fill-base radius-16">
+				<view @tap.stop="toShowTime" class="flex-between pt-lg pb-lg">
+					<view class="f-title c-title text-bold">服务时间</view>
+					<view class="flex-y-center f-paragraph c-caption ml-sm">
+						<view class="c-caption mr-sm">{{send_info.time || '请选择预约时间'}}</view>
+						<i class="iconfont icon-right"></i>
+					</view>
+				</view>
+				<view class="flex-between pt-lg pb-lg b-1px-t" v-if="serviceTypeList[serviceTypeInd].id === 0">
+					<view class="f-title c-title text-bold">出行方式</view>
+					<view class="flex-center">
+						<view @tap.stop="toChangeItem(index)" class="flex-y-center" :class="[{'ml-lg':index!=0}]"
+							:style="{color:carTypeInd == index ? primaryColor:''}" v-for="(item,index) in carTypeList"
+							v-show="item.id == 0 ? orderInfo.coach_free_distance == 1 : true" :key="index"><i class="iconfont icon-xuanze mr-sm"
+								:class="[{'icon-radio-fill':carTypeInd == index}]"></i>{{item.title}}
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="mt-md ml-lg mr-lg  fill-base radius-16">
+				<view class="list-item flex-warp pd-lg" :class="[{'b-1px-t':index!=0}]"
+					v-for="(item,index) in orderInfo.order_goods" :key="index">
+					<!-- #ifdef H5 -->
+					<view class="item-img radius-16">
+						<view class="h5-image item-img radius-16" :style="{ backgroundImage : `url('${item.cover}')`}">
+						</view>
+					</view>
+					<!-- #endif -->
+					<!-- #ifndef H5 -->
+					<image mode="aspectFill" class="item-img radius-16" :src="item.cover"></image>
+					<!-- #endif -->
+					<view class="flex-1 ml-md">
+						<view class="f-title c-title text-bold ellipsis">{{item.title}}</view>
+						<view class="flex-between">
+							<view class="flex-y-center f-desc c-caption">
+								<view class="f-title c-warning mr-sm">
+									<text>¥{{ item.price }}</text>
+									<text class="after-text" v-if="orderInfo.is_new">¥{{ item.price_after }} </text>
+								</view>/ {{item.time_long}}分钟
+							</view>
+							<view>
+								<view class="f-caption c-caption" v-if="item.material_price*1>0">
+									物料费：¥{{item.material_price}}</view>
+							</view>
+						</view>
+						<view class="flex-between">
+							<view class="f-caption c-caption mt-sm mb-sm ellipsis" style="max-width: 300rpx;">
+								服务{{$t('action.attendantName')}}：{{orderInfo.coach_info?orderInfo.coach_info.coach_name:'-'}}
+							</view>
+							<view class="flex-warp">
+								<button @tap.stop="changeNum(-1,index)" class="reduce"
+									:style="{borderColor:primaryColor,color:primaryColor}"><i
+										class="iconfont icon-jian-bold"></i></button>
+								<button class="addreduce clear-btn">{{item.num || 0}}</button>
+								</block>
+								<button @tap.stop="changeNum(1,index)" class="add"
+									:style="{background:primaryColor,borderColor:primaryColor}"><i
+										class="iconfont icon-jia-bold"></i></button>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="mt-md ml-lg mr-lg pl-lg pr-lg fill-base radius-16">
+				<view v-if="!orderInfo.is_new" @tap.stop="$util.goUrl({url:`/user/pages/coupon/use`})"
+					class="flex-between pt-lg pb-lg b-1px-b">
+					<view class="f-title c-title text-bold">卡券优惠</view>
+					<view class="flex-y-center f-paragraph c-caption ml-sm">
+						<view class="c-warning mr-sm">
+							{{orderInfo.coupon_id ? `-¥${orderInfo.discount}` : `${orderInfo.canUseCoupon}张可用`}}
+						</view>
+						<i class="iconfont icon-right"></i>
+					</view>
+				</view>
+				<view class="flex-between pt-lg pb-lg" v-else>
+					<view class="f-title c-title text-bold">新单优惠</view>
+					<view class="f-paragraph c-caption c-warning">{{orderInfo.discount}}折</view>
+				</view>
+				<view class="flex-between pt-lg pb-lg" :class="[{'b-1px-b':carTypeList[carTypeInd].id === 1}]"
+					v-if="orderInfo.material_price*1>0">
+					<view class="f-title c-title text-bold">物料费</view>
+					<view class="f-paragraph c-caption c-warning">¥{{orderInfo.material_price}}</view>
+				</view>
+				<block v-if="serviceTypeList[serviceTypeInd].id === 0 && carTypeList[carTypeInd].id === 1">
+					<view class="flex-between pt-lg pb-lg">
+						<view class="f-title c-title text-bold">往返车费</view>
+						<view class="f-paragraph c-caption c-warning">¥{{orderInfo.car_price}}</view>
+					</view>
+					<view class="pl-lg pr-lg pb-lg f-caption c-caption">
+						全程共{{orderInfo.distance}}，出租出行{{orderInfo.car_config.start_distance}}公里内，起步{{orderInfo.car_config.start_price}}元。里程计价：{{orderInfo.car_config.distance_price}}元/公里
+					</view>
+				</block>
+			</view>
+
+			<view class="mt-md ml-lg mr-lg pd-lg fill-base radius-16">
+				<view class="flex-between pb-lg">
+					<view class="flex-y-baseline">
+						<view class="f-title c-title text-bold">订单备注</view>
+						<view class="f-paragraph c-caption ml-sm">(选填)</view>
+					</view>
+				</view>
+				<view class="f-caption c-caption fill-body radius-16">
+					<textarea v-model="form.text" class="item-textarea f-paragraph pd-lg"
+						placeholder-class="f-paragraph" maxlength="100" placeholder="输入订单备注" />
+					<view class="text-right pb-lg pr-lg">{{form.text.length>100?100:form.text.length}}/100
+					</view>
+				</view>
+			</view>
+
+
+			<view class="mt-md ml-lg mr-lg fill-base radius-16">
+				<view @tap.stop="toChangeItem(index,2)" class="flex-between pt-lg pb-lg ml-lg mr-lg"
+					:class="[{'b-1px-t':index!=0}]" v-for="(item,index) in payList" :key="index">
+					<view class="flex-y-center f-title c-title">
+						<i class="iconfont mr-md" :class="item.icon"
+							:style="{color:item.id==1?primaryColor:'',fontSize:'50rpx'}"></i>
+						{{item.title}}
+						<view class="f-paragraph c-caption ml-md" v-if="item.id == 2">余额{{balance || 0}}元</view>
+					</view>
+					<view class="flex-y-center c-caption" :style="{color:payInd == index ? primaryColor:''}">
+						<i class="pay-icon iconfont icon-xuanze mr-sm"
+							:class="[{'icon-radio-fill':item.is_disabled || payInd == index}]"></i>
+					</view>
+				</view>
+			</view>
+
+
+			<view @tap.stop="isAgree=!isAgree"
+				class="mt-md ml-lg mr-lg pd-lg fill-base f-paragraph c-title flex-y-center radius-16"
+				v-if="configInfo.trading_rules && configInfo.trading_rules.length>0">
+				<i class="iconfont mr-sm" :class="isAgree?'icon-xuanze-fill':'icon-xuanze'"
+					:style="{color:isAgree?primaryColor:''}"></i>
+				我已阅读并同意<view @tap.stop="$refs.show_rule_item.open()" :style="{color:primaryColor}">《平台交易规则》</view>
+			</view>
+
+			<view class="space-max-footer"></view>
+
+			<view class="pay-info fix flex-between text-right pl-lg pr-lg fill-base">
+				<view class="flex-y-center f-paragraph c-title text-bold ml-sm mr-lg">合计：
+					<view class="flex-y-baseline f-title c-warning">¥{{orderInfo.pay_price}}</view>
+				</view>
+				<auth :needAuth="userInfo && (!userInfo.phone || !userInfo.nickName)" :must="true"
+					:type="!userInfo.phone ? 'phone' : 'userInfo'" @go="toPay" style="width: 182rpx;">
+					<view class="pay-btn flex-center f-paragraph c-base radius" :style="{background: `linear-gradient(68deg, ${primaryColor}, ${subColor})`}">
+						立即支付</view>
+				</auth>
+			</view>
+
+		</view>
+
+
+		<abnor @confirm="$util.goUrl({url:`/pages/service`,openType:`reLaunch`})" :tip="[{ text: '该服务已下架~', color: 0 }]"
+			:button="[{ text: '去看看其他服务' , type: 'confirm' }]" btnSize="" v-else>
+		</abnor>
+
+		<uni-popup ref="show_rule_item" type="center" :maskClick="false">
+			<view class="popup-rule">
+				<view class="fill-base pd-lg radius-26">
+					<view class="f-title c-title text-bold flex-center pd-lg">平台交易规则</view>
+					<scroll-view scroll-y @touchmove.stop.prevent class="rule-text">
+						<parser :html="configInfo.trading_rules" @linkpress="linkpress" show-with-animation lazy-load>
+							加载中...
+						</parser>
+					</scroll-view>
+				</view>
+				<view @tap="$refs.show_rule_item.close()" class="flex-center pd-lg"><i
+						class="iconfont icon-close c-base"></i></view>
+			</view>
+		</uni-popup>
+		<uni-popup ref="show_time_item" type="bottom">
+			<view class="popup-time fill-base">
+				<tab @change="handerTabChange" :list="tabList" :activeIndex="activeIndex*1" :activeColor="primaryColor"
+					height="100rpx"></tab>
+				<scroll-view scroll-y @touchmove.stop.prevent class="time-list">
+					<view class="flex-warp">
+						<view @tap.stop="toChooseTime(index)" class="time-item flex-center flex-column"
+							:class="[{'can-choose':item.status && send_info.time_str != item.time_str},{'cur-check':send_info.time_str == item.time_str}]"
+							:style="{background:send_info.time_str == item.time_str ?primaryColor:''}"
+							v-for="(item,index) in timeList" :key="index">
+							<view class="f-title">{{item.time_text}}</view>
+							<view class="f-caption">{{item.status?'可预约':'不可预约'}}</view>
+						</view>
+					</view>
+				</scroll-view>
+				<view class="space-safe"></view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	import parser from "@/components/jyf-Parser/index"
+	export default {
+		components: {
+			parser
+		},
+		data() {
+			return {
+				options: {},
+				serviceTypeList: [{
+					id: 0,
+					title: '上门服务'
+				}, 
+				// {
+				// 	id: 1,
+				// 	title: '到店服务'
+				// },
+				],
+				serviceTypeInd: 0,
+				carTypeList: [{
+					id: 1,
+					title: '出租车'
+				}, {
+					id: 0,
+					title: '自行出行'
+				}],
+				carTypeInd: 0,
+				// 1微信支付；2余额支付；3支付宝支付
+				payList: [{
+					id: 1,
+					icon: 'iconweixinzhifu1',
+					title: '微信支付'
+				}, {
+					id: 2,
+					icon: 'iconqianbao c-balance',
+					title: '账户余额',
+					is_disabled: false
+				}],
+				payInd: 0,
+				balanceInd: 1,
+				balance: 0,
+				tabList: [],
+				activeIndex: 0,
+				timeList: [],
+				send_info: {},
+				orderInfo: {
+					coupon_id: 0,
+					address_info: {
+						id: 0
+					}
+				},
+				form: {
+					user_name: '',
+					user_phone: '',
+					text: ''
+				},
+				rule: [{
+						name: "user_name",
+						checkType: "isNotNull",
+						errorMsg: "请输入您的姓名",
+						regType: 2
+					},
+					{
+						name: "user_phone",
+						checkType: "isMobile",
+						errorMsg: "请输入手机号"
+					}
+				],
+				lockTap: false,
+				isBus: 0,
+				isAgree: false
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			commonOptions: state => state.user.commonOptions,
+			userInfo: state => state.user.userInfo,
+			mineInfo: state => state.user.mineInfo,
+			carList: state => state.order.carList,
+		}),
+		watch: {
+			'send_info.time'(value) {
+				let {
+					time_str: start_time
+				} = this.send_info
+				//this.getIsBusCall(start_time)
+			}
+		},
+		async onLoad(options) {
+			this.options = options
+			this.$util.showLoading()
+			await this.initIndex()
+			let {
+				time = 0
+			} = this.send_info
+			if (!time) {
+				//this.getIsBusCall('')
+			}
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getMineInfo', 'getCarList']),
+			...mapMutations(['updateUserItem', 'updateOrderItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				await this.getConfigInfo()
+				let {
+					alipay_status = 0
+				} = this.configInfo
+
+				if (alipay_status) {
+					// #ifndef MP-WEIXIN
+					let pay = this.payList.findIndex(item => {
+						return item.id == 3
+					})
+					if (pay === -1) {
+						this.payList.splice(1, 0, {
+							id: 3,
+							icon: 'icon-alipay c-alipay',
+							title: '支付宝支付'
+						})
+						this.balanceInd = 2
+					}
+					// #endif
+				}
+				let {
+					id: coach_id,
+					ser_id = 0
+				} = this.options
+				let {
+					coupon_id,
+					address_info
+				} = this.orderInfo
+				let {
+					id: address_id
+				} = address_info
+				if (!address_id) {
+					let address_info = await this.$api.mine.getDefultAddress()
+					address_id = address_info && address_info.id ? address_info.id : null
+				}
+				//!address_info.id
+				// if(!address_info.id){
+				// 	this.carTypeList[1][] = [
+						
+				// 	]
+				// }
+				let car_type = this.carTypeList[this.carTypeInd].id
+				let {
+					id: is_store = 0
+				} = this.serviceTypeList[this.serviceTypeInd]
+				let [data, mineInfo] = await Promise.all([this.$api.order.payOrderInfo({
+					is_store,
+					service_id: ser_id,
+					coach_id,
+					car_type,
+					coupon_id,
+					address_id
+				}), this.getMineInfo()])
+				this.$util.hideAll()
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				data.address_info = data.address_info.id ? data.address_info : {}
+				this.orderInfo = data
+				let {
+					near_time = {
+						str: '',
+						text: ''
+					}
+				} = data
+
+				let {
+					text: time = '',
+					str: time_str = ''
+				} = near_time
+
+				let {
+					time: send_info_time = 0
+				} = this.send_info
+				if (!send_info_time && time && time_str) {
+					let dat_text = this.$util.formatTime(time_str * 1000, 'M-D')
+					this.send_info = {
+						time,
+						time_str,
+						dat_text
+					}
+				}
+				let {
+					balance
+				} = this.mineInfo
+				let {
+					balanceInd
+				} = this
+				
+				this.payList[balanceInd].is_disabled = balance * 1 < data.pay_price * 1
+				this.balance = balance
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			linkpress(res) {
+				// #ifdef APP-PLUS
+				this.$util.goUrl({
+					url: res.href,
+					openType: 'web'
+				})
+				// #endif
+			},
+			async getIsBusCall(start_time) {
+				let {
+					serviceTypeList,
+					serviceTypeInd
+				} = this
+				let {
+					id: is_store = 0
+				} = serviceTypeList[serviceTypeInd]
+				let isBus = is_store ? 1 : await this.$api.order.getIsBus({
+					start_time
+				})
+				this.isBus = isBus
+				if (isBus == 0) {
+					this.carTypeInd = 0
+					await this.initRefresh()
+				}
+			},
+			// 选择出行方式/支付方式/服务方式
+			async toChangeItem(index, key = 1) {
+				let {
+					address_info
+				} = this.orderInfo
+				switch (key) {
+					case 1:
+						if (index == 1 && !address_info.id) {
+							this.$util.showToast({
+								title: `请选择地址`
+							})
+							return
+						}
+						if (index == 1 && !this.send_info.time) {
+							this.$util.showToast({
+								title: `请选择预约时间`
+							})
+							return
+						}
+						this.carTypeInd = index
+						await this.initRefresh()
+						break
+					case 2:
+						let {
+							balanceInd
+						} = this
+						if (index == balanceInd && this.payList[balanceInd].is_disabled) return
+						this.payInd = index
+						break
+					case 3:
+						this.serviceTypeInd = index
+						this.carTypeInd = index == 1 ? 1 : 0
+						await this.initRefresh()
+						break
+				}
+			},
+			// 加/减数量
+			async changeNum(mol, index) {
+				let {
+					id,
+					service_id
+				} = this.orderInfo.order_goods[index]
+				let {
+					id: coach_id
+				} = this.options
+				if (this.lockTap) return;
+				this.lockTap = true;
+				let methodModel = mol > 0 ? 'addCar' : 'delCar'
+				let param = mol > 0 ? {
+					service_id,
+					coach_id,
+					num: 1
+				} : {
+					id,
+					num: 1
+				}
+				try {
+					let changeNum = await this.$api.order[methodModel](param)
+					await this.getCarList({
+						coach_id
+					})
+					await this.initRefresh()
+					this.lockTap = false
+				} catch (e) {
+					this.lockTap = false
+				}
+			},
+			async toShowTime() {
+				await this.getStoreDay()
+				this.$refs.show_time_item.open()
+			},
+			async getStoreDay() {
+				let data = await this.$api.order.dayText()
+				data.map(item => {
+					item.title = `${item.dat_text} ${item.week}`
+				})
+				this.tabList = data
+				let {
+					dat_text = ''
+				} = this.send_info
+				if (dat_text) {
+					this.activeIndex = this.tabList.findIndex(item => {
+						return item.dat_text == dat_text
+					})
+				}
+				await this.getStoreTime()
+				this.loading = false
+				this.$util.hideAll()
+			},
+			async getStoreTime() {
+				let {
+					id: coach_id
+				} = this.options
+				let {
+					activeIndex
+				} = this
+				if (activeIndex < 0) return
+				let {
+					dat_str: day
+				} = this.tabList[activeIndex]
+				let {
+					id: is_store = 0
+				} = this.serviceTypeList[this.serviceTypeInd]
+				this.timeList = await this.$api.order.timeText({
+					is_store,
+					coach_id,
+					day
+				});
+				this.loading = false
+				this.$util.hideAll()
+			},
+			handerTabChange(index) {
+				this.activeIndex = index
+				this.getStoreTime()
+			},
+			toChooseTime(index) {
+				let {
+					tabList,
+					activeIndex
+				} = this
+				let item = this.timeList[index]
+				if (item.status != 1) return
+				item.time = `${tabList[activeIndex].dat_text} ${tabList[activeIndex].week} ${item.time_text}`
+				this.send_info = item
+				this.$refs.show_time_item.close()
+			},
+			checkInput(e, key) {
+				let val = this.$util.formatMoney(e.detail.value)
+				this.$nextTick(() => {
+					this.form[key] = val
+				})
+			},
+			// 查看定位
+			async toMap() {
+				let {
+					address,
+					lat,
+					lng
+				} = this.orderInfo.store_info
+				if (!address) return
+				await this.$util.checkAuth({
+					type: 'userLocation'
+				})
+				await uni.getLocation({
+					type: 'gcj02',
+				})
+				await uni.openLocation({
+					latitude: lat * 1,
+					longitude: lng * 1,
+					name: address,
+					scale: 28
+				})
+			},
+			//表单验证
+			validate(param) {
+				let validate = new this.$util.Validate();
+				this.rule.map(item => {
+					let {
+						name,
+					} = item
+					validate.add(param[name], item);
+				})
+				let message = validate.start();
+				return message;
+			},
+			async toPay() {
+				let param = this.$util.deepCopy(this.form)
+				let {
+					id: is_store = 0
+				} = this.serviceTypeList[this.serviceTypeInd]
+				if (is_store) {
+					let msg = this.validate(param);
+					if (msg) {
+						this.$util.showToast({
+							title: msg
+						});
+						return
+					}
+				} else {
+					delete param.user_name
+					delete param.user_phone
+				}
+				let {
+					coupon_id = 0,
+						address_info = {}
+				} = this.orderInfo
+				let {
+					id: address_id
+				} = address_info
+				if (!is_store && !address_id) {
+					this.$util.showToast({
+						title: `请选择地址`
+					})
+					return
+				}
+				let {
+					carTypeList,
+					carTypeInd,
+					payList,
+					payInd,
+					send_info
+				} = this
+				if (!send_info.time) {
+					this.$util.showToast({
+						title: `请选择预约时间`
+					})
+					return
+				}
+				let {
+					trading_rules
+				} = this.configInfo
+				if (trading_rules && trading_rules.length > 0 && !this.isAgree) {
+					this.$util.showToast({
+						title: `请先阅读并同意《平台交易规则》`
+					})
+					return
+				}
+				let {
+					id: car_type
+				} = carTypeList[carTypeInd]
+				let {
+					id: pay_model
+				} = payList[payInd]
+				let {
+					id: coach_id
+				} = this.options
+				let {
+					time_str: start_time
+				} = send_info
+
+				param = Object.assign({}, param, {
+					coach_id,
+					coupon_id,
+					address_id,
+					is_store,
+					car_type,
+					pay_model,
+					start_time
+				})
+				if (this.lockTap) return
+				this.lockTap = true
+				this.$util.showLoading()
+				try {
+					let {
+						pay_list,
+						order_id = 0
+					} = await this.$api.order.payOrder(param)
+					this.$util.hideAll()
+					// 微信/支付宝支付
+					if (pay_list) {
+						if (pay_model == 3) {
+							pay_list = {
+								orderInfo: pay_list,
+								provider: 'alipay'
+							}
+						}
+						// #ifdef H5
+						if (pay_model == 3) {
+							pay_list = Object.assign({}, pay_list, {
+								order_id,
+								page_url: `/pages/order?tab=2`
+							})
+							this.updateOrderItem({
+								key: 'alipayOrderParams',
+								val: pay_list
+							})
+							this.$util.goUrl({
+								url: '/user/pages/alipay-result',
+								openType: `redirectTo`
+							})
+							return
+						}
+						// #endif
+
+						try {
+							await this.$util.pay(pay_list)
+							this.$util.showToast({
+								title: `支付成功`
+							})
+							setTimeout(() => {
+								this.lockTap = false
+								this.$util.goUrl({
+									url: '/pages/order?tab=2',
+									openType: `reLaunch`
+								})
+							}, 1000)
+						} catch (e) {
+							this.$util.showToast({
+								title: `支付失败`
+							})
+							setTimeout(() => {
+								this.lockTap = false
+								this.$util.goUrl({
+									url: '/pages/order?tab=1',
+									openType: `reLaunch`
+								})
+							}, 1000)
+						}
+						return
+					}
+					// 余额支付/零元支付
+					this.$util.showToast({
+						title: `支付成功`
+					})
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.goUrl({
+							url: '/pages/order?tab=2',
+							openType: `reLaunch`
+						})
+					}, 1000)
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.after-text{
+		text-decoration: line-through;
+		font-size: 25rpx;
+		color: #999;
+		margin-left: 5px;
+	}
+	.order-pages {
+
+		.item-text {
+			width: 200rpx;
+			height: 30rpx;
+			line-height: 30rpx;
+			font-size: 30rpx;
+			color: #1F1F1F;
+		}
+
+		.item-input {
+			min-height: 30rpx;
+			line-height: 30rpx;
+			padding: 25rpx 0;
+			font-size: 26rpx;
+			color: #A9A9A9;
+		}
+
+		.item-input.text {
+			padding: 30rpx 0;
+		}
+
+		.list-item {
+			.item-img {
+				width: 140rpx;
+				height: 140rpx;
+			}
+
+			.ellipsis {
+				max-width: 466rpx;
+			}
+
+			.item-tag {
+				width: 100rpx;
+				height: 36rpx;
+				margin-top: -18rpx;
+			}
+
+			.iconyduixingxingshixin {
+				font-size: 28rpx;
+			}
+
+			.item-btn {
+				width: 129rpx;
+				height: 54rpx;
+			}
+		}
+
+		.pay-info {
+			height: 110rpx;
+			bottom: 0;
+			height: calc(110rpx + env(safe-area-inset-bottom) / 2);
+			padding-bottom: calc(env(safe-area-inset-bottom) / 2);
+
+			.pay-btn {
+				width: 182rpx;
+				height: 74rpx;
+			}
+		}
+
+		.popup-rule {
+			width: 680rpx;
+			height: auto;
+
+			.rule-text {
+				min-height: 300rpx;
+				max-height: 60vh;
+			}
+
+			.iconfont {
+				font-size: 60rpx;
+			}
+		}
+
+		.popup-time {
+			.time-list {
+				width: calc(100% - 20rpx);
+				max-height: 70vh;
+				padding: 30rpx 10rpx;
+
+				.time-item {
+					width: 162rpx;
+					height: 110rpx;
+					color: #C7C7C7;
+					background: #E5E5E5;
+					border-radius: 16rpx;
+					border: 1px solid #E5E5E5;
+					margin: 10rpx;
+				}
+
+				.can-choose {
+					color: #5A677E;
+					background: #FFFFFF;
+				}
+
+				.cur-check {
+					color: #fff;
+				}
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/user/pages/order/bell-list.vue b/user/pages/order/bell-list.vue
new file mode 100644
index 0000000..1b9a11e
--- /dev/null
+++ b/user/pages/order/bell-list.vue
@@ -0,0 +1,369 @@
+<template>
+	<view class="order-pages">
+		<view @tap.stop="goDetail(index,'detail')" class="item-child mt-md ml-md mr-md pd-lg fill-base radius-16 rel"
+			v-for="(item,index) in list.data" :key="index">
+			<view v-if="item.is_add">
+				<view class="bell-tag flex-center f-icontext c-base abs" :style="{background:primaryColor}">加钟服务
+				</view>
+				<view class="space-md"></view>
+			</view>
+			<view class="flex-between pb-lg b-1px-b">
+				<view class="f-paragraph c-title max-500 ellipsis"
+					@tap.stop="$util.goUrl({openType:'copy',url:item.order_code})">订单号：{{item.order_code}}
+				</view>
+				<!-- // pay_type 1待支付，2待服务，3技-师接单，4技-师出发，5技-师到达，6服务中，7服务完成 -->
+				<view class="f-caption text-bold"
+					:style="{color:item.pay_type==1?primaryColor: [2,3,4,5,6].includes(item.pay_type)?subColor: item.pay_type == 7 ? '#11C95E' : '#333'}">
+					{{statusType[item.pay_type]}}
+				</view>
+			</view>
+			<view class="flex-center mt-lg" v-for="(aitem,aindex) in item.order_goods" :key="aindex">
+				<!-- #ifdef H5 -->
+				<view class="cover radius-16">
+					<view class="h5-image cover radius-16" :style="{ backgroundImage : `url('${aitem.goods_cover}')`}">
+					</view>
+				</view>
+				<!-- #endif -->
+				<!-- #ifndef H5 -->
+				<image mode="aspectFill" class="cover radius-16" :src="aitem.goods_cover"></image>
+				<!-- #endif -->
+				<view class="flex-1 ml-md">
+					<view class="flex-between">
+						<view class="f-mini-title c-title text-bold max-400 ellipsis">
+							{{aitem.goods_name}}
+						</view>
+						<view class="f-desc c-desc">x{{aitem.num}}</view>
+					</view>
+					<view class="flex-center" style="margin-top: 6rpx;">
+						<view class="flex-1 flex-y-center f-caption c-caption"> 服务{{$t('action.attendantName')}}
+							<view class="ml-md max-280 ellipsis">
+								{{item.coach_info.coach_name}}
+							</view>
+						</view>
+						<view class="f-caption c-warning" v-if="aitem.refund_num>0">已退x{{aitem.refund_num}}
+						</view>
+					</view>
+					<view class="flex-y-center f-caption c-caption">预约时间<view class="ml-md">{{item.start_time}}
+						</view>
+					</view>
+					<view class="flex-y-center f-caption c-caption">总计：
+						<view class="flex-y-baseline c-warning text-bold">¥
+							<view class="f-title">{{item.pay_price}}</view>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view class="flex-between pt-lg">
+				<view></view>
+				<view class="flex-warp">
+					<!-- 待支付 -->
+					<block v-if="item.pay_type == 1">
+						<button @tap.stop="toCancel(index)" class="clear-btn order">取消订单</button>
+						<button @tap.stop="toPay(index)" class="clear-btn order"
+							:style="{color:'#fff',background:primaryColor,borderColor:primaryColor}">去支付</button>
+					</block>
+					<!-- 支付超时 -->
+					<block v-if="item.pay_type == -1 || item.pay_type == 7">
+						<button @tap.stop="toCancel(index)" class="clear-btn order">删除</button>
+					</block>
+					<!-- 待服务 -->
+					<button @tap.stop="goDetail(index,'refund')" class="clear-btn order"
+						v-if="item.can_refund > 0">申请退款</button>
+					<!-- 服务中 -->
+					<!-- is_add 加钟订单 -->
+					<block v-if="item.pay_type == 6 && (item.is_add || (!item.is_add && item.can_add_order))">
+						<button
+							@tap.stop="$util.goUrl({url:`/user/pages/bell/list?id=${item.id}&coach_id=${item.coach_id}`})"
+							class="clear-btn order"
+							:style="{color:'#fff',background:primaryColor,borderColor:primaryColor}"
+							v-if="">{{item.is_add?'升级项目':'升级/加钟'}}</button>
+					</block>
+					<!-- 已完成 -->
+					<block v-if="item.pay_type == 7 && !item.is_add">
+						<button @tap.stop="goDetail(index,'evaluate')" class="clear-btn order"
+							v-if="!item.is_comment">去评价</button>
+						<button @tap.stop="toAgain(index)" class="clear-btn order"
+							:style="{color:'#fff',background:primaryColor,borderColor:primaryColor}"
+							v-if="item.can_again">再来一单</button>
+					</block>
+				</view>
+			</view>
+		</view>
+
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+		<view class="space-footer"></view>
+
+		<common-popup @confirm="confirmCancel" ref="cancel_item" type="CANCEL_ORDER" :info="popupInfo">
+		</common-popup>
+		<common-popup @confirm="confirmDel" ref="del_item" type="DELETE_ORDER" :info="popupInfo"></common-popup>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		data() {
+			return {
+				options: {},
+				statusType: {
+					'-1': '已取消',
+					1: '待支付',
+					2: '待服务',
+					3: this.$t('action.attendantName') + '接单',
+					4: this.$t('action.attendantName') + '出发',
+					5: this.$t('action.attendantName') + '到达',
+					6: '服务中',
+					7: '已完成',
+					8: '待转单'
+				},
+				param: {
+					page: 1,
+				},
+				list: {
+					data: []
+				},
+				loading: true,
+				popupInfo: {},
+				lockTap: false
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		async onLoad(options) {
+			this.options = options
+			this.param.order_id = options.id
+			await this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.loading = true;
+			this.getList(this.param.page + 1);
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getOrderList']),
+			...mapMutations(['updateOrderItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif 
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				await this.getList(1)
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			async getList(page = 0) {
+				if (page) {
+					this.param.page = page
+				}
+				let {
+					list: oldList,
+					param,
+				} = this
+				let newList = await this.$api.order.getAddClockOrder(param);
+
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+			},
+			// 取消/删除订单
+			async toCancel(index) {
+				let {
+					id,
+					order_code,
+					order_goods,
+					pay_type,
+				} = this.list.data[index]
+				let {
+					goods_cover: image,
+				} = order_goods[0]
+				this.popupInfo = {
+					id,
+					name: `系统单号：${order_code}`,
+					image,
+					index,
+				}
+				let refs_key = pay_type == 1 ? 'cancel_item' : 'del_item'
+				this.$refs[refs_key].open()
+			},
+			// 确认：取消订单
+			async confirmCancel() {
+				let {
+					id,
+					index,
+				} = this.popupInfo
+				await this.$api.order.cancelOrder({
+					id
+				})
+				if (this.activeIndex == 0) {
+					this.list.data[index].pay_type = -1
+				} else {
+					this.list.data.splice(index, 1)
+				}
+				this.$util.showToast({
+					title: `取消成功`
+				})
+				this.$refs.cancel_item.close()
+			},
+			// 确认：删除订单
+			async confirmDel() {
+				let {
+					id,
+					index,
+				} = this.popupInfo
+				await this.$api.order.delOrder({
+					id
+				})
+				this.list.data.splice(index, 1)
+				this.$util.showToast({
+					title: `删除成功`
+				})
+				this.$refs.del_item.close()
+				this.$util.back()
+			},
+			// 去支付
+			async toPay(index) {
+				if (this.lockTap) return;
+				this.lockTap = true;
+				this.$util.showLoading()
+				let {
+					id,
+					pay_model
+				} = this.list.data[index]
+
+				try {
+					let {
+						pay_list
+					} = await this.$api.order.rePayOrder({
+						id
+					})
+					this.$util.hideAll()
+					if (pay_list) {
+						if (pay_model == 3) {
+							pay_list = {
+								orderInfo: pay_list,
+								provider: 'alipay'
+							}
+						}
+
+						// #ifdef H5
+
+						if (pay_model == 3) {
+							pay_list = Object.assign({}, pay_list, {
+								order_id: id,
+								page_url: `/pages/order?tab=2`
+							})
+							this.updateOrderItem({
+								key: 'alipayOrderParams',
+								val: pay_list
+							})
+							this.$util.goUrl({
+								url: '/user/pages/alipay-result'
+							})
+							this.lockTap = false
+							setTimeout(() => {
+								this.initRefresh()
+							}, 3000)
+							return
+						}
+						// #endif
+
+						try {
+							await this.$util.pay(pay_list)
+							this.$util.showToast({
+								title: `支付成功`
+							})
+							if (this.activeIndex == 0) {
+								this.list.data[index].pay_type = 2
+							} else {
+								this.list.data.splice(index, 1)
+							}
+							this.lockTap = false;
+						} catch (e) {
+							this.$util.showToast({
+								title: `支付失败`
+							})
+							this.lockTap = false;
+							return
+						}
+					}
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+			},
+			// 去核销
+			async toHx(index) {
+				let {
+					id,
+					qr: image
+				} = this.list.data[index]
+				this.popupInfo = {
+					id,
+					image
+				}
+				this.$refs.hx_item.open()
+			},
+			// 订单详情/申请退款/去评价
+			goDetail(index, page) {
+				let {
+					id
+				} = this.list.data[index]
+				let url = `/user/pages/order/${page}?id=${id}`
+				this.$util.goUrl({
+					url
+				})
+			},
+			// 再来一单
+			async toAgain(index) {
+				let {
+					id: order_id,
+					coach_id
+				} = this.list.data[index]
+				await this.$api.order.onceMoreOrder({
+					order_id
+				})
+				this.$util.goUrl({
+					url: `/user/pages/order?id=${coach_id}`
+				})
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+</style>
diff --git a/user/pages/order/detail.vue b/user/pages/order/detail.vue
new file mode 100644
index 0000000..9429a73
--- /dev/null
+++ b/user/pages/order/detail.vue
@@ -0,0 +1,722 @@
+<template>
+	<view class="order-pages" v-if="detail.id">
+
+		<view class="item-child pd-lg fill-base f-paragraph c-base" :style="{background:primaryColor}">
+			<view class="flex-y-baseline">
+				<view class="text-bold">{{statusType[detail.pay_type]}}</view>
+				<view @tap.stop="$refs.refuse_item.open()" class="ml-md"
+					v-if="(detail.pay_type == -1 || detail.pay_type == 8) && detail.coach_refund_time">
+					{{$t('action.attendantName')}}拒单，查看原因
+				</view>
+			</view>
+			<view class="f-caption mt-sm" v-if="detail.pay_type == 1 && detail.end_time > 0">请在<min-countdown
+					:targetTime="over_time_text" @callback="countEnd"></min-countdown>内完成支付，逾期未支付，订单将自动取消</view>
+			<view class="space-lg"></view>
+		</view>
+
+		<!-- // pay_type 1待支付，2待服务，3技-师接单，4技-师出发，5技-师到达，6服务中，7服务完成 -->
+		<view
+			class="menu-list flex-warp rel ml-lg mr-lg pt-lg pb-lg pl-md pr-md fill-base f-paragraph c-caption radius-16"
+			:class="[{'add-bell':detail.is_add || detail.store_id}]">
+			<view class="menu-line abs b-1px-b"></view>
+			<block v-for="(item,index) in lineList" :key="index">
+				<view class="item-child flex-center flex-column f-icontext c-paragraph"
+					:style="{color:(detail.pay_type > item.pay_type -1) && detail.pay_type != 8 ?primaryColor:''}"
+					v-if="item.icon">
+					<view class="item-img fill-base flex-center mb-sm radius"
+						:style="{borderColor:(detail.pay_type > item.pay_type -1) && detail.pay_type != 8?primaryColor:''}">
+						<i class="iconfont" :class="item.icon"></i>
+					</view>
+					<view class="ellipsis" style="max-width:100%">{{item.title}}</view>
+				</view>
+			</block>
+		</view>
+
+
+		<view class="item-child mt-md ml-lg mr-lg pd-lg fill-base radius-16">
+			<view class="flex-between pb-lg">
+				<view class="f-paragraph c-title max-380 ellipsis">服务内容</view>
+			</view>
+			<view class="flex-warp" :class="[{'mb-lg':aindex != detail.order_goods.length -1}]"
+				v-for="(aitem,aindex) in detail.order_goods" :key="aindex">
+				<!-- #ifdef H5 -->
+				<view class="avatar lg radius-16">
+					<view class="h5-image avatar lg radius-16"
+						:style="{ backgroundImage : `url('${aitem.goods_cover}')`}">
+					</view>
+				</view>
+				<!-- #endif -->
+				<!-- #ifndef H5 -->
+				<image mode="aspectFill" class="avatar lg radius-16" :src="aitem.goods_cover"></image>
+				<!-- #endif -->
+				<view class="flex-1 ml-md">
+					<view class="flex-between">
+						<view class="f-mini-title c-title text-bold ellipsis"
+							:class="[{'max-300':aitem.refund_num>0},{'max-450':aitem.refund_num == 0}]">
+							{{aitem.goods_name}}
+						</view>
+						<view class="f-caption c-warning" v-if="aitem.refund_num>0">已退x{{aitem.refund_num}}</view>
+					</view>
+					<view class="f-caption c-caption">
+						服务{{$t('action.attendantName')}}：{{detail.coach_info ? detail.coach_info.coach_name : '-'}}
+					</view>
+					<view class="f-caption c-caption">服务时长：{{aitem.time_long}}分钟</view>
+					<view class="f-caption c-caption" v-if="aitem.material_price*1>0">物料费：¥{{aitem.material_price}}
+					</view>
+					<view class="flex-between">
+						<view class="flex-y-baseline f-caption c-warning">¥<view class="f-title text-bold">
+								{{aitem.price}}
+							</view>
+						</view>
+						<view class="c-paragraph">x{{aitem.num}}</view>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="store-info mt-md ml-lg mr-lg pd-lg  fill-base radius-16" v-if="detail.store_id">
+			<view class="f-mini-title c-title text-bold pb-md">
+				{{detail.store_info.title}}
+			</view>
+			<view class="flex-between">
+				<view class="flex-y-center" style="color: #303030;">
+					<i class="iconfont icondizhi1 mr-sm"></i>
+					<view class="c-title flex-1 mr-md">
+						<span>{{detail.store_info.address || `暂未设置门店地址`}}</span>
+						<span @tap.stop="$util.goUrl({url:detail.store_info.address,openType:'copy'})"
+							class="copy-btn span radius-5 f-icontext ml-sm"
+							:style="{color:primaryColor,borderColor:primaryColor}"
+							v-if="detail.store_info.address">复制</span>
+					</view>
+				</view>
+				<view class="flex-center">
+					<view @tap.stop="$util.goUrl({url:detail.store_info.phone,openType:'call'})"
+						class="item-icon rel flex-center radius-16">
+						<view class="item-icon radius-16 abs" :style="{background:primaryColor}"></view>
+						<i class="iconfont icondadianhua_1" :style="{color:primaryColor}"></i>
+					</view>
+					<view @tap.stop="toMap('store_info')" class="item-icon rel flex-center radius-16 ml-md"
+						v-if="detail.store_info.address">
+						<view class="item-icon radius-16 abs" :style="{background:primaryColor}"></view>
+						<i class="iconfont icondizhi_1" :style="{color:primaryColor}"></i>
+					</view>
+				</view>
+			</view>
+		</view>
+
+
+		<view class="mt-md ml-lg mr-lg pd-lg fill-base f-paragraph c-caption radius-16">
+			<view class="flex-between">
+				<view>下单人</view>
+				<view class="c-title">{{detail.address_info.user_name}}</view>
+			</view>
+			<view class="flex-between mt-md">
+				<view>联系方式</view>
+				<view class="c-title">{{detail.address_info.mobile}}</view>
+			</view>
+			<view class="mt-md" v-if="!detail.store_id">
+				<view>服务地址</view>
+				<view class="c-title mt-sm">{{`${detail.address_info.address}${detail.address_info.address_info}`}}
+				</view>
+			</view>
+			<view class="mt-md" v-if="detail.text">
+				<view>订单备注</view>
+				<view class="c-title mt-sm">{{detail.text}}</view>
+			</view>
+		</view>
+
+		<view class="mt-md ml-lg mr-lg pd-lg fill-base f-paragraph c-caption radius-16">
+			<view class="flex-center">
+				<image mode="aspectFill" class="avatar sm radius" :src="detail.coach_info.work_img"></image>
+				<view class="flex-1 ml-lg" :class="[{'flex-between':configInfo.order_contact_coach}]">
+					<view class="c-title max-380 ellipsis">{{detail.coach_info ? detail.coach_info.coach_name : ''}}
+					</view>
+					<view @tap.top="toTel" class="call-btn flex-center f-desc text-bold"
+						:style="{color:primaryColor,border:`1rpx solid ${primaryColor}`}"
+						v-if="configInfo.order_contact_coach">联系Ta
+					</view>
+				</view>
+			</view>
+			<view class="flex-between mt-md">
+				<view>下单时间</view>
+				<view class="c-title">{{detail.create_time}}</view>
+			</view>
+			<view class="flex-between mt-md">
+				<view>服务时间</view>
+				<view class="c-title">{{detail.start_time}}</view>
+			</view>
+			<view class="flex-between mt-md">
+				<view>服务时长</view>
+				<view class="c-title">{{detail.time_long}}分钟</view>
+			</view>
+			<block v-if="!detail.is_add && !detail.store_id">
+				<view class="flex-between mt-md">
+					<view>车费详情</view>
+					<view class="flex-y-center c-title">{{carType[detail.car_type]}}
+						<view class="ml-md" v-if="detail.car_type == 1">全程{{detail.distance}}</view>
+					</view>
+				</view>
+				<view class="flex-between mt-md" v-if="detail.car_type == 1">
+					<view>出行费用</view>
+					<view class="c-warning">出租车 ¥{{detail.car_price}}</view>
+				</view>
+			</block>
+			<view class="flex-between mt-md">
+				<view>服务项目费用</view>
+				<view class="c-warning">¥{{detail.init_service_price}}</view>
+			</view>
+			<view class="flex-between mt-md" v-if="detail.material_price*1>0">
+				<view>物料费</view>
+				<view class="c-warning">¥{{detail.material_price}}</view>
+			</view>
+			<view class="flex-between mt-md" v-if="detail.discount*1 > 0">
+				<view>卡券优惠</view>
+				<view class="c-warning">-¥{{detail.discount}}</view>
+			</view>
+			<view class="flex-between mt-md">
+				<view>支付方式</view>
+				<view class="flex-y-baseline c-title">{{payType[detail.pay_model]}}</view>
+			</view>
+			<view class="flex-between mt-md pt-md b-1px-t">
+				<view></view>
+				<view class="flex-y-baseline c-title">总计：<view class="c-warning">¥{{detail.pay_price}}</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="mt-md ml-lg mr-lg pd-lg fill-base f-paragraph c-caption radius-16">
+			<view class=" flex-y-center pb-lg flex-warp">
+				<view class="flex-between c-title">订单编号：</view>
+				<view class="flex-between flex-1 ">
+					<view class="c-title">{{detail.order_code}}</view>
+					<view class="copy-btn flex-center radius-5 f-icontext"
+						@tap.stop="$util.goUrl({openType:'copy',url:detail.order_code})"
+						:style="{borderColor:primaryColor ,color:primaryColor}">复制</view>
+				</view>
+			</view>
+			<timeline :list="lineList" :info="detail" :type="1"></timeline>
+		</view>
+
+		<view class="space-max-footer"></view>
+		<view class="footer-info fix fill-base" v-if="detail.pay_type != -1">
+			<view class="flex-between pd-lg">
+				<view></view>
+				<view class="flex-center f-desc c-title">
+					<view v-if="detail.arrive_time  != 0 && detail.start_service_time == 0">
+						<button v-if="detail.user_sure_arrival == 0" @click="arrived"   class="clear-btn item-btn flex-center f-desc" style="border-radius: 100rpx;margin-right:10px;border: 1px solid #1eb481;color: #1eb481;background:transparent;">已到达</button>
+						<button v-else   class="clear-btn item-btn flex-center f-desc" style="border-radius: 100rpx;margin-right:10px;">已到达</button>
+					</view>
+					
+					<!-- #ifndef MP-WEIXIN -->
+					<view
+						@tap.stop="detail.admin_phone ? $refs.show_phone_item.open() : $util.goUrl({url:configInfo.mobile,openType:'call'})"
+						class="item-btn flex-center f-desc radius">联系客服</view>
+					<!-- #endif -->
+					<!-- 待支付 -->
+					<block v-if="detail.pay_type == 1">
+						<view @tap.stop="toCancel" class="item-btn flex-center ml-md radius">取消订单</view>
+						<view @tap.stop="toPay" class="item-btn flex-center ml-md c-base radius"
+							:style="{background:primaryColor}">
+							去支付
+						</view>
+					</block>
+					<!-- 支付超时 -->
+					<!-- 	<block v-if="detail.pay_type == -1 || detail.pay_type == 7">
+							<view @tap.stop="toCancel" class="item-btn flex-center ml-md radius">删除</view>
+						</block> -->
+					<!-- 待服务 -->
+					<view @tap.stop="goDetail('refund')" class="item-btn flex-center ml-md radius"
+						v-if="detail.can_refund*1>0">
+						申请退款</view>
+					<!-- 服务中 -->
+					<!-- <view
+						@tap.stop="$util.goUrl({url:`/user/pages/bell/list?id=${detail.id}&coach_id=${detail.coach_id}`})"
+						class="item-btn flex-center ml-md c-base radius" :style="{background:primaryColor}"
+						v-if="detail.pay_type == 6 && (detail.is_add || (!detail.is_add && detail.can_add_order))">
+						{{detail.is_add?'升级项目':'升级/加钟'}}
+					</view> -->
+					<view
+						@tap.stop="$util.goUrl({url:`/user/pages/bell/list?id=${detail.id}&coach_id=${detail.coach_id}`})"
+						class="item-btn flex-center ml-md c-base radius" :style="{background:primaryColor}"
+						v-if="detail.pay_type == 6 && (detail.is_add || (!detail.is_add && detail.can_add_order))">
+						加钟
+					</view>
+					<!-- 已完成 -->
+					<!-- 	<block
+							v-if="detail.pay_type == 7 && !detail.is_add && (!detail.is_comment || detail.can_again)">
+							<view @tap.stop="goDetail('evaluate')" class="item-btn flex-center ml-md radius"
+								v-if="!detail.is_comment">
+								去评价</view>
+							<view @tap.stop="toAgain" class="item-btn flex-center ml-md c-base radius"
+								:style="{background:primaryColor}" v-if="detail.can_again">
+								再来一单
+							</view>
+						</block> -->
+					<view
+						@tap.stop="$util.goUrl({url:`/user/pages/order/detail?id=${detail.add_pid.id}`,openType:`redirectTo`})"
+						class="item-btn flex-center ml-md c-base radius" :style="{background:primaryColor}"
+						v-if="detail.is_add">
+						查看主订单
+					</view>
+					<view
+						@tap.stop="$util.goUrl({url:`/user/pages/order/bell-list?id=${detail.id}`,openType:`redirectTo`})"
+						class="item-btn flex-center ml-md c-base radius" :style="{background:primaryColor}"
+						v-if="detail.add_order_id && detail.add_order_id.length > 0">
+						查看加钟
+					</view>
+				</view>
+			</view>
+			<view class="space-safe"></view>
+		</view>
+
+		<common-popup @confirm="confirmCancel" ref="cancel_item" type="CANCEL_ORDER" :info="popupInfo"></common-popup>
+		<common-popup @confirm="confirmDel" ref="del_item" type="DELETE_ORDER" :info="popupInfo"></common-popup>
+
+		<uni-popup ref="refuse_item" type="center" :custom="true">
+			<view class="common-popup-content fill-base pd-lg radius-34">
+				<view class="title">拒单原因</view>
+				<scroll-view scroll-y @touchmove.stop.prevent class="refund-text mt-lg">
+					<view>
+						<text decode="emsp"
+							style="word-break:break-all;">{{detail.coach_refund_text || '没有填写原因哦'}}</text>
+					</view>
+					<!-- <view class="mt-md f-caption c-caption">拒单时间：{{detail.coach_refund_time}}</view> -->
+				</scroll-view>
+				<view class="button">
+					<view @tap.stop="$refs.refuse_item.close()" class="item-child c-base"
+						:style="{background: primaryColor,color:'#fff'}">知道了</view>
+				</view>
+			</view>
+		</uni-popup>
+
+		<uni-popup ref="show_phone_item" type="center" :maskClick="false">
+			<view class="common-popup-content fill-base pd-lg radius-34">
+				<view class="title">拨打电话</view>
+				<view class="space-lg"></view>
+				<view @tap.stop="toCallPhone(configInfo.mobile)" class="flex-between mt-md f-mini-title c-caption"
+					style="width: 100%;">
+					<view class="flex-y-center">推荐1：<view class="c-title">{{configInfo.mobile}}
+						</view>
+					</view>
+					<view :style="{color:primaryColor}">拨打</view>
+				</view>
+				<view @tap.stop="toCallPhone(detail.admin_phone)" class="flex-between mt-md f-mini-title c-caption"
+					style="width: 100%;">
+					<view class="flex-y-center">推荐2：<view class="c-title">{{detail.admin_phone}}
+						</view>
+					</view>
+					<view :style="{color:primaryColor}">拨打</view>
+				</view>
+			</view>
+			<view class="flex-center mt-lg"><i @tap.stop="$refs.show_phone_item.close()"
+					class="iconfont icon-close c-base" style="font-size: 60rpx;"></i>
+			</view>
+		</uni-popup>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	import timeline from '@/components/timeline.vue'
+	export default {
+		components: {
+			timeline
+		},
+		data() {
+			return {
+				options: {},
+				statusPayType: [1],
+				// statusPayType: [-1, 1, 7],
+				statusType: {
+					'-1': '已取消',
+					1: '待支付',
+					2: '待服务',
+					3: this.$t('action.attendantName') + '接单',
+					4: this.$t('action.attendantName') + '出发',
+					5: this.$t('action.attendantName') + '到达',
+					6: '服务中',
+					7: '已完成',
+					8: '待转单'
+				},
+				carType: {
+					0: '公交/地铁',
+					1: '出租车'
+				},
+				payType: {
+					1: '微信支付',
+					2: '余额支付',
+					3: '支付宝支付'
+				},
+				lineList: [],
+				base_service: [{
+					pay_type: 3,
+					title: this.$t('action.attendantName') + '接单',
+					time: 'receiving_time',
+					icon: 'iconjishijiedan'
+				}, {
+					pay_type: 4,
+					title: this.$t('action.attendantName') + '出发',
+					time: 'serout_time',
+					icon: 'iconjishichufa'
+				}, {
+					pay_type: 5,
+					title: this.$t('action.attendantName') + '到达',
+					time: 'arrive_time',
+					icon: 'iconjishidaoda'
+				}, {
+					pay_type: 6,
+					title: '开始服务',
+					time: 'start_service_time',
+					icon: 'iconjishifuwu'
+				}, {
+					pay_type: 7,
+					title: '服务完成',
+					time: 'order_end_time',
+					icon: 'iconjishiwancheng'
+				}, {
+					pay_type: 7,
+					title: '签字确认',
+					time: 'sign_time',
+					icon: ''
+				}],
+				base_bell: [{
+					pay_type: 3,
+					title: this.$t('action.attendantName') + '接单',
+					time: 'receiving_time',
+					icon: 'iconjishijiedan'
+				}, {
+					pay_type: 6,
+					title: '开始服务',
+					time: 'start_service_time',
+					icon: 'iconjishifuwu'
+				}, {
+					pay_type: 7,
+					title: '服务完成',
+					time: 'order_end_time',
+					icon: 'iconjishiwancheng'
+				}],
+				detail: {
+					pay_type: 0
+				},
+				popupInfo: {},
+				lockTap: false
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userPageType: state => state.user.userPageType,
+			userInfo: state => state.user.userInfo,
+			over_time_text() {
+				return new Date().getTime() + this.detail.over_time * 1000
+			}
+		}),
+		onLoad(options) {
+			this.options = options
+			this.initIndex()
+		},
+		methods: {
+			...mapActions(['getConfigInfo']),
+			...mapMutations(['updateUserItem', 'updateOrderItem']),
+			// 技师到达
+			async arrived(){
+				let param ={
+					order_id:this.detail.id,
+				
+				}
+				try {
+		          let res  = await this.$api.order.userSureArrivalOrder(param)
+					  if(res.code == 200){
+						this.$util.showToast({
+							title: `确认成功`
+						})
+                       this.initIndex()
+					  }else{
+						this.$util.showToast({
+							title: `该订单已确认`
+						})
+					  }
+				
+			
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+					return
+				}
+			},
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				if (!refresh) {
+					await this.getConfigInfo()
+				}
+				let {
+					id
+				} = this.options
+				let data = await this.$api.order.orderInfo({
+					id
+				})
+				
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				data.is_balance = data.balance * 1 > 0 ? 1 : 0
+				let {
+					is_add = 0,
+						store_id = 0
+				} = data
+				let lineList = this.$util.deepCopy(is_add || store_id ? this.base_bell : this.base_service)
+				if (store_id) {
+					lineList.push({
+						pay_type: 7,
+						title: '签字确认',
+						time: 'sign_time',
+						icon: ''
+					})
+				}
+				this.lineList = lineList
+				this.detail = data
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			countEnd() {
+				this.$util.log("倒计时完了")
+				setTimeout(() => {
+					this.initRefresh()
+					this.$util.back()
+				}, 1000)
+			},
+			// 取消/删除订单
+			async toCancel() {
+				let {
+					order_code,
+					order_goods,
+					pay_type
+				} = this.detail
+				let {
+					goods_cover: image,
+				} = order_goods[0]
+				this.popupInfo = {
+					name: `系统单号：${order_code}`,
+					image,
+				}
+				let refs_key = pay_type == 1 ? 'cancel_item' : 'del_item'
+				this.$refs[refs_key].open()
+			},
+			// 确认：取消订单
+			async confirmCancel() {
+				let {
+					id,
+				} = this.detail
+				await this.$api.order.cancelOrder({
+					id
+				})
+				this.$util.showToast({
+					title: `取消成功`
+				})
+				this.detail.pay_type = -1
+				this.$refs.cancel_item.close()
+				this.$util.back()
+			},
+			// 确认：删除订单
+			async confirmDel() {
+				let {
+					id,
+				} = this.detail
+				await this.$api.order.delOrder({
+					id
+				})
+				this.$util.showToast({
+					title: `删除成功`
+				})
+				this.$refs.del_item.close()
+				this.$util.back()
+				setTimeout(() => {
+					this.$util.goUrl({
+						url: 1,
+						openType: 'navigateBack'
+					})
+				}, 1000)
+			},
+			// 去支付
+			async toPay(index) {
+				if (this.lockTap) return;
+				this.lockTap = true;
+				this.$util.showLoading()
+				let {
+					id,
+					pay_model
+				} = this.detail
+
+				try {
+					let {
+						pay_list
+					} = await this.$api.order.rePayOrder({
+						id
+					})
+					this.$util.hideAll()
+					if (pay_list) {
+						if (pay_model == 3) {
+							pay_list = {
+								orderInfo: pay_list,
+								provider: 'alipay'
+							}
+						}
+
+						// #ifdef H5
+
+						if (pay_model == 3) {
+							pay_list = Object.assign({}, pay_list, {
+								order_id: id,
+								page_url: `/user/pages/order/detail?id=${id}`
+							})
+							this.updateOrderItem({
+								key: 'alipayOrderParams',
+								val: pay_list
+							})
+							this.$util.goUrl({
+								url: '/user/pages/alipay-result'
+							})
+							this.lockTap = false;
+							setTimeout(() => {
+								this.initRefresh()
+								this.$util.back()
+							}, 3000)
+							return
+						}
+						// #endif
+
+
+						try {
+							await this.$util.pay(pay_list)
+							this.$util.showToast({
+								title: `支付成功`
+							})
+							this.initRefresh()
+							this.lockTap = false;
+							this.$util.back()
+						} catch (e) {
+							this.$util.showToast({
+								title: `支付失败`
+							})
+							this.lockTap = false;
+							return;
+						}
+					}
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+			},
+			// 订单详情/申请退款/去评价/签字确认
+			goDetail(page) {
+				let {
+					id
+				} = this.options
+				let url = `/user/pages/order/${page}?id=${id}`
+				this.$util.goUrl({
+					url
+				})
+			},
+			// 再来一单
+			async toAgain() {
+				let {
+					id: order_id,
+					coach_id
+				} = this.detail
+
+				await this.$api.order.onceMoreOrder({
+					order_id
+				})
+				this.$util.goUrl({
+					url: `/user/pages/order?id=${coach_id}`
+				})
+			},
+			// 联系技-师
+			async toTel() {
+				let {
+					id: order_id,
+					pay_type
+				} = this.detail
+				if ([2, 3, 4, 5, 6].includes(pay_type)) {
+					let url = await this.$api.order.getVirtualPhone({
+						order_id
+					})
+					this.$util.goUrl({
+						url,
+						openType: `call`
+					})
+				} else {
+					let msg = pay_type == 7 ? '服务结束' : '服务取消'
+					this.$util.showToast({
+						title: `${msg}不能联系${this.$t('action.attendantName')}哦`
+					})
+				}
+			},
+			toCallPhone(url) {
+				this.$refs.show_phone_item.close()
+				this.$util.goUrl({
+					url,
+					openType: 'call'
+				})
+			},
+			// 查看定位
+			async toMap(key) {
+				let {
+					address,
+					address_info = '',
+					lat,
+					lng
+				} = this.detail[key]
+				await this.$util.checkAuth({
+					type: 'userLocation'
+				})
+				await uni.getLocation({
+					type: 'gcj02',
+				})
+				await uni.openLocation({
+					latitude: lat * 1,
+					longitude: lng * 1,
+					name: address_info ? `${address} ${address_info}` : address,
+					scale: 28
+				})
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.order-pages {
+		.call-btn {
+			width: 128rpx;
+			height: 49rpx;
+			border-radius: 8rpx
+		}
+	}
+
+	.common-popup-content {
+		.refund-text {
+			width: 540rpx;
+			min-height: 200rpx;
+			max-height: 50vh;
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/user/pages/order/evaluate.vue b/user/pages/order/evaluate.vue
new file mode 100644
index 0000000..6b8607c
--- /dev/null
+++ b/user/pages/order/evaluate.vue
@@ -0,0 +1,211 @@
+<template>
+	<view class="user-order-evaluate" v-if="isLoad">
+		<view class="fill-base pd-lg">
+			<view class="f-title c-title pb-md">总体评价</view>
+			<view class="flex-between">
+				<view class="flex-warp">
+					<block v-for="(item,index) in 5" :key="index">
+						<i @tap="checkStar(1,index*1+1)" class="star-icon text-bold iconfont mr-sm"
+							:class="[{'iconyduixingxingkongxin':star<index*1+1},{'iconyduixingxingshixin':star>=index*1+1}]"
+							:style="{color:primaryColor}"></i>
+					</block>
+				</view>
+				<view class="f-paragraph c-caption">{{star ? startObj[star - 1] : '请选择星级'}}</view>
+			</view>
+		</view>
+		<view class="fill-base pd-lg">
+			<view class="f-title c-title">服务项目</view>
+			<block v-for="(aitem,aindex) in service_star" :key="aindex">
+				<view class="f-paragraph c-paragraph pt-md pb-md">{{aitem.title}}</view>
+				<view class="flex-between">
+					<view class="flex-warp">
+						<block v-for="(item,index) in 5" :key="index">
+							<i @tap="checkStar(2,index*1+1,aindex)" class="star-icon text-bold iconfont mr-sm"
+								:class="[{'iconyduixingxingkongxin':aitem.star<index*1+1},{'iconyduixingxingshixin':aitem.star>=index*1+1}]"
+								:style="{color:primaryColor}"></i>
+						</block>
+					</view>
+				</view>
+			</block>
+		</view>
+		<view class="fill-body pt-md pb-md pl-lg f-caption c-caption">您的评价对我们很重要哦</view>
+		<view class="fill-body radius-5 mt-lg ml-lg mr-lg pd-lg">
+			<textarea v-model="text" class="f-paragraph c-caption" style="width: auto;" maxlength="300"
+				placeholder="请输入评价内容"></textarea>
+			<view class="pt-md f-caption c-nodata text-right">已输入{{text.length > 300 ? 300 : text.length}}/300
+			</view>
+		</view>
+		<view class="flex-warp f-caption c-title pd-lg">
+			<view @tap.stop="toChangeItem(index)"
+				class="label-item fill-body flex-center mr-md mb-md pl-lg pr-lg radius"
+				:class="[{'c-base':item.is_check}]" :style="{background:item.is_check ? primaryColor : ''}"
+				v-for="(item,index) in lableList" :key="index">
+				{{item.title}}
+			</view>
+		</view>
+
+		<view class="space-max-footer"></view>
+		<fix-bottom-button @confirm="toSubmit" :text="[{type:'confirm',text:'提交'}]" bgColor="#fff">
+		</fix-bottom-button>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		data() {
+			return {
+				isLoad: false,
+				options: {},
+				startObj: ['不满意', '一般', '满意', '很满意', '非常满意'],
+				star: 0,
+				service_star: [],
+				lableList: [],
+				text: '',
+				lockTap: false
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+		}),
+		async onLoad(options) {
+			this.$util.showLoading()
+			this.options = options
+			this.initIndex()
+		},
+		methods: {
+			...mapMutations([]),
+			async initIndex() {
+				// #ifdef H5
+				if (this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				let {
+					id
+				} = this.options
+				let [order, label] = await Promise.all([this.$api.order.orderInfo({
+					id
+				}), this.$api.order.lableList()])
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				let service_star = order.order_goods.map(item => {
+					return {
+						service_id: item.goods_id,
+						star: 5,
+						title: item.goods_name
+					}
+				})
+				label.map(item => {
+					item.is_check = false
+				})
+				this.lableList = label
+				this.service_star = service_star
+				this.$util.hideAll()
+				this.isLoad = true
+			},
+			checkStar(type, star, index = 0) {
+				if (type == 1) {
+					this.star = star * 1
+				} else {
+					let service_star = this.$util.deepCopy(this.service_star)
+					service_star[index].star = star * 1
+					this.service_star = service_star
+				}
+			},
+			toChangeItem(index) {
+				let {
+					is_check
+				} = this.lableList[index]
+				this.lableList[index].is_check = !is_check
+			},
+			async toSubmit() {
+				let {
+					options,
+					star,
+					text
+				} = this
+				let {
+					id: order_id
+				} = options
+				if (!star) {
+					this.$util.showToast({
+						title: '请选择总体评价星级'
+					})
+					return
+				}
+				if (!text) {
+					this.$util.showToast({
+						title: '请输入评价内容'
+					})
+					return
+				}
+				let lable = []
+				this.lableList.map(item => {
+					if (!item.is_check) return
+					lable.push(item.id)
+				})
+				let service_star = this.$util.deepCopy(this.service_star)
+				service_star.map(item => {
+					delete item.title
+				})
+				let param = {
+					order_id,
+					star,
+					service_star,
+					text,
+					lable
+				}
+				if (this.lockTap) return
+				this.lockTap = true
+				this.$util.showLoading()
+				try {
+					await this.$api.order.addComment(param)
+					this.$util.hideAll()
+					this.$util.showToast({
+						title: `评论成功`,
+					});
+					this.lockTap = false
+					setTimeout(() => {
+						this.$util.back()
+						this.$util.goUrl({
+							url: 1,
+							openType: `navigateBack`
+						})
+					}, 1000)
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background: #fff;
+	}
+
+	.user-order-evaluate {
+		.star-icon {
+			font-size: 40rpx;
+		}
+
+		.label-item {
+			height: 60rpx;
+		}
+
+	}
+</style>
diff --git a/user/pages/order/refund.vue b/user/pages/order/refund.vue
new file mode 100644
index 0000000..03c7125
--- /dev/null
+++ b/user/pages/order/refund.vue
@@ -0,0 +1,437 @@
+<template>
+	<view class="user-order-refund" v-if="detail.id">
+		<view class="item-child mt-md ml-lg mr-lg pd-lg fill-base radius-16">
+			<view class="flex-between pb-lg b-1px-b">
+				<view class="f-paragraph c-title max-380 ellipsis">订单号：{{detail.order_code}}</view>
+				<view class="f-caption text-bold"
+					:style="{color:detail.pay_type==2?primaryColor: detail.pay_type<6?subColor: detail.pay_type == 6 ? '#11C95E' : '#333'}">
+					{{statusType[detail.pay_type]}}
+				</view>
+			</view>
+			<block v-for="(item,index) in detail.order_goods" :key="index">
+				<view @tap="handerRadioChange(index)" class="item-child flex-center mt-lg"
+					v-if="item.can_refund_num > 0">
+					<i class="iconfont mr-md" :class="[{'icon-xuanze':!item.checked},{'icon-xuanze-fill':item.checked}]"
+						:style="{color:item.checked ? primaryColor : ''}"></i>
+					<view class="flex-1">
+						<view class="flex-warp">
+							<!-- #ifdef H5 -->
+							<view class="goods-img radius-16">
+								<view class="h5-image goods-img radius-16"
+									:style="{ backgroundImage : `url('${item.goods_cover}')`}">
+								</view>
+							</view>
+							<!-- #endif -->
+							<!-- #ifndef H5 -->
+							<image mode="aspectFill" class="goods-img radius-16" :src="item.goods_cover"></image>
+							<!-- #endif -->
+
+							<view class="flex-1 ml-md max-380">
+								<view class="f-title c-title text-bold max-450 ellipsis">{{item.goods_name}}</view>
+								<view class="f-caption c-caption">
+									服务{{$t('action.attendantName')}}：{{detail.coach_info ? detail.coach_info.coach_name : '-'}}
+								</view>
+								<view class="f-caption c-caption">{{detail.start_time}}</view>
+								<view class="f-caption c-caption" v-if="item.material_price*1>0">
+									物料费：¥{{item.material_price}}
+								</view>
+								<view class="flex-between">
+									<view class="flex-y-baseline f-caption c-warning">¥<view class="f-title text-bold">
+											{{item.true_price}}
+										</view>
+									</view>
+									<view class="flex-warp" v-if="item.can_refund_num > 1">
+										<button @tap.stop="changeNum(index,-1)" class="reduce"
+											:style="{borderColor:primaryColor,color:primaryColor}"><i
+												class="iconfont icon-jian-bold"></i></button>
+										<button class="addreduce clear-btn">{{item.apply_num}}</button>
+										<button @tap.stop="changeNum(index,1)" class="add"
+											:style="{background:primaryColor,borderColor:primaryColor}"><i
+												class="iconfont icon-jia-bold"></i></button>
+									</view>
+									<view class="c-paragraph" v-else>x{{item.apply_num}}</view>
+								</view>
+
+							</view>
+						</view>
+					</view>
+				</view>
+			</block>
+			<view class="mt-lg pt-lg pb-lg f-paragraph c-title b-1px-t"
+				v-if="detail.can_refund_material_price || (detail.can_refund_car_price &&  detail.car_price*1>0)">
+				<view class="flex-between">
+					<view>服务金额</view>
+					<view>¥{{detail.can_refund_price}}</view>
+				</view>
+				<view class="flex-between mt-sm" v-if="detail.can_refund_material_price">
+					<view>物料费</view>
+					<view>¥{{detail.can_refund_material_price}}</view>
+				</view>
+				<view class="flex-between mt-sm" v-if="detail.can_refund_car_price &&  detail.car_price*1>0">
+					<view class="flex-y-baseline">车费<view class="f-icontext c-warning ml-sm">
+							{{$t('action.attendantName')}}出发前全部服务退款将退还
+						</view>
+					</view>
+					<view>¥{{detail.car_price}}</view>
+				</view>
+			</view>
+			<view class="pt-lg f-paragraph c-title flex-between b-1px-t">
+				<view>合计</view>
+				<view class="f-title c-warning text-bold">
+					{{`${can_refund_price}元`}}
+				</view>
+			</view>
+		</view>
+		<view class="item-child mt-md ml-lg mr-lg pd-lg fill-base radius-16">
+			<view class="flex-between pb-lg f-title c-title text-bold">退款原因</view>
+			<view class="textarea-info f-caption c-caption radius-16">
+				<textarea v-model="form.text" class="input-textarea f-paragraph pd-lg" placeholder-class="f-paragraph"
+					maxlength="300" placeholder="输入退款原因" />
+				<view class="text-right pb-lg pr-lg">{{form.text.length>300?300:form.text.length}}/300</view>
+			</view>
+		</view>
+		<view class="item-child mt-md ml-lg mr-lg pt-lg pl-lg pr-lg fill-base radius-16">
+			<view class="flex-between pb-sm f-title c-title text-bold">上传图片</view>
+			<view class="flex-between pt-sm">
+				<upload @del="imgDel" @upload="imgUpload" :imagelist="form.imgs" imgtype="imgs" imgclass="mini"
+					text="添加照片" :imgsize="5"></upload>
+			</view>
+			<view class="space-lg" v-if="form.imgs.length == 0"></view>
+			<view class="space-sm" v-else></view>
+		</view>
+
+		<view class="space-max-footer"></view>
+
+		<view class="refund-bottom-info fill-base fix pl-lg pr-lg">
+			<view class="flex-between">
+				<view @tap="selectAllItem" class="flex-y-center"><i class="iconfont mr-sm"
+						:class="[{'icon-xuanze':!selectAll},{'icon-xuanze-fill':selectAll}]"
+						:style="{color:selectAll? primaryColor : ''}"></i>
+					全选
+				</view>
+				<view class="text-right flex-center">
+					<view class="flex-y-center">
+						<view class="f-caption c-caption mr-sm">共{{total_refund_num}}件</view>
+						退款金额<view class="flex-y-baseline f-caption c-warning">¥<view class="f-title text-bold">
+								{{total_refund_price}}
+							</view>
+						</view>
+					</view>
+					<button @tap.stop="toSubmit" class="clear-btn order"
+						:style="{color:'#fff',background:primaryColor,borderColor:primaryColor}">提交申请</button>
+				</view>
+			</view>
+			<view class="space-safe"></view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		data() {
+			return {
+				options: {},
+				detail: {},
+				statusType: {
+					'-1': '已取消',
+					1: '待支付',
+					2: '待服务',
+					3: this.$t('action.attendantName') + '接单',
+					4: this.$t('action.attendantName') + '出发',
+					5: this.$t('action.attendantName') + '到达',
+					6: '服务中',
+					7: '已完成',
+					8: '已评价',
+				},
+				total_refund_num: 0,
+				total_refund_price: 0,
+				can_refund_num: 0,
+				can_refund_price: 0,
+				selectAll: false,
+				selectAdd: false,
+				form: {
+					text: '',
+					imgs: []
+				},
+				lockTap: false
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+		}),
+		onLoad(options) {
+			this.options = options
+			this.initIndex()
+		},
+		methods: {
+			...mapMutations(['updateUserItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				let {
+					id
+				} = this.options
+				let data = await this.$api.order.orderInfo({
+					id
+				})
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+
+				let {
+					car_price,
+					can_refund_car_price = 0
+				} = data
+
+				let num = 0
+				let can_refund_price = 0
+				let can_refund_material_price = 0
+				data.order_goods.map(item => {
+					num += item.can_refund_num
+					item.apply_num = item.can_refund_num
+					item.checked = item.can_refund_num < 1
+					if (item.apply_num > 0) {
+						can_refund_price += item.true_price * item.apply_num
+						can_refund_material_price += item.material_price * item.apply_num
+					}
+				})
+				let total_price = (can_refund_price * 1).toFixed(2)
+				let material_price = (can_refund_material_price * 1).toFixed(2)
+				data.can_refund_price = total_price
+				data.can_refund_material_price = material_price
+				this.detail = data
+				this.can_refund_num = num
+				let car_total_price = can_refund_car_price ? car_price : 0
+				this.can_refund_price = (total_price * 1 + material_price * 1 + car_total_price * 1).toFixed(2)
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			imgDel(e) {
+				let {
+					imagelist,
+					imgtype
+				} = e;
+				this.form[imgtype] = imagelist;
+			},
+			imgUpload(e) {
+				let {
+					imagelist,
+					imgtype
+				} = e;
+				this.form[imgtype] = imagelist;
+			},
+			handerRadioChange(index) {
+				let item = this.detail.order_goods[index];
+				if (item.can_refund_num < 1) return
+				let newChecked = !item.checked;
+				this.detail.order_goods[index].checked = newChecked;
+				this.checkIsSelectAll();
+			},
+			handerAddRadioChange() {
+				let {
+					add_price
+				} = this.detail
+				if (!add_price * 1) return
+				this.selectAdd = !this.selectAdd
+				this.checkIsSelectAll()
+			},
+			async changeNum(index, mod) {
+				let item = this.detail.order_goods[index];
+				let num = item.apply_num + mod;
+				if (num < 1) {
+					this.$util.showToast({
+						title: `此商品最少可退1件`
+					})
+					return;
+				}
+				if (num > item.can_refund_num) {
+					this.$util.showToast({
+						title: `此商品最多可退${item.can_refund_num}件`
+					})
+					return;
+				}
+				this.detail.order_goods[index].apply_num = num;
+				this.countPrice();
+			},
+			selectAllItem() {
+				this.detail.order_goods.map((item) => {
+					if (item.can_refund_num < 1) return
+					item.checked = !this.selectAll
+				})
+				this.checkIsSelectAll();
+			},
+			checkIsSelectAll() {
+				let list = []
+				this.detail.order_goods.map(item => {
+					if (item.can_refund_num < 1) return
+					list.push(item)
+				})
+				this.selectAll = list.every((item) => {
+					return item.checked
+				})
+				this.countPrice();
+			},
+			countPrice() {
+				let {
+					can_refund_num
+				} = this
+				let {
+					car_price,
+					can_refund_car_price = 0
+				} = this.detail
+				let price = 0
+				let num = 0
+				let list = []
+				this.detail.order_goods.forEach(item => {
+					if (item.can_refund_num < 1) return
+					list.push(item)
+				})
+				list.forEach((item, index) => {
+					if (item.checked) {
+						price += parseFloat(item.true_price * 1 + item.material_price * 1) * item.apply_num;
+						num += item.apply_num
+					}
+				})
+				let total_price = price.toFixed(2) * 1
+				this.total_refund_num = num
+				this.total_refund_price = can_refund_car_price && can_refund_num == num ? (total_price +
+					car_price * 1).toFixed(2) : total_price
+			},
+			// 提交申请
+			async toSubmit() {
+				let {
+					id: order_id,
+					order_goods,
+				} = this.detail
+				let list = []
+				order_goods.filter(item => {
+					if (item.checked) {
+						if (item.apply_num < 1) return
+						list.push({
+							id: item.id,
+							num: item.apply_num
+						})
+					}
+				})
+				if (list.length < 1) {
+					this.$util.showToast({
+						title: `请选择商品`,
+					});
+					return
+				}
+				let param = this.$util.deepCopy(this.form)
+				if (!param.text) {
+					this.$util.showToast({
+						title: `请输入退款原因`,
+					});
+					return
+				}
+				param.imgs = param.imgs.length > 0 ? param.imgs.map(item => {
+					return item.path
+				}) : []
+				param = Object.assign({}, param, {
+					order_id,
+					list
+				})
+
+				if (this.lockTap) return
+				this.lockTap = true
+				this.$util.showLoading()
+				try {
+					await this.$api.order.applyOrder(param)
+					this.$util.hideAll()
+					this.$util.showToast({
+						title: `提交成功`,
+					});
+					this.lockTap = false
+					setTimeout(() => {
+						this.$util.back()
+						this.$util.goUrl({
+							url: 1,
+							openType: `navigateBack`
+						})
+					}, 1000)
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+			},
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.user-order-refund {
+
+
+		.item-child {
+
+			.icon-xuanze,
+			.icon-xuanze-fill {
+				font-size: 38rpx;
+			}
+
+			.goods-img {
+				width: 172rpx;
+				height: 172rpx;
+			}
+
+			.goods-spe {
+				height: 44rpx;
+				line-height: 44rpx;
+				background: #F7F7F7;
+			}
+
+			.goods-num {
+				width: 200rpx;
+			}
+
+
+			.textarea-info {
+				background: #F7F7F7;
+
+				.input-textarea {
+					width: 570rpx;
+					height: 300rpx;
+				}
+			}
+
+
+		}
+
+		.refund-bottom-info {
+			bottom: 0;
+
+			.iconfont {
+				font-size: 38rpx;
+			}
+
+			.text-right {
+				height: 110rpx;
+
+				.order {
+					margin-top: 0;
+					border-radius: 30rpx;
+				}
+			}
+
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/user/pages/order/sign.vue b/user/pages/order/sign.vue
new file mode 100644
index 0000000..1cb93f8
--- /dev/null
+++ b/user/pages/order/sign.vue
@@ -0,0 +1,117 @@
+<template>
+	<view class="user-order-sign" v-if="isLoad">
+		<v-sign :width="winWidth + 'px'" :height="winWidth*2" :bgColor="subColor" @init="onSignInit">
+			<view class="control-area">
+				<v-sign-pen :active-color="primaryColor"></v-sign-pen>
+				<view class="space-sm"></view>
+				<v-sign-color></v-sign-color>
+			</view>
+		</v-sign>
+
+
+		<view class="space-max-footer"></view>
+
+		<fix-bottom-button @cancel="signCtx.clear()" @confirm="confirmSign"
+			:text="[{text:'清空签名',type:'cancel'},{text:'确定完成',type:'confirm'}]" bgColor="#fff" :classType="2">
+		</fix-bottom-button>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	export default {
+		data() {
+			return {
+				isLoad: false,
+				winWidth: 0
+			};
+		},
+		onLoad(options) {
+			this.options = options
+			this.initIndex()
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+		}),
+		methods: {
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif 
+				const {
+					windowWidth
+				} = uni.getSystemInfoSync()
+				this.winWidth = windowWidth
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				this.isLoad = true
+			},
+			onSignInit(signCtx) {
+				this.signCtx = signCtx;
+			},
+			save(res) {
+			},
+			async confirmSign(item) {
+				let line = this.signCtx.getLineData()
+				if (line == 0) {
+					this.$util.showToast({
+						title: `请先进行签名`
+					})
+					return
+
+				}
+				const filePath = await this.signCtx.canvasToTempFilePath()
+				this.$util.showLoading()
+				let {
+					attachment_path: sign_img
+				} = await this.$api.base.uploadFile({
+					filePath,
+					formData: {
+						type: 'picture'
+					}
+				})
+				let {
+					id
+				} = this.options
+				await this.$api.order.userSignOrder({
+					id,
+					sign_img
+				})
+				this.$util.hideAll()
+				this.$util.showToast({
+					title: `签名成功`
+				})
+				setTimeout(() => {
+					this.$util.back()
+					this.$util.goUrl({
+						url: 1,
+						openType: `navigateBack`
+					})
+				}, 1000)
+
+			}
+		},
+	};
+</script>
+
+<style lang="scss" scoped>
+	.user-order-sign {
+		width: 100vw;
+		height: 100vh;
+
+		.control-area {
+			padding: 10rpx;
+		}
+	}
+</style>
diff --git a/user/pages/phone-code.vue b/user/pages/phone-code.vue
new file mode 100644
index 0000000..8eb3ed2
--- /dev/null
+++ b/user/pages/phone-code.vue
@@ -0,0 +1,190 @@
+<template>
+	<view class="mine-pages-phone flex-center flex-column">
+		<view class="title c-black">请输入验证码</view>
+		<view class="flex-y-center f-caption c-caption mt-lg">验证码已发送至<view class="ml-sm" :style="{color:primaryColor}">
+				{{subForm.phone}}
+			</view>
+		</view>
+		<view class="space-lg"></view>
+		<view class="space-lg"></view>
+		<view class="space-md"></view>
+
+		<view>
+			<xt-verify-code v-model="subForm.short_code" @confirm="confirm"></xt-verify-code>
+		</view>
+
+		<view class="flex-center f-caption c-caption mt-lg">
+			<view class="flex-center" v-if="authTime > 0">
+				<view class="c-title mr-sm">{{`${authTime}s`}}</view>后
+			</view>
+			<view @tap="toResetCode" :style="{color:authTime > 0?'':primaryColor}">重新获取</view>
+		</view>
+
+		<view @tap="submit" class="confirm-btn flex-center f-sm-title text-bold c-base radius-16"
+			:style="{background:subForm.short_code.length > 0 ? primaryColor:'#CCE9DD'}">确定
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	import xtVerifyCode from "@/components/xt-verify-code"
+	export default {
+		components: {
+			xtVerifyCode
+		},
+		data() {
+			return {
+				isLoad: false,
+				options: {},
+				authTime: 60,
+				timer: null,
+				subForm: {
+					phone: '',
+					short_code: ''
+				},
+				rule: [{
+					name: "short_code",
+					checkType: "isNotNull",
+					errorMsg: "请输入短信验证码",
+					regText: "短信验证码"
+				}],
+				lockTap: false,
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+		}),
+		async onLoad(options) {
+			let {
+				phone
+			} = options
+			this.subForm.phone = phone
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+			this.initIndex()
+		},
+		methods: {
+			...mapActions(['getUserInfo']),
+			...mapMutations(['updateUserItem']),
+			async initIndex() {
+				let time = 60
+				this.timer = setInterval(() => {
+					if (time === 0) {
+						clearInterval(this.timer)
+						return
+					}
+					time--
+					this.authTime = time
+				}, 1000)
+			},
+			initRefresh() {
+				this.initIndex()
+			},
+			async toResetCode() {
+				let {
+					authTime
+				} = this
+				if (authTime) return
+				this.timer && clearTimeout(this.timer)
+				let {
+					phone
+				} = this.subForm
+				await this.$api.user.sendShortMsg({
+					phone
+				})
+				this.$util.showToast({
+					title: `验证码发送成功`
+				})
+				this.initRefresh()
+			},
+			confirm() {
+
+			},
+			//表单验证
+			validate(param) {
+				let validate = new this.$util.Validate();
+				this.rule.map(item => {
+					let {
+						name,
+					} = item
+					validate.add(param[name], item);
+				})
+				let message = validate.start();
+				return message;
+			},
+			async submit() {
+				let param = this.$util.deepCopy(this.subForm)
+				let msg = this.validate(param);
+				if (msg) {
+					this.$util.showToast({
+						title: msg
+					})
+					return
+				}
+				if (this.lockTap) return
+				this.lockTap = true
+				this.$util.showLoading()
+				try {
+					await this.$api.user.bindUserPhone(param)
+					this.$util.hideAll()
+					this.lockTap = false
+					this.timer && clearTimeout(this.timer)
+					this.updateUserItem({
+						key: 'isShowLogin',
+						val: false
+					})
+					await this.getUserInfo()
+					setTimeout(() => {
+						let {
+							loginPage: url
+						} = this
+						let pageArr = ['/pages/service', '/pages/technician', '/pages/order', '/pages/mine']
+						let openType = pageArr.includes(url) ? `reLaunch` : `navigateBack`
+						this.$util.goUrl({
+							url: pageArr.includes(url) ? url : 3,
+							openType
+						})
+					}, 1000)
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	page {
+		background: #fff;
+	}
+
+	.mine-pages-phone {
+		.title {
+			font-size: 54rpx;
+			margin-top: 80rpx;
+		}
+
+		.confirm-btn {
+			width: 630rpx;
+			height: 110rpx;
+			background: #F7F7F7;
+			margin-top: 40rpx;
+
+			.item-input {
+				height: 110rpx;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/user/pages/phone.vue b/user/pages/phone.vue
new file mode 100644
index 0000000..39eb40b
--- /dev/null
+++ b/user/pages/phone.vue
@@ -0,0 +1,122 @@
+<template>
+	<view class="mine-pages-phone flex-center flex-column">
+		<view class="title c-black">请输入手机号</view>
+		<view class="confirm-btn radius-16">
+			<input v-model="subForm.phone" type="number" class="item-input flex-y-center pl-lg pr-lg f-sm-title c-title"
+				placeholder-class="c-placeholder" :placeholder="rule[0].errorMsg" />
+		</view>
+
+		<view @tap="submit" class="confirm-btn flex-center f-sm-title text-bold c-base radius-16"
+			:style="{background:subForm.phone.length > 0 ? primaryColor:'#CCE9DD'}">下一步
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		data() {
+			return {
+				isLoad: false,
+				options: {},
+				subForm: {
+					phone: ''
+				},
+				rule: [{
+					name: "phone",
+					checkType: "isMobile",
+					errorMsg: "请输入手机号",
+					regText: "手机号"
+				}],
+				lockTap: false
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+		}),
+		async onLoad(options) {
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+		},
+		methods: {
+			...mapActions(['getUserInfo']),
+			...mapMutations(['updateUserItem']),
+			async initIndex() {
+
+			},
+			//表单验证
+			validate(param) {
+				let validate = new this.$util.Validate();
+				this.rule.map(item => {
+					let {
+						name,
+					} = item
+					validate.add(param[name], item);
+				})
+				let message = validate.start();
+				return message;
+			},
+			async submit() {
+				let param = this.$util.deepCopy(this.subForm)
+				let msg = this.validate(param);
+				if (msg) {
+					this.$util.showToast({
+						title: msg
+					})
+					return
+				}
+				if (this.lockTap) return
+				this.lockTap = true
+				this.$util.showLoading()
+				try {
+					await this.$api.user.sendShortMsg(param)
+					this.$util.hideAll()
+					this.lockTap = false
+					setTimeout(() => {
+						this.$util.goUrl({
+							url: `/user/pages/phone-code?phone=${param.phone}`
+						})
+					}, 1000)
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	page {
+		background: #fff;
+	}
+
+	.mine-pages-phone {
+		.title {
+			font-size: 54rpx;
+			margin: 80rpx 0;
+
+		}
+
+		.confirm-btn {
+			width: 630rpx;
+			height: 110rpx;
+			background: #F7F7F7;
+			margin-top: 40rpx;
+
+			.item-input {
+				height: 110rpx;
+			}
+		}
+	}
+</style>
diff --git a/user/pages/protocol.vue b/user/pages/protocol.vue
new file mode 100644
index 0000000..5105703
--- /dev/null
+++ b/user/pages/protocol.vue
@@ -0,0 +1,71 @@
+<template>
+	<view class="user-pages-protocol fill-base" v-if="isLoad">
+		<view class="pd-lg f-paragraph">
+			<parser :html="detail.login_protocol" @linkpress="linkpress" show-with-animation lazy-load>加载中...
+			</parser>
+		</view>
+		<view class="space-footer"></view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	import parser from "@/components/jyf-Parser/index"
+	export default {
+		components: {
+			parser
+		},
+		data() {
+			return {
+				options: {},
+				isLoad: false,
+				detail: {}
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+			loginPage: state => state.user.loginPage,
+		}),
+		onLoad(options) {
+			this.options = options
+			this.$util.showLoading()
+			this.initIndex()
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getUserInfo']),
+			...mapMutations(['updateUserItem']),
+			async initIndex(refresh = false) {
+				let data = await this.$api.base.getConfig()
+				this.detail = data
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				this.$util.hideAll()
+				this.isLoad = true
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			linkpress(res) {
+				console.log("linkpress", res);
+				// #ifdef APP-PLUS
+				this.$util.goUrl({
+					url: res.href,
+					openType: 'web'
+				})
+				// #endif
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+</style>
diff --git a/user/pages/refund/detail.vue b/user/pages/refund/detail.vue
new file mode 100644
index 0000000..2e06377
--- /dev/null
+++ b/user/pages/refund/detail.vue
@@ -0,0 +1,258 @@
+<template>
+	<view class="order-pages" v-if="detail.id">
+
+		<view class="item-child mt-md ml-lg mr-lg pd-lg fill-base f-paragraph c-base radius-16"
+			:style="{background:primaryColor}">
+			<view class="flex-y-baseline text-bold">{{statusType[detail.status]}}
+				<view class="f-caption text-normal ml-md" v-if="detail.status == 2">退款金额¥{{detail.refund_price}}</view>
+			</view>
+		</view>
+
+		<view class="address-info flex-warp mt-lg ml-lg mr-lg pd-lg fill-base radius-16" v-if="!detail.store_id">
+			<view class="address-icon flex-center c-base radius"
+				:style="{background:`linear-gradient(to right, ${subColor}, ${primaryColor})`}"><i
+					class="iconfont iconjuli"></i></view>
+			<view class="flex-1 flex-between ml-md">
+				<view class="max-540">
+					<view class="flex-y-baseline username c-title text-bold">{{detail.address_info.user_name}}
+						<view class="ml-md f-desc c-caption">{{detail.address_info.mobile}}</view>
+					</view>
+					<view class="f-desc c-title">
+						{{`${detail.address_info.address} ${detail.address_info.address_info}`}}
+					</view>
+				</view>
+			</view>
+		</view>
+
+
+		<view class="mt-md ml-lg mr-lg pd-lg fill-base f-paragraph c-caption radius-16" v-if="detail.store_id">
+			<view class="flex-between">
+				<view>下单人</view>
+				<view class="c-title">{{detail.address_info.user_name}}</view>
+			</view>
+			<view class="flex-between mt-md">
+				<view>联系方式</view>
+				<view class="c-title">{{detail.address_info.mobile}}</view>
+			</view>
+		</view>
+
+		<view class="item-child mt-md ml-lg mr-lg pd-lg fill-base radius-16">
+
+			<view class="flex-warp mb-lg" v-for="(aitem,aindex) in detail.order_goods" :key="aindex">
+				<image mode="aspectFill" class="avatar lg radius-16" :src="aitem.goods_cover"></image>
+				<view class="flex-1 ml-md">
+					<view class="f-mini-title c-title text-bold max-450 ellipsis"> {{aitem.goods_name}} </view>
+					<view class="f-caption c-caption mt-md max-450 ellipsis">
+						服务{{$t('action.attendantName')}}：{{detail.coach_info ? detail.coach_info.coach_name : '-'}}
+					</view>
+					<view class="f-caption c-caption" v-if="aitem.material_price*1>0">
+						物料费：¥{{aitem.material_price}}
+					</view>
+					<view class="flex-between">
+						<view class="flex-y-baseline f-caption c-warning">¥<view class="f-title text-bold">
+								{{aitem.goods_price}}
+							</view>
+						</view>
+						<view class="c-paragraph">x{{aitem.num}}</view>
+					</view>
+				</view>
+			</view>
+			<view class="flex-between">
+				<veiw class="flex-1"></veiw>
+				<view class="flex-y-center f-desc c-title text-bold">
+					共
+					<view class="c-warning">{{detail.all_goods_num}}
+					</view>
+					件
+					合计：<view class="f-icontext">¥</view>{{detail.apply_price}}
+					<view class="flex-y-center ml-md" v-if="detail.car_price*1>0">含车费：
+						<view class="f-icontext">¥</view>{{detail.car_price}}
+					</view>
+				</view>
+			</view>
+			<view class="flex-between mt-lg" v-if="detail.status != 2">
+				<view class="flex-1"></view>
+				<button @tap.stop="toTel" class="clear-btn order" v-if="detail.status == 3">联系平台</button>
+				<button @tap.stop="toCancel" class="clear-btn order"
+					:style="{color:'#fff',background:primaryColor,border:`1rpx solid ${primaryColor}`}"
+					v-if="detail.status == 1">取消退款</button>
+			</view>
+		</view>
+
+
+		<view class="item-child mt-md ml-lg mr-lg pd-lg fill-base radius-16">
+			<view class="flex-between pb-lg f-title c-title text-bold b-1px-b">退款信息</view>
+			<view class="pt-lg f-desc">
+				<view class="flex-between mb-md">
+					<view>退款单号</view>
+					<view class="c-caption flex-y-center ml-md">
+						<view class="max-400 ellipsis">{{detail.order_code}}</view>
+						<view @tap="$util.goUrl( {url:`${detail.order_code}`,openType:'copy'})"
+							class="copy-btn radius-5 f-icontext ml-sm">复制</view>
+					</view>
+				</view>
+				<view class="flex-between mb-md" v-if="detail.out_refund_no">
+					<view>微信退款单号</view>
+					<view class="c-caption flex-y-center ml-md">
+						<view>{{detail.out_refund_no}}</view>
+						<view @tap="$util.goUrl( {url:`${detail.out_refund_no}`,openType:'copy'})"
+							class="copy-btn radius-5 f-icontext ml-sm">复制</view>
+					</view>
+				</view>
+				<view class="flex-warp mb-md">
+					<view>提交日期</view>
+					<view class="c-caption text-right flex-1 ml-md">{{detail.create_time}}</view>
+				</view>
+				<view class="flex-warp mb-md" v-if="detail.status != 1">
+					<view>审核日期</view>
+					<view class="c-caption text-right flex-1 ml-md">{{detail.refund_time}}</view>
+				</view>
+				<view class="flex-column mb-md">
+					<view>退款原因</view>
+					<view class="c-caption mt-sm">{{detail.text}}</view>
+				</view>
+				<view class="flex-column" v-if="detail.imgs && detail.imgs.length > 0">
+					<view>上传图片</view>
+					<view class="flex-warp">
+						<block v-for="(item,index) in detail.imgs" :key="index">
+							<image @tap.top="previewImage(item,detail.imgs)" class="refund-img mt-md mr-md radius-10"
+								:src="item" />
+						</block>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="space-footer"></view>
+
+		<common-popup @confirm="confirmCancel" ref="cancel_item" type="CANCEL_REFUND_ORDER" :info="popupInfo">
+		</common-popup>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		data() {
+			return {
+				options: {},
+				statusType: {
+					1: '退款中',
+					2: '退款成功',
+					3: '退款失败',
+				},
+				detail: {},
+				popupInfo: {}
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad(options) {
+			this.options = options
+			this.initIndex()
+		},
+		methods: {
+			...mapMutations(['']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				let {
+					id
+				} = this.options
+				this.detail = await this.$api.order.refundOrderInfo({
+					id
+				})
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			// 取消退款
+			async toCancel() {
+				let {
+					order_code,
+					order_goods,
+				} = this.detail
+				let {
+					goods_cover: image,
+				} = order_goods[0]
+				this.popupInfo = {
+					name: `退款单号：${order_code}`,
+					image,
+				}
+				this.$refs.cancel_item.open()
+			},
+			// 确认：取消退款
+			async confirmCancel() {
+				let {
+					id,
+				} = this.detail
+				if (this.lockTap) return
+				this.lockTap = true
+				this.$util.showLoading()
+				try {
+					await this.$api.order.cancelRefundOrder({
+						id
+					})
+					this.$util.hideAll()
+					this.$util.showToast({
+						title: `取消成功`
+					})
+					this.lockTap = false
+					this.$refs.cancel_item.close()
+					setTimeout(() => {
+						this.$util.back()
+						this.$util.goUrl({
+							url: 1,
+							openType: `navigateBack`
+						})
+					}, 1000)
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+			},
+			toTel() {
+				let {
+					mobile: url
+				} = this.configInfo
+				this.$util.goUrl({
+					url,
+					openType: `call`
+				})
+			},
+			previewImage(current, urls) {
+				this.$util.previewImage({
+					current,
+					urls
+				})
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	button.order {
+		border-radius: 30rpx;
+	}
+</style>
\ No newline at end of file
diff --git a/user/pages/refund/list.vue b/user/pages/refund/list.vue
new file mode 100644
index 0000000..3c0b2e6
--- /dev/null
+++ b/user/pages/refund/list.vue
@@ -0,0 +1,237 @@
+<template>
+	<view class="order-pages">
+		<fixed>
+			<tab @change="handerTabChange" :list="tabList" :activeIndex="activeIndex*1" :activeColor="primaryColor"
+				width="25%" height="100rpx"></tab>
+			<view class="b-1px-b"></view>
+		</fixed>
+
+		<view @tap.stop="goDetail(index)" class="item-child mt-md ml-lg mr-lg pd-lg fill-base radius-16"
+			v-for="(item,index) in list.data" :key="index">
+			<view class="flex-between pb-lg">
+				<view class="f-paragraph c-title max-380 ellipsis">订单号：{{item.order_code}}</view>
+				<view class="f-caption text-bold"
+					:style="{color:item.status==1?subColor: item.status == 2 ? '#11C95E' : '#333'}">
+					{{statusType[item.status]}}
+				</view>
+			</view>
+			<view class="flex-warp mb-lg" v-for="(aitem,aindex) in item.order_goods" :key="aindex">
+				<image mode="aspectFill" class="avatar lg radius-16" :src="aitem.goods_cover"></image>
+				<view class="flex-1 ml-md">
+					<view class="f-mini-title c-title text-bold max-450 ellipsis"> {{aitem.goods_name}} </view>
+					<view class="f-caption c-caption mt-md max-450 ellipsis">服务{{$t('action.attendantName')}}：{{item.coach_info ? item.coach_info.coach_name : '-'}}</view>
+					<view class="f-caption c-caption" v-if="aitem.material_price*1>0">物料费：¥{{aitem.material_price}}
+					</view>
+					<view class="flex-between">
+						<view class="flex-y-baseline f-caption c-warning">¥<view class="f-title text-bold">
+								{{aitem.goods_price}}
+							</view>
+						</view>
+						<view class="c-paragraph">x{{aitem.num}}</view>
+					</view>
+				</view>
+			</view>
+			<view class="flex-between pt-lg b-1px-t">
+				<view class="flex-y-center f-desc c-title">合计：
+					<view class="c-warning text-bold">¥{{item.apply_price}}</view>
+				</view>
+				<view class="flex-warp">
+					<!-- 退款中 -->
+					<block v-if="item.status == 1">
+						<button @tap.stop="toCancel(index)" class="clear-btn order"
+							:style="{color:'#fff',background:primaryColor,border:`1rpx solid ${primaryColor}`}">取消退款</button>
+					</block>
+					<!-- 退款成功 -->
+					<view v-if="item.status == 2">退款金额¥{{item.refund_price}}</view>
+					<!-- 退款失败 -->
+					<block v-if="item.status == 3">
+						<button @tap.stop="toTel" class="clear-btn order">联系平台</button>
+					</block>
+				</view>
+			</view>
+		</view>
+
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+
+		<view class="space-footer"></view>
+
+		<common-popup @confirm="confirmCancel" ref="cancel_item" type="CANCEL_REFUND_ORDER" :info="popupInfo">
+		</common-popup>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		data() {
+			return {
+				options: {},
+				activeIndex: 0,
+				tabList: [{
+					title: '全部',
+					id: 0
+				}, {
+					title: '退款中',
+					id: 1,
+				}, {
+					title: '退款成功',
+					id: 2
+				}, {
+					title: '退款失败',
+					id: 3
+				}],
+				statusType: {
+					1: '退款中',
+					2: '退款成功',
+					3: '退款失败',
+				},
+				param: {
+					page: 1,
+				},
+				list: {
+					data: []
+				},
+				loading: true,
+				popupInfo: {},
+				lockTap: false
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad(options) {
+			this.options = options
+			let {
+				tab = 0
+			} = options
+			this.activeIndex = tab
+			this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			...mapMutations(['']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				await this.getList()
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			async getList() {
+				let {
+					list: oldList,
+					param,
+					tabList,
+					activeIndex
+				} = this
+				param.status = tabList[activeIndex].id
+				let newList = await this.$api.order.refundOrderList(param);
+
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+			},
+			handerTabChange(index) {
+				this.activeIndex = index;
+				this.$util.showLoading()
+				this.param.page = 1;
+				this.getList()
+			},
+			// 取消退款
+			async toCancel(index) {
+				let {
+					id,
+					order_code,
+					order_goods,
+				} = this.list.data[index]
+				let {
+					goods_cover: image,
+				} = order_goods[0]
+				this.popupInfo = {
+					id,
+					name: `退款单号：${order_code}`,
+					image,
+					index,
+				}
+				this.$refs.cancel_item.open()
+			},
+			// 确认：取消退款
+			async confirmCancel() {
+				let {
+					id,
+					index,
+				} = this.popupInfo
+				await this.$api.order.cancelRefundOrder({
+					id
+				})
+				this.list.data.splice(index, 1)
+				this.$util.showToast({
+					title: `取消成功`
+				})
+				this.$refs.cancel_item.close()
+			},
+			// 订单详情
+			goDetail(index) {
+				let {
+					id
+				} = this.list.data[index]
+				let url = `/user/pages/refund/detail?id=${id}`
+				this.$util.goUrl({
+					url
+				})
+			},
+			// 平台
+			toTel() {
+				let {
+					mobile: url
+				} = this.configInfo
+				this.$util.goUrl({
+					url,
+					openType: `call`
+				})
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+</style>
diff --git a/user/pages/salesman/apply.vue b/user/pages/salesman/apply.vue
new file mode 100644
index 0000000..2f170f7
--- /dev/null
+++ b/user/pages/salesman/apply.vue
@@ -0,0 +1,265 @@
+<template>
+	<view class="apply-pages" v-if="isLoad">
+		<view class="page-height"
+			v-if="(options.admin_id && salesman_status != -1)  || (!options.admin_id && [1,2,3].includes(salesman_status))">
+			<abnor percent="150%" @confirm="confirm" @cancel="confirm" :title="title[salesman_status]"
+				:tip="tipArr[salesman_status]" :button="buttonArr[salesman_status]" :image="image[salesman_status]"
+				:tipMax="salesman_status == 4? '690rpx':''"></abnor>
+		</view>
+		<block v-else>
+			<view class="apply-form">
+				<view class="fill-base mt-md radius-16">
+					<view class="flex-between pl-lg pr-lg b-1px-b">
+						<view class="item-text">您的姓名</view>
+						<input v-model="form.user_name" type="text" class="item-input flex-1" maxlength="20"
+							:placeholder="rule[0].errorMsg" />
+					</view>
+					<view class="flex-between pl-lg pr-lg b-1px-b">
+						<view class="item-text">手机号码</view>
+						<input v-model="form.phone" type="text" class="item-input flex-1"
+							:placeholder="rule[1].errorMsg" />
+					</view>
+				</view>
+			</view>
+
+			<view class="space-max-footer"></view>
+
+			<fix-bottom-button @confirm="submit" :text="[{text:'确定申请',type:'confirm',isAuth:true}]" bgColor="#fff">
+			</fix-bottom-button>
+		</block>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		data() {
+			return {
+				isLoad: false,
+				options: {},
+				// -1未申请，1审核中，2审核通过，3取消授权，4审核失败(可再次申请)
+				tipArr: {
+					'1': [{
+						text: '您已经成功提交申请',
+						color: 0
+					}, {
+						text: '审核将在3个工作日内出结果，请耐心等待',
+						color: 0
+					}],
+					'2': [{
+						text: '恭喜您，审核通过！',
+						color: 0
+					}, {
+						text: '您已具备业务员资格，快去分享体验吧~',
+						color: 0
+					}],
+					'3': [{
+						text: '请联系平台管理人员询问原因',
+						color: 0
+					}],
+					'4': [{
+						text: '请联系平台管理人员询问失败原因',
+						color: 0
+					}]
+				},
+				buttonArr: {
+					'1': [{
+						text: '个人中心',
+						type: 'cancel'
+					}],
+					'2': [{
+						text: '去分享',
+						type: 'confirm'
+					}],
+					'3': [{
+						text: '个人中心',
+						type: 'cancel'
+					}],
+					'4': [{
+						text: '再次申请',
+						type: 'confirm'
+					}, {
+						text: '个人中心',
+						type: 'cancel'
+					}]
+				},
+				title: {
+					'-1': '申请业务员',
+					'1': '等待审核',
+					'2': '',
+					'3': '取消授权',
+					'4': '申请失败',
+				},
+				image: {
+					'1': 'https://lbqny.migugu.com/admin/public/apply_wait.jpg',
+					'2': 'https://lbqny.migugu.com/admin/public/apply_suc.jpg',
+					'3': 'https://lbqny.migugu.com/admin/public/apply_fail.jpg',
+					'4': 'https://lbqny.migugu.com/admin/public/apply_fail.jpg',
+				},
+				salesman_status: -1,
+				form: {
+					id: 0,
+					admin_id: 0,
+					user_name: '', //姓名 
+					phone: '', //手机号
+				},
+				rule: [{
+						name: "user_name",
+						checkType: "isNotNull",
+						errorMsg: "请输入您的真实姓名",
+						regType: 2
+					},
+					{
+						name: "phone",
+						checkType: "isMobile",
+						errorMsg: "请输入常用手机号码"
+					}
+				],
+				lockTap: false
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			userInfo: state => state.user.userInfo,
+		}),
+		async onLoad(options) {
+			this.$util.showLoading()
+			let {
+				admin_id = 0
+			} = options
+			options = admin_id ? await this.updateCommonOptions(options) : options
+			this.options = options
+			await this.initIndex()
+			let {
+				title,
+				salesman_status
+			} = this
+			uni.setNavigationBarTitle({
+				title: title[salesman_status]
+			})
+			this.isLoad = true
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getUserInfo', 'updateCommonOptions']),
+			...mapMutations(['updateUserItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				let data = await this.$api.salesman.salesmanInfo()
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				if (data.id) {
+					let {
+						admin_id = 0
+					} = this.options
+					if (admin_id) {
+						data.admin_id = admin_id
+					}
+					for (let key in this.form) {
+						this.form[key] = data[key]
+					}
+					let {
+						status,
+						sh_text
+					} = data
+					this.salesman_status = !admin_id && status == 4 ? -1 : status
+					if (status == 4 && sh_text) {
+						this.tipArr[4][0].text = sh_text
+					}
+				}
+				this.$util.hideAll()
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			// 个人中心/去分享
+			async confirm() {
+				let {
+					salesman_status
+				} = this
+				if (salesman_status == 4) {
+					this.salesman_status = -1
+					uni.setNavigationBarTitle({
+						title: '申请业务员'
+					})
+					return
+				}
+				let url = salesman_status == 2 ? `/user/pages/salesman/income` : `/pages/mine`
+				this.$util.log(url)
+				this.$util.goUrl({
+					url,
+					openType: `reLaunch`
+				})
+			},
+			//表单验证
+			validate(param) {
+				let validate = new this.$util.Validate();
+				this.rule.map(item => {
+					let {
+						name,
+					} = item
+					validate.add(param[name], item);
+				})
+				let message = validate.start();
+				return message;
+			},
+			async submit() {
+				let param = this.$util.deepCopy(this.form)
+				let msg = this.validate(param);
+				if (msg) {
+					this.$util.showToast({
+						title: msg
+					});
+					return;
+				}
+				let {
+					admin_id
+				} = this.options
+				if (admin_id) {
+					param.admin_id = admin_id
+				}
+				if (this.lockTap) return
+				this.lockTap = true
+				this.$util.showLoading()
+				try {
+					await this.$api.salesman.applySalesman(param)
+					this.$util.hideAll()
+					this.$util.showToast({
+						title: `提交成功`
+					});
+					setTimeout(() => {
+						this.$util.back()
+						this.$util.goUrl({
+							url: '/user/pages/apply-result?type=4',
+							openType: `redirectTo`
+						})
+					}, 1000)
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+</style>
\ No newline at end of file
diff --git a/user/pages/salesman/income.vue b/user/pages/salesman/income.vue
new file mode 100644
index 0000000..4db7236
--- /dev/null
+++ b/user/pages/salesman/income.vue
@@ -0,0 +1,215 @@
+<template>
+	<view class="user-distribution-income rel" v-if="isLoad">
+		<view class="bg abs" :style="{background: `linear-gradient(180deg, ${primaryColor} 0%, #fff 100%)`}"></view>
+		<view class="flex-center pd-lg rel">
+			<image mode="aspectFill" class="avatar radius"
+				:src="detail.avatarUrl || `https://lbqny.migugu.com/admin/anmo/mine/default_user.png`">
+			</image>
+			<view class="flex-1 ml-lg f-md-title c-base ellipsis">{{detail.user_name}}</view>
+		</view>
+
+		<view class="mine-menu-list fill-base radius-16 rel" style="margin-top: 0;">
+			<view class="flex-between pd-lg b-1px-b">
+				<view class="f-paragraph c-title">可提现(元)</view>
+				<view class="f-md-title c-title">{{detail.cash}}</view>
+			</view>
+			<view class="flex-warp pt-md">
+				<view class="item-child flex-center flex-column" :class="[{'b-1px-r':index!==2}]"
+					v-for="(item, index) in countList" :key="index">
+					<view class="f-sm-title c-title text-bold">{{detail[item.key]}}</view>
+					<view class="f-icontext c-caption">{{ item.text }}</view>
+				</view>
+			</view>
+			<view class="flex-center pt-lg pb-lg">
+				<view @tap.stop="$util.goUrl({url:`/user/pages/distribution/record?type=6`})"
+					class="cash-btn flex-center f-mini-title c-base radius"
+					style="color:#5B5B5B;border:1rpx solid #979797">
+					提现记录
+				</view>
+				<view @tap.stop="$util.goUrl({url:`/user/pages/cash-out?type=salesman`})"
+					class="cash-btn flex-center ml-lg f-mini-title c-base radius"
+					:style="{background:primaryColor,border:`1rpx solid ${primaryColor}`}">
+					我要提现
+				</view>
+			</view>
+		</view>
+
+		<image @tap.stop="$util.goUrl({url:`/agent/pages/poster/channel?type=1`})"
+			class="salesman-channel-share mt-md ml-md"
+			src="https://lbqny.migugu.com/admin/anmo/mine/salesman-channel-share.png">
+		</image>
+
+		<view class="fill-base mt-md ml-md mr-md pt-lg pl-lg pr-lg pb-md radius-16">
+			<view class="f-mini-title c-title text-bold">渠道明细</view>
+			<view @tap.stop="goDetail(index)" class="list-item pt-lg pb-lg b-1px-b" v-for="(item,index) in list.data"
+				:key="index">
+				<view class="flex-between">
+					<view class="f-paragraph c-title text-bold">{{item.user_name}}</view>
+					<view class="f-icontext" :style="{color:primaryColor}">查看更多</view>
+				</view>
+				<view class="flex-between">
+					<view class="flex-y-center f-desc c-paragraph">总成交金额<view class="ml-sm">¥{{item.order_price}}</view>
+					</view>
+					<view class="flex-y-center f-caption c-caption">返佣<view class="ml-sm c-warning">
+							¥{{item.salesman_cash}}
+						</view>
+					</view>
+				</view>
+			</view>
+			<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1">
+			</abnor>
+		</view>
+		<view class="space-footer"></view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	import tabbar from "@/components/tabbar.vue"
+	export default {
+		components: {
+			tabbar
+		},
+		data() {
+			return {
+				isLoad: false,
+				countList: [{
+					key: 'total_cash',
+					text: '累计佣金(元)'
+				}, {
+					key: 'wallet_cash',
+					text: '已提现(元)'
+				}, {
+					key: 'order_price',
+					text: '总成交金额(元)'
+				}],
+				detail: {},
+				param: {
+					page: 1,
+				},
+				list: {
+					data: []
+				},
+				loading: true,
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+		}),
+		onLoad() {
+			this.initIndex()
+		},
+		onUnload() {
+			this.$util.back()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			...mapMutations([]),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				this.$util.showLoading()
+				this.detail = await this.$api.salesman.index()
+				this.getList()
+				this.isLoad = true
+				this.$util.hideAll()
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			async getList() {
+				let {
+					list: oldList,
+					param
+				} = this
+				let newList = await this.$api.salesman.salesmanChannelCash(param);
+
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+			},
+			goDetail(index) {
+				let {
+					id,
+					user_name
+				} = this.list.data[index]
+				this.$util.goUrl({
+					url: `/user/pages/salesman/record?id=${id}&title=${user_name}`
+				})
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.user-distribution-income {
+		.bg {
+			width: 100%;
+			height: 388rpx;
+		}
+
+		.mine-menu-list {
+			margin: 20rpx 20rpx 0 20rpx;
+
+			.cash-btn {
+				width: 250rpx;
+				height: 70rpx;
+				transform: rotateZ(360deg);
+			}
+
+			.item-child {
+				width: 33.33%;
+				margin: 10rpx 0;
+
+				.iconfont {
+					font-size: 86rpx;
+				}
+			}
+
+			.item-child.b-1px-r::after {
+				top: 38rpx;
+				bottom: 38rpx;
+			}
+		}
+
+		.salesman-channel-share {
+			width: 710rpx;
+			height: 180rpx;
+		}
+
+
+	}
+</style>
\ No newline at end of file
diff --git a/user/pages/salesman/record.vue b/user/pages/salesman/record.vue
new file mode 100644
index 0000000..1ce8203
--- /dev/null
+++ b/user/pages/salesman/record.vue
@@ -0,0 +1,343 @@
+<template>
+	<view class="user-salesman-record" v-if="isLoad">
+		<fixed>
+			<view @tap.stop="toShowTimePopup" class="fix-info flex-y-center pl-lg">
+				<view>{{prev_time | handleTimeText}}</view>
+				<i class="iconfont iconshaixuanxia-1 ml-sm"></i>
+			</view>
+		</fixed>
+		<view class="list-item ml-lg mr-lg pt-lg pb-lg b-1px-b" v-for="(item,index) in list.data" :key="index">
+			<view class="flex-y-center f-paragraph c-title text-bold">订单号<view class="ml-sm">{{item.order_code}}</view>
+			</view>
+			<view class="f-caption c-caption mt-md">{{item.can_tx_date}}</view>
+			<view class="flex-between">
+				<view class="f-caption" style="color:#3D2C1B">订单收益</view>
+				<view class="flex-y-center f-caption c-warning">¥<view class="f-paragraph">{{item.salesman_cash}}</view>
+				</view>
+			</view>
+		</view>
+
+
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1">
+		</abnor>
+
+		<view class="space-footer"></view>
+
+
+		<uni-popup ref="show_choose_time" type="bottom">
+			<view class="popup-choose-time fill-base">
+				<view class="pl-lg pr-lg">
+					<view class="flex-between pt-lg pb-lg b-1px-b">
+						<view class="f-paragraph c-title text-bold">选择时间</view>
+						<i @tap.stop="toClose" class="iconfont icon-close"></i>
+					</view>
+					<view class="flex-center pt-lg pb-lg">
+						<view class="f-caption c-warning">最长可查找时间跨度一年的交易</view>
+						<view class="f-paragraph" @tap.stop="toReset" style="color: #5A677E;"
+							v-if="check_time.start_time || check_time.end_time">
+							清除</view>
+					</view>
+					<view class="flex-center pb-lg">
+						<view @tap.stop="toShowTime('start_time')" class="item-child flex-center flex-column">
+							<view>开始时间</view>
+							<view class="mt-sm" :style="{color:check_time.start_time ? primaryColor : '#999'}">
+								{{check_time.start_time || '选择时间'}}
+							</view>
+						</view>
+						<view @tap.stop="toShowTime('end_time')" class="item-child flex-center flex-column  b-1px-l">
+							<view>结束时间</view>
+							<view class="mt-sm" :style="{color:check_time.end_time ? primaryColor : '#999'}">
+								{{check_time.end_time || '选择时间'}}
+							</view>
+						</view>
+					</view>
+				</view>
+				<view class="flex-center flex-column fill-body">
+					<view class="space-lg"></view>
+					<view @tap.stop="toConfirm" class="confirm-btn flex-center f-title c-base radius-16"
+						:style="{background: primaryColor}">确定</view>
+					<view class="space-lg"></view>
+					<view class="space-safe"></view>
+				</view>
+			</view>
+		</uni-popup>
+
+		<w-picker mode="date" :startYear="startYear*1-10" :endYear="startYear" :value="curDay" :current="false"
+			fields="day" @confirm="onConfirm($event)" :disabled-after="false" ref="day" :themeColor="primaryColor"
+			:visible.sync="showDate">
+		</w-picker>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	import $util from "@/utils/index.js"
+	import wPicker from "@/components/w-picker/w-picker.vue";
+	export default {
+		components: {
+			wPicker
+		},
+		data() {
+			return {
+				isLoad: false,
+				options: {},
+				curDay: '',
+				startYear: '',
+				showKey: '',
+				showDate: false,
+				prev_time: {
+					start_time: '',
+					end_time: ''
+				},
+				check_time: {
+					start_time: '',
+					end_time: ''
+				},
+				param: {
+					page: 1,
+				},
+				list: {
+					data: []
+				},
+				loading: true,
+				lockTap: false,
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			userInfo: state => state.user.userInfo,
+			haveOperItem: state => state.order.haveOperItem,
+		}),
+		onLoad(options) {
+			let {
+				title
+			} = options
+			this.options = options 
+			uni.setNavigationBarTitle({
+				title
+			})
+			let cur_time = new Date(Math.ceil(new Date().getTime()))
+			this.curDay = this.$util.formatTime(cur_time, 'YY-M-D')
+			this.startYear = this.$util.formatTime(cur_time, 'YY')
+			this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			...mapMutations(['updateUserItem', 'updateOrderItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				await this.getList()
+				this.isLoad = true
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			async getList() {
+				let {
+					list: oldList,
+					param
+				} = this
+				let {
+					start_time,
+					end_time
+				} = this.$util.deepCopy(this.check_time)
+				param.start_time = start_time && end_time ? this.$util.DateToUnix(start_time) : ''
+				param.end_time = start_time && end_time ? this.$util.DateToUnix(end_time) + 24 * 3600 - 1 : ''
+				let {
+					id
+				} = this.options
+				param.channel_id = id
+				let newList = await this.$api.salesman.salesmanChannelOrderList(param);
+
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+			},
+			toShowTimePopup(e, month = 0) {
+				this.check_time = this.$util.deepCopy(this.prev_time)
+				this.$refs.show_choose_time.open()
+			},
+			toReset() {
+				this.check_time = {
+					start_time: '',
+					end_time: ''
+				}
+				this.getList(1)
+			},
+			async toClose() {
+				let {
+					start_time,
+					end_time
+				} = this.check_time
+
+				if (!start_time || !end_time) {
+					this.prev_time = this.$util.deepCopy(this.check_time)
+				}
+				if (start_time && end_time) {
+					this.check_time = this.$util.deepCopy(this.prev_time)
+				}
+				this.$refs.show_choose_time.close()
+				this.getList(1)
+			},
+			toShowTime(key) {
+				if (key == 'end_time' && !this.check_time.start_time) {
+					this.$util.showToast({
+						title: `请选择开始时间`
+					})
+					return
+				}
+				let showTime = this.check_time[key]
+				if (showTime) {
+					this.curDay = showTime
+				}
+				this.showKey = key
+				this.showDate = true
+			},
+			async onConfirm(val) {
+				let {
+					start_time,
+					end_time
+				} = this.check_time
+				let {
+					showKey,
+				} = this
+				let show_unit = this.$util.DateToUnix(val.result)
+				let start_unit = start_time ? this.$util.DateToUnix(start_time) : 0
+				let end_unit = end_time ? this.$util.DateToUnix(end_time) : 0
+				let cur_month = this.$util.formatTime(new Date(Math.ceil(new Date().getTime())), 'YY-M-D')
+				let cur_unit = this.$util.DateToUnix(cur_month) + 1
+
+				let msgType = {
+					start_time: '开始时间',
+					end_time: '结束时间',
+				}
+
+				if (show_unit > cur_unit) {
+					this.$util.showToast({
+						title: `${msgType[showKey]}不能选择未来时间哦`
+					})
+					return
+				}
+
+				if ((showKey == 'start_time' && end_unit && end_unit < this.$util.DateToUnix(val
+						.result)) ||
+					(showKey == 'end_time' && start_unit && start_unit > this.$util.DateToUnix(val.result))) {
+					this.$util.showToast({
+						title: `结束时间不能小于开始时间`
+					})
+					return
+				}
+				this.check_time[showKey] = val.result
+			},
+			async toConfirm() {
+				let {
+					start_time = '',
+						end_time = ''
+				} = this.check_time
+				let start_unit = this.$util.DateToUnix(start_time) * 1000
+				let end_unit = this.$util.DateToUnix(end_time) * 1000
+
+				if ((!start_time || !end_time || (end_unit -
+						start_unit > 365 * 24 * 3600 * 1000))) {
+					this.$util.showToast({
+						title: !start_time ? `请选择开始时间` : !end_time ? `请选择结束时间` : `查询时间跨度最长为一年哦`
+					})
+					return
+				}
+				this.prev_time = this.$util.deepCopy(this.check_time)
+				this.$refs.show_choose_time.close()
+				this.getList(1)
+			}
+		},
+		filters: {
+			handleTimeText(val, type) {
+				let text = '请选择时间查询'
+				let {
+					start_time,
+					end_time
+				} = val
+				let formatType = 'YY.M.D'
+				if (start_time && end_time) {
+					text = $util.formatTime($util.DateToUnix(start_time) * 1000, formatType) + ' - ' +
+						$util.formatTime($util.DateToUnix(end_time) * 1000, formatType)
+				}
+				return text
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	page {
+		background: #fff;
+	}
+
+	.user-salesman-record {
+		.fix-info {
+			width: 100%;
+			height: 112rpx;
+			background: #F2F2F2;
+
+			.iconshaixuanxia-1 {
+				color: #525252;
+				font-size: 20rpx;
+				transform: scale(0.7);
+			}
+		}
+
+		.popup-choose-time {
+			width: 750rpx;
+			border-radius: 30rpx 30rpx 0 0;
+
+			.icon-close {
+				color: #A8AEB8;
+				font-size: 40rpx;
+			}
+
+			.item-child {
+				width: 50%;
+			}
+
+			.confirm-btn {
+				width: 670rpx;
+				height: 100rpx;
+			}
+
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/user/pages/service/cate.vue b/user/pages/service/cate.vue
new file mode 100644
index 0000000..7b517a2
--- /dev/null
+++ b/user/pages/service/cate.vue
@@ -0,0 +1,97 @@
+<template>
+	<view class="user-service-cate" v-if="isLoad">
+		
+		<view class="flex-warp ml-md mr-md">
+			<view @tap.stop="goDetail(index)" class="list-item flex-center flex-column"
+				v-for="(item,index) in service_all_cate" :key="index">
+				<image mode="aspectFill" class="cover radius" :src="item.cover"></image>
+				<view class="text mt-sm f-caption ellipsis">{{item.title}}</view>
+			</view>
+		</view>
+		
+		<view class="space-footer"></view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		data() {
+			return {
+				isLoad: false,
+				options: {},
+				lockTap: false
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			service_all_cate: state => state.service.service_all_cate,
+		}),
+		onLoad(options) {
+			this.options = options
+			this.initIndex()
+		},
+		methods: {
+			...mapMutations(['updateUserItem', 'updateOrderItem']),
+			async initIndex() {
+				// #ifdef H5
+				if (this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif 
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				this.isLoad = true
+			},
+			goDetail(index) {
+				let {
+					id,
+					title
+				} = this.service_all_cate[index]
+				let url = `/user/pages/service/list?id=${id}&title=${title}`
+				this.$util.goUrl({
+					url
+				})
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	page {
+		background: #fff;
+	}
+
+	.user-service-cate {
+
+		.flex-warp {
+
+			.list-item {
+				width: 142rpx;
+				margin-top: 40rpx;
+
+
+				.cover {
+					width: 94rpx;
+					height: 94rpx;
+				}
+
+				.text {
+					color: #484848;
+				}
+
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/user/pages/service/list.vue b/user/pages/service/list.vue
new file mode 100644
index 0000000..6304eea
--- /dev/null
+++ b/user/pages/service/list.vue
@@ -0,0 +1,121 @@
+<template>
+	<view class="pages-service">
+		<fixed>
+			<search @input="toSearch" type="input" :padding="30" :radius="0" placeholder="请输入服务名称">
+			</search>
+		</fixed>
+
+		<view class="fill-base pd-lg b-1px-b" v-for="(item,index) in list.data" :key="index">
+			<service-list-item :info="item"></service-list-item>
+		</view>
+
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1">
+		</abnor>
+		<view class="space-footer"></view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	import serviceListItem from "@/components/service-list-item.vue"
+	export default {
+		components: {
+			serviceListItem
+		},
+		data() {
+			return {
+				options: {},
+				param: {
+					page: 1,
+				},
+				list: {
+					data: []
+				},
+				loading: true,
+				lockTap: false,
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+		}),
+		onLoad(options) {
+			let {
+				title = 0
+			} = options
+			this.options = options
+			uni.setNavigationBarTitle({
+				title
+			})
+			this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			...mapMutations(['updateUserItem', 'updateOrderItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				await this.getList()
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			toSearch(val) {
+				this.param.page = 1
+				this.param.title = val
+				this.getList()
+			},
+			async getList() {
+				let {
+					list: oldList,
+					param
+				} = this
+				let {
+					id
+				} = this.options
+				param.cate_id = id
+				let newList = await this.$api.service.serviceList(param);
+
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+			},
+		}
+	}
+</script>
+
+
+<style lang="scss"> 
+</style>
\ No newline at end of file
diff --git a/user/pages/setting.vue b/user/pages/setting.vue
new file mode 100644
index 0000000..c8916bf
--- /dev/null
+++ b/user/pages/setting.vue
@@ -0,0 +1,358 @@
+<template>
+	<view class="mine-pages-setting">
+		<view class="flex-center flex-column pd-lg fill-base">
+			<view class="space-lg"></view>
+			<view class="space-lg"></view>
+			<!-- #ifdef H5 -->
+			<view class="avatar radius">
+				<view class="h5-image avatar radius" :style="{ backgroundImage : `url('${user_info.avatarUrl}')`}">
+				</view>
+			</view>
+			<!-- #endif -->
+			<!-- #ifndef H5 -->
+			<image mode="aspectFill" class="avatar radius" :src="user_info.avatarUrl"></image>
+			<!-- #endif -->
+
+			<view @tap.stop="toResetPhone" class="flex-y-center f-title c-caption mt-md" v-if="user_info.phone">
+				{{user_info.split_phone}}
+				<view class="ml-md f-caption" :style="{color:primaryColor}" v-if="configInfo.short_code_status">
+					更换手机号</view>
+			</view>
+		</view>
+		<view class="flex-between pd-lg fill-base f-paragraph">
+			<view>昵称</view>
+			<view class="c-caption">{{user_info.nickName}}</view>
+		</view>
+		<view class="flex-between pd-lg fill-base f-paragraph">
+			<view>注册时间</view>
+			<view class="c-caption">{{user_info.create_date || '-'}}</view>
+		</view>
+		<!-- #ifndef MP-WEIXIN -->
+		<view @tap.stop="$util.goUrl({url:`/user/pages/alipay-account`})"
+			class="flex-between pd-lg fill-base f-paragraph">
+			<view>支付宝账号</view>
+			<view class="flex-y-center c-caption">{{user_info.split_alipay_number || '暂无'}}
+				<view class="ml-md" :style="{color:primaryColor}">{{user_info.alipay_number?'修改':'去设置'}}</view>
+			</view>
+		</view>
+		<!-- #endif -->
+		<view class="space-md"></view>
+		<view @tap.stop="goDetail(index,'infoList')" class="flex-between pd-lg fill-base f-paragraph"
+			v-for="(item,index) in infoList" :key="index">
+			<view>{{item.text}}</view>
+			<i class="iconfont icon-right"></i>
+		</view>
+		<view class="space-max-footer"></view>
+
+
+		<!-- #ifdef H5 -->
+		<fix-bottom-button @confirm="toLoginOut" :text="[{ text: '退出登录', type: 'confirm' }]" bgColor="#fff">
+		</fix-bottom-button>
+		<!-- #endif -->
+
+		<!-- #ifdef APP-PLUS -->
+		<fix-bottom-button @cancel="$util.goUrl({url:`/user/pages/logout`})" @confirm="toLoginOut"
+			:text="[{ text: '注销账户', type: 'cancel' },{ text: '退出登录', type: 'confirm' }]" bgColor="#fff">
+		</fix-bottom-button>
+		<!-- #endif -->
+
+		<uni-popup ref="show_phone_item" :maskClick="false">
+			<view @tap.stop.prevent class="common-popup-content popup-phone pd-lg flex-center flex-column fill-base">
+				<view class="f-md-title c-black">请输入手机号</view>
+				<view class="space-lg pb-lg"></view>
+				<view class="space-lg pb-lg"></view>
+				<view class="flex-center mb-lg">
+					<view class="input-info sm mr-md radius-16">
+						<input v-model="subForm.phone" type="number"
+							class="item-input flex-y-center pl-lg pr-lg f-sm-title c-title"
+							placeholder-class="c-placeholder" :placeholder="rule[0].errorMsg" />
+					</view>
+					<view @tap="toSend" class="send-btn flex-center c-base radius-16"
+						:style="{background:primaryColor}">
+						{{authTime>0?`(${authTime}s)`:'发送'}}
+					</view>
+				</view>
+				<view class="input-info radius-16">
+					<input v-model="subForm.short_code" type="number"
+						class="item-input flex-y-center pl-lg pr-lg f-sm-title c-title" maxlength="6"
+						placeholder-class="c-placeholder" :placeholder="rule[1].errorMsg" />
+				</view>
+				<view class="button">
+					<view @tap.stop="toResetItem" class="item-child">
+						取消
+					</view>
+					<view @tap.stop="submit" class="item-child" :style="{background: primaryColor,color:'#fff'}">
+						确定
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	import siteInfo from '@/siteinfo.js';
+	export default {
+		data() {
+			return {
+				isLoad: false,
+				options: {},
+				infoList: [{
+					text: '隐私政策',
+					url: `/user/pages/protocol`
+				}, {
+					text: '服务协议',
+					url: `/user/pages/information`
+				}, {
+					text: '屏蔽列表',
+					url: `/user/pages/shield`
+				}],
+				user_info: {},
+				authTime: 0,
+				timer: null,
+				subForm: {
+					phone: '',
+					short_code: ''
+				},
+				rule: [{
+					name: "phone",
+					checkType: "isMobile",
+					errorMsg: "请输入手机号",
+					regText: "手机号"
+				}, {
+					name: "short_code",
+					checkType: "isNotNull",
+					errorMsg: "请输入短信验证码",
+					regText: "短信验证码"
+				}],
+				lockTap: false
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		async onLoad() {
+			this.initIndex()
+		},
+		methods: {
+			...mapActions(['getUserInfo']),
+			...mapMutations(['updateConfigItem', 'updateServiceItem', 'updateTechnicianItem', 'updateOrderItem',
+				'updateUserItem'
+			]),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				await this.getUserInfo()
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				this.user_info = this.$util.deepCopy(this.userInfo)
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			toResetPhone() {
+				let {
+					short_code_status = 0
+				} = this.configInfo
+				if (!short_code_status) return
+				this.$refs.show_phone_item.open()
+			},
+			toResetItem() {
+				this.$refs.show_phone_item.close()
+				this.timer && clearTimeout(this.timer)
+				this.authTime = 0
+				this.subForm = {
+					phone: '',
+					short_code: ''
+				}
+			},
+			//表单验证
+			validate(param, is_send = false) {
+				let validate = new this.$util.Validate();
+				this.rule.map(item => {
+					let {
+						name,
+					} = item
+					if (name == 'short_code' && is_send) return
+					validate.add(param[name], item);
+				})
+				let message = validate.start();
+				return message;
+			},
+			async toSend() {
+				let {
+					authTime
+				} = this
+				if (authTime) return
+				let {
+					phone = ''
+				} = this.subForm
+				let msg = this.validate({
+					phone
+				}, true);
+				if (msg) {
+					this.$util.showToast({
+						title: msg
+					});
+					return;
+				}
+				if (this.lockTap) return
+				this.lockTap = true
+				this.$util.showLoading()
+				try {
+					await this.$api.user.sendShortMsg({
+						phone
+					})
+					this.$util.hideAll()
+					this.lockTap = false
+					let time = 60
+					this.timer = setInterval(() => {
+						if (time === 0) {
+							clearInterval(this.timer)
+							return
+						}
+						time--
+						this.authTime = time
+					}, 1000)
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+			},
+			async submit() {
+				let param = this.$util.deepCopy(this.subForm)
+				let msg = this.validate(param);
+				if (msg) {
+					this.$util.showToast({
+						title: msg
+					});
+					return;
+				}
+
+				if (param.short_code.length != 6) {
+					this.$util.showToast({
+						title: `请输入6位数短信验证码`
+					})
+					return
+				}
+
+				if (this.lockTap) return
+				this.lockTap = true
+				this.$util.showLoading()
+				try {
+					await this.$api.user.bindUserPhone(param)
+					this.$util.hideAll()
+					this.lockTap = false
+					this.toResetItem()
+					await this.getUserInfo()
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+			},
+			goDetail(index, key) {
+				let {
+					url
+				} = this[key][index]
+				this.$util.goUrl({
+					url
+				})
+			},
+			toLoginOut() {
+				let methodArr = ['updateServiceItem', 'updateTechnicianItem']
+				methodArr.map(item => {
+					this[item]({
+						key: 'pageActive',
+						val: false
+					})
+				})
+
+				let arr = ['autograph', 'userInfo', 'location', 'appLogin', 'loginType',
+					'isGzhLogin', 'isShowLogin', 'mineInfo', 'coachInfo', 'userPageType', 'commonOptions'
+				]
+				arr.map(key => {
+					this.updateUserItem({
+						key,
+						val: key === 'isShowLogin' ? true : key === 'isGzhLogin' ? false : key ===
+							'userPageType' ? 1 : ''
+					})
+				})
+
+				this.$util.showToast({
+					title: `退出登录`
+				})
+				setTimeout(() => {
+					// #ifdef H5
+					let {
+						siteroot
+					} = siteInfo
+					let url = siteroot.split('/index.php')[0]
+					let href = `${url}/h5/#/pages/service`
+					window.location.href = href
+					// #endif
+					// #ifdef APP-PLUS
+					this.$util.goUrl({
+						url: `/pages/service`,
+						openType: `reLaunch`
+					})
+					// #endif
+				}, 1000)
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.mine-pages-setting {
+		.iconfont {
+			color: #999
+		}
+
+		.popup-phone {
+			width: 630rpx;
+
+			.input-info {
+				width: 570rpx;
+				height: 90rpx;
+				background: #F7F7F7;
+
+				.item-input {
+					height: 90rpx;
+					font-size: 32rpx;
+					text-align: left;
+				}
+			}
+
+			.input-info.sm {
+				width: 400rpx;
+			}
+
+			.send-btn {
+				width: 150rpx;
+				height: 90rpx;
+			}
+		}
+	}
+</style>
diff --git a/user/pages/shield.vue b/user/pages/shield.vue
new file mode 100644
index 0000000..d6729a2
--- /dev/null
+++ b/user/pages/shield.vue
@@ -0,0 +1,178 @@
+<template>
+	<view class="user-shield" v-if="isLoad">
+		<fixed v-if="configInfo.plugAuth.dynamic">
+			<tab @change="handerTabChange" :list="tabList" :activeIndex="activeIndex*1" :activeColor="primaryColor"
+				width="50%" height="100rpx" color="#999999"></tab>
+		</fixed>
+		<view class="list-item flex-center fill-base mt-md ml-md mr-md pd-lg radius-16"
+			v-for="(item,index) in list.data" :key="index">
+			<image mode="aspectFill" class="avatar radius" :src="item.work_img"></image>
+			<view class="flex-1 flex-between ml-md">
+				<view class="f-title c-black text-bold max-300 ellipsis">{{item.coach_name}}</view>
+				<view @tap.stop="toRemove(index)" class="remove-btn flex-center f-desc radius"
+					:style="{color:primaryColor,border:`1rpx solid ${primaryColor}`}">移除列表</view>
+			</view>
+		</view>
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+		<view class="space-footer"></view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		data() {
+			return {
+				isLoad: false,
+				tabList: [{
+					id: 2,
+					title: '不喜欢Ta'
+				}, {
+					id: 1,
+					title: '不想看Ta的作品'
+				}],
+				activeIndex: 0,
+				loading: true,
+				param: {
+					page: 1
+				},
+				list: {
+					data: []
+				},
+				lockTap: false
+
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad() {
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+			this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			...mapActions(['getConfigInfo']),
+			...mapMutations(['updateUserItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				await Promise.all([this.getConfigInfo(), this.getList()])
+				this.isLoad = true
+			},
+			handerTabChange(index) {
+				this.activeIndex = index
+				this.param.status = index
+				this.getList();
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			async getList() {
+				this.$util.showLoading()
+				let {
+					list: oldList,
+					param,
+					tabList,
+					activeIndex
+				} = this
+				let {
+					id
+				} = tabList[activeIndex]
+				param.type = id
+				let newList = await this.$api.mine.shieldCoachList(param)
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+			},
+			async toRemove(index) {
+				let {
+					id
+				} = this.list.data[index]
+				let {
+					id: val
+				} = this.tabList[this.activeIndex]
+				if (this.lockTap) return
+				this.lockTap = true
+				this.$util.showLoading()
+				try {
+					await this.$api.mine.shieldCoachDel({
+						id
+					})
+					this.lockTap = false
+					this.$util.hideAll()
+					this.$util.showToast({
+						title: `移除成功`
+					})
+					this.list.data.splice(index, 1)
+					this.updateUserItem({
+						key: 'haveShieldOper',
+						val
+					})
+				} catch (e) {
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 2000)
+				}
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.user-shield {
+		.list-item {
+			.avatar {
+				width: 124rpx;
+				height: 124rpx;
+			}
+
+			.text {
+				color: #4D4D4D;
+				margin-top: 6rpx;
+			}
+
+			.remove-btn {
+				width: 146rpx;
+				height: 56rpx;
+				transform: rotateZ(360deg);
+			}
+		}
+	}
+</style>
diff --git a/user/pages/stored/choose-technician.vue b/user/pages/stored/choose-technician.vue
new file mode 100644
index 0000000..f9b770c
--- /dev/null
+++ b/user/pages/stored/choose-technician.vue
@@ -0,0 +1,243 @@
+<template>
+	<view class="dynamic-follow">
+		<fixed>
+			<view>
+				<search @input="toSearch" type="input" :padding="30" :radius="0" backgroundColor="#fff"
+					:placeholder="'请输入'+$t('action.attendantName')+'姓名'">
+				</search>
+			</view>
+		</fixed>
+		<view @tap.stop="toCheck(index)" class="list-item flex-center mt-md ml-md mr-md"
+			v-for="(item,index) in list.data" :key="index">
+			<i class="iconfont mr-md"
+				:class="[{'icon-xuanze':coach_info.id != item.id},{'icon-radio-fill':coach_info.id == item.id}]"
+				:style="{color:coach_info.id == item.id?primaryColor:'#BEC3CE'}"></i>
+			<view class="flex-1 flex-center fill-base pd-lg radius-16">
+				<image mode="aspectFill" class="avatar radius" :src="item.work_img"></image>
+				<view class="flex-1 flex-between ml-md">
+					<view class="f-title c-black text-bold max-200 ellipsis">{{item.coach_name}}
+					</view>
+					<view class="flex-center f-desc c-black"> <i class="iconfont iconjuli"
+							:style="{color:primaryColor}"></i>
+						{{item.distance}}
+					</view>
+				</view>
+			</view>
+		</view>
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+		<view class="space-max-footer"></view>
+
+		<fix-bottom-button @confirm="submit" :text="[{text:'确定选择',type:'confirm'}]" bgColor="#fff">
+		</fix-bottom-button>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	export default {
+		data() {
+			return {
+				coach_info: {},
+				loading: true,
+				param: {
+					page: 1
+				},
+				list: {
+					data: []
+				},
+				lockTap: false
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			userInfo: state => state.user.userInfo,
+			location: state => state.user.location,
+		}),
+		onLoad() {
+			let {
+				coach_info = {}
+			} = this.$util.getPage(-1)
+			this.coach_info = coach_info
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+			uni.setNavigationBarTitle({
+				title: '选择' + this.$t('action.attendantName')
+			})
+			this.$util.showLoading()
+			this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			...mapMutations(['updateUserItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				this.getList();
+			},
+			handerTabChange(index) {
+				this.activeIndex = index
+				this.param.status = index
+				this.getList();
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			async getList() {
+				let {
+					list: oldList,
+					param,
+					location
+				} = this
+				if (!location.lat) {
+					// #ifdef H5
+					if (this.$jweixin.isWechat()) {
+						this.$util.showLoading()
+						await this.$jweixin.wxReady2();
+						let {
+							latitude: lat = 0,
+							longitude: lng = 0
+						} = await this.$jweixin.getWxLocation()
+						location = {
+							lng,
+							lat,
+							address: '定位失败',
+							province: '',
+							city: '',
+							district: ''
+						}
+						if (lat && lng) {
+							let key = `${lat},${lng}`
+							let data = await this.$api.base.getMapInfo({
+								location: key
+							})
+							let {
+								status,
+								result
+							} = JSON.parse(data)
+							if (status == 0) {
+								let {
+									address,
+									address_component
+								} = result
+								let {
+									province,
+									city,
+									district
+								} = address_component
+								location = {
+									lng,
+									lat,
+									address,
+									province,
+									city,
+									district
+								}
+							}
+						}
+					}
+					// #endif
+					// #ifndef H5
+					location = await this.$util.getBmapLocation()
+					// #endif
+					this.updateUserItem({
+						key: 'location',
+						val: location
+					})
+				}
+				let {
+					lat = 0, lng = 0
+				} = location
+				param.lat = lat
+				param.lng = lng
+
+				let newList = await this.$api.mine.coachList(param)
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+			},
+			toSearch(val) {
+				this.param.coach_name = val
+				this.getList(1)
+			},
+			toCheck(index) {
+				let item = this.list.data[index]
+				this.coach_info = item
+			},
+			submit() {
+				let {
+					id = 0
+				} = this.coach_info
+				if (!id) {
+					this.$util.showToast({
+						title: `请选择${this.$t('action.attendantName')}`
+					})
+					return
+				}
+				this.$util.getPage(-1).coach_info = this.coach_info
+				setTimeout(() => {
+					this.$util.goUrl({
+						url: 1,
+						openType: `navigateBack`
+					})
+				}, 1000)
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	.dynamic-follow {
+		.list-item {
+
+			.iconfont {
+				font-size: 40rpx;
+			}
+
+			.avatar {
+				width: 90rpx;
+				height: 90rpx;
+			}
+
+			.text {
+				color: #4D4D4D;
+				margin-top: 6rpx;
+			}
+
+			.iconjuli {
+				font-size: 26rpx;
+			}
+		}
+	}
+</style>
diff --git a/user/pages/stored/commission.vue b/user/pages/stored/commission.vue
new file mode 100644
index 0000000..6950344
--- /dev/null
+++ b/user/pages/stored/commission.vue
@@ -0,0 +1,149 @@
+<template>
+	<view class="master-income-record" v-if="isLoad">
+		<view class="list-item ml-lg mr-lg pt-lg pb-lg" :class="[{'b-1px-t':index!=0}]"
+			v-for="(item,index) in  list.data" :key="index">
+			<view class="flex-between">
+				<view class="f-mini-title c-title text-bold">
+					{{item.type == 9?`直推${$t('action.attendantName')} ${item.coach_name} 完成服务`:`粉丝 ${item.nickName} 下单完成服务`}}
+				</view>
+				<view class="f-md-title">+{{item.cash}}
+				</view>
+			</view>
+			<view class="flex-between">
+				<view class="f-caption c-caption">{{item.create_time}}</view>
+				<view class="f-caption" :style="{color:item.type==9?primaryColor:subColor}">返佣{{item.balance}}%</view>
+			</view>
+		</view>
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+
+		<view class="space-footer"></view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	export default {
+		components: {},
+		data() {
+			return {
+				isLoad: false,
+				param: {
+					page: 1,
+					status: 2
+				},
+				list: {
+					data: []
+				},
+				loading: true,
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+		}),
+		async onLoad() {
+			this.$util.showLoading()
+			await this.initIndex()
+			this.isLoad = true
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			...mapMutations([]),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				await this.getList()
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			async getList() {
+				let {
+					list: oldList,
+					param,
+				} = this
+				let newList = await this.$api.mine.commList(param);
+
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+			},
+			handerTabChange(index) {
+				this.activeIndex = index;
+				this.$util.showLoading()
+				this.param.page = 1;
+				this.getList()
+			},
+			toCopy(index) {
+				let {
+					order_code: url
+				} = this.list.data[index]
+				this.$util.goUrl({
+					url,
+					openType: 'copy'
+				})
+			},
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	page {
+		background: #fff
+	}
+
+	.master-income-record {
+
+		.mine-menu-list {
+
+			.money-info {
+				font-size: 50rpx;
+
+				.money {
+					font-size: 70rpx;
+				}
+			}
+
+		}
+
+		.list-item {
+			.item-tag {
+				width: 24rpx;
+				height: 24rpx;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/user/pages/stored/consume.vue b/user/pages/stored/consume.vue
new file mode 100644
index 0000000..8536281
--- /dev/null
+++ b/user/pages/stored/consume.vue
@@ -0,0 +1,303 @@
+<template>
+	<view class="stored-record-pages">
+		<fixed>
+			<view class="list-time flex-center f-paragraph c-title fill-base b-1px-b">
+				<view @tap.stop="toChangeItem(index,'rankInd')" class="item-child flex-center"
+					:style="{color: rankInd == index ? primaryColor : ''}" v-for="(item,index) in rankList"
+					:key="index">{{item}}
+					<i class="iconfont icon-right rotate-90 ml-sm" v-if="item == '日期筛选'"></i>
+				</view>
+			</view>
+		</fixed>
+
+		<view class="cate-item-area mt-md ml-lg mr-lg fill-base radius-16" @tap.stop="toChangeItem(index,'curInd')"
+			v-for="(item,index) in list.data" :key="index">
+			<view class="content f-title c-title pd-lg">
+				<view class="flex-between">
+					<view class="max-446 ellipsis">{{item.goods_title}}</view>
+					<view class="c-warning">{{item.add==1?'+':'-'}}{{item.price}}</view>
+				</view>
+				<view class="flex-between f-caption c-caption">
+					<view>{{item.create_time}}</view>
+					<view>余额：{{item.after_balance}}</view>
+				</view>
+			</view>
+		</view>
+
+
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+
+		<view class="space-footer"></view>
+
+		<uni-popup ref="show_choose_time" type="top" :custom="true" :maskClick="false">
+			<view style="height: 95rpx;"></view>
+			<view class="popup-choose-time fill-base f-paragraph c-desc pt-lg pb-lg">
+				<view class="flex-center">
+					<view @tap.stop="toShowTime('start_time')" class="item-child flex-center flex-column">
+						<view>开始时间</view>
+						<view class="mt-sm" :style="{color:param.start_time ? primaryColor : '#999'}">
+							{{param.start_time || '选择时间'}}
+						</view>
+					</view>
+					<view @tap.stop="toShowTime('end_time')" class="item-child flex-center flex-column  b-1px-l">
+						<view>结束时间</view>
+						<view class="mt-sm" :style="{color:param.end_time ? primaryColor : '#999'}">
+							{{param.end_time || '选择时间'}}
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+
+		<w-picker mode="date" :startYear="startYear*1-10" :endYear="startYear" :value="toDay" :current="false"
+			fields="day" @confirm="onConfirm($event)" :disabled-after="false" ref="day" :themeColor="primaryColor"
+			:visible.sync="showDate">
+		</w-picker>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	import wPicker from "@/components/w-picker/w-picker.vue";
+	export default {
+		components: {
+			wPicker
+		},
+		data() {
+			return {
+				toDay: '',
+				startYear: '',
+				showKey: '',
+				showDate: false,
+				rankList: ['本月', '日期筛选'],
+				rankInd: 0,
+				start_time: '',
+				param: {
+					page: 1,
+					start_time: '',
+					end_time: ''
+				},
+				list: {
+					data: []
+				},
+				loading: true,
+				curInd: -1,
+				startX: 0, //开始坐标
+				startY: 0, //开始坐标
+				lockTap: false
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+		}),
+		onLoad() {
+			this.$util.showLoading()
+			this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			...mapMutations(['updateUserItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				let cur_time = new Date(Math.ceil(new Date().getTime()))
+				this.toDay = this.$util.formatTime(cur_time, 'YY-M-D')
+				this.startYear = this.$util.formatTime(cur_time, 'YY')
+				this.start_time = this.$util.formatTime(cur_time, 'YY-M') + '-01'
+				await this.getList()
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			async getList() {
+				let {
+					list: oldList,
+					rankInd,
+					start_time,
+					toDay
+				} = this
+				let param = this.$util.deepCopy(this.param)
+				if (rankInd == 0) {
+					param.start_time = start_time
+					param.end_time = toDay
+				}
+				param.start_time = this.$util.DateToUnix(param.start_time)
+				param.end_time = this.$util.DateToUnix(param.end_time) + 24 * 3600 - 1
+				let newList = await this.$api.mine.payWater(param);
+
+				newList.data.map(item => {
+					item.isTouchMove = false
+				})
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+			},
+			async toChangeItem(index, key) {
+				this[key] = index
+				if (key == 'rankInd') {
+					let methodModel = index == 1 ? 'open' : 'close'
+					this.$refs.show_choose_time[methodModel]()
+					if (index == 1) return
+					this.param.page = 1
+					await this.getList()
+				}
+			},
+			toShowTime(key) {
+				if (key == 'end_time' && !this.param.start_time) {
+					this.$util.showToast({
+						title: `请选择开始时间`
+					})
+					return
+				}
+				this.showKey = key
+				this.showDate = true
+			},
+			async onConfirm(val) {
+				let {
+					start_time,
+					end_time
+				} = this.param
+				let {
+					showKey
+				} = this
+
+				let show_unit = this.$util.DateToUnix(showKey == 'month' ? `${val.result}-01` : val.result)
+				let start_unit = start_time ? this.$util.DateToUnix(start_time) : 0
+				let end_unit = end_time ? this.$util.DateToUnix(end_time) : 0
+
+				if ((showKey == 'start_time' && end_unit && end_unit < this.$util.DateToUnix(val
+						.result)) ||
+					(showKey == 'end_time' && start_unit && start_unit > this.$util.DateToUnix(val.result))) {
+					this.$util.showToast({
+						title: `结束时间不能小于开始时间`
+					})
+					return
+				}
+
+				this.param[showKey] = val.result;
+				if (showKey == 'end_time') {
+					this.showDate = false
+					this.$refs.show_choose_time.close()
+					this.param.page = 1
+					await this.getList()
+				}
+			},
+			async toDel(index) {
+				let {
+					id,
+					title
+				} = this.list.data[index]
+				let [res_del, {
+					confirm
+				}] = await uni.showModal({
+					content: `请确认是否要删除‘${title}'`,
+				})
+				if (!confirm) return;
+				let param = {
+					id,
+					status: -1
+				}
+				await this.$api.master.goodsCateUpdate(param)
+				this.$util.showToast({
+					title: `删除成功`
+				})
+				this.list.data.splice(index, 1)
+			},
+			//手指触摸动作开始 记录起点X坐标
+			touchstart(e) {
+				//开始触摸时 重置所有删除
+				this.list.data.forEach(item => {
+					if (item.isTouchMove) //只操作为true的
+						item.isTouchMove = false;
+				})
+				this.startX = e.changedTouches[0].clientX
+				this.startY = e.changedTouches[0].clientY
+			},
+			//滑动事件处理
+			touchmove(e) {
+				let {
+					startX,
+					startY
+				} = this
+				let {
+					index
+				} = e.currentTarget.dataset //当前索引
+
+				let {
+					clientX,
+					clientY
+				} = e.changedTouches[0]
+				let touchMoveX = clientX
+				let touchMoveY = clientY
+				//获取滑动角度
+				let angle = this.angle({
+					X: startX,
+					Y: startY
+				}, {
+					X: touchMoveX,
+					Y: touchMoveY
+				});
+				this.list.data.forEach((v, i) => {
+					v.isTouchMove = false
+					//滑动超过30度角 return
+					if (Math.abs(angle) > 30) return;
+					if (i == index) {
+						if (touchMoveX > startX) //右滑
+							v.isTouchMove = false
+						else //左滑
+							v.isTouchMove = true
+					}
+				})
+			},
+			/**
+			 * 计算滑动角度
+			 * @param {Object} start 起点坐标
+			 * @param {Object} end 终点坐标
+			 */
+			angle(start, end) {
+				var _X = end.X - start.X,
+					_Y = end.Y - start.Y
+				//返回角度 /Math.atan()返回数字的反正切值
+				return 360 * Math.atan(_Y / _X) / (2 * Math.PI);
+			},
+		}
+	}
+</script>
+
+
+<style lang="scss">
+</style>
diff --git a/user/pages/stored/list.vue b/user/pages/stored/list.vue
new file mode 100644
index 0000000..e2081f3
--- /dev/null
+++ b/user/pages/stored/list.vue
@@ -0,0 +1,567 @@
+<template>
+	<view class="user-stored-list">
+		<!-- #ifdef H5 -->
+		<view @tap="$util.goUrl({url:`/pages/service`,openType:`reLaunch`})" class="abs"
+			:class="[{'back-user-ios none': configInfo.isIos},{'back-user-android none': !configInfo.isIos}]"
+			style="z-index: 1;" v-if="options.pid">
+			<view class="iconshouye iconfont"></view>
+			<view class="back-user_text">回到首页</view>
+		</view>
+		<!-- #endif -->
+		<view class="stored-bg c-base abs" :style="{background:primaryColor}">
+		</view>
+		<view class="space-lg"></view>
+		<view class="record-info fill-base ml-md mr-md radius-32 rel">
+			<view class="flex-center flex-column pd-lg">
+				<view class="money">{{mineInfo.balance || 0}}</view>
+				<view class="f-caption c-caption mt-sm mb-sm">当前余额(元)</view>
+			</view>
+			<view class="record-list flex-x-center pb-lg f-paragraph c-title">
+				<view @tap.stop="$util.goUrl({url:`/user/pages/stored/commission`})" class="list-item flex-center">佣金流水
+				</view>
+				<view @tap.stop="$util.goUrl({url:`/user/pages/stored/record`})" class="list-item flex-center">
+					充值记录</view>
+				<view @tap.stop="$util.goUrl({url:`/user/pages/stored/consume`})" class="list-item flex-center">
+					消费明细</view>
+			</view>
+		</view>
+
+		<view class="fill-base mt-md ml-md mr-md pd-lg radius-24">
+			<view class="store-list flex-warp">
+				<view @tap.stop="toChangeItem('chooseInd',index)" class="list-item mb-md pd-lg fill-base radius-16"
+					:class="[{'mr-md':index%2==0}]" :style="{background:index==chooseInd?primaryColor:'#F7F8FA'}"
+					v-for="(item,index) in list.data" :key="index">
+					<view class="ellipsis" :class="[{'c-title':index!=chooseInd},{'c-base':index==chooseInd}]"
+						style="font-size: 50rpx;">
+						¥{{item.price}}</view>
+					<view class="f-caption ellipsis"
+						:style="{color:index==chooseInd?'rgba(255,255,255,0.5)':'#8D9092'}">
+						{{item.title}}
+					</view>
+					<!-- <view @tap.stop="toShare(index)" class="f-caption mt-sm"
+						:style="{color:index==chooseInd?'#FAFF5B':primaryColor}" v-if="mineInfo.coach_status === 2">邀请充值
+					</view> -->
+				</view>
+			</view>
+
+			<view @tap.stop="options.coach_id?'':$util.goUrl({url:`/user/pages/stored/choose-technician`})"
+				class="flex-between mt-md mb-md">
+				<view class="f-title text-bold">选择为{{$t('action.attendantName')}}充值</view>
+				<view class="flex-y-center f-title">
+					<view class="max-200 ellipsis" :style="{color:!coach_info.id ? '#4A4A4A':''}">
+						{{coach_info.id ? coach_info.coach_name : '去选择'}}
+					</view>
+					<i class="iconfont icon-right" v-if="!options.coach_id"></i>
+				</view>
+			</view>
+			<view @tap.stop="toChangeItem('payInd',index)" class="flex-between mt-lg" v-for="(item,index) in payList"
+				:key="index">
+				<view class="pay-item flex-y-center">
+					<view class="item-icon flex-center mr-md" :class="[{'wechat':item.id==1},{'alipay':item.id==3}]">
+						<i class="iconfont icon-font-color" :class="[item.icon]"></i>
+					</view>
+					<view class="flex-y-baseline item-title">{{item.title}}
+					</view>
+				</view>
+				<i class="pay-icon iconfont c-caption"
+					:class="[{'icon-xuanze':payInd != index},{'icon-radio-fill':payInd == index}]"
+					:style="{color:payInd==index?primaryColor:'#BEC3CE'}"></i>
+			</view>
+			<view class="mt-md pt-lg f-caption c-caption">
+				<view>1.充值的本金和赠送金额均不可提现、转移、转赠</view>
+				<view class="mt-sm">2.使用范围：本平台所有项目皆可购买，以及交通费支付</view>
+			</view>
+		</view>
+		<view class="space-max-footer"></view>
+		<fixed position="bottom" v-if="chooseInd!=-1">
+			<view class="pd-lg fill-base">
+				<view class="flex-between">
+					<view class="flex-y-center f-paragraph c-caption">充值金额：<view class="c-warning">
+							{{list.data[chooseInd].price}}元
+						</view>
+					</view>
+					<view @tap.stop="toPay" class="pay-btn flex-center f-title c-base radius"
+						:style="{background:primaryColor}">充值</view>
+				</view>
+				<view class="space-safe"></view>
+			</view>
+		</fixed>
+
+		<uni-popup ref="show_share_item" type="bottom" zIndex="1000">
+			<view class="popup-share pd-lg f-desc c-desc fill-base">
+				<view class="flex-center">
+					<!-- #ifdef MP-WEIXIN -->
+					<button open-type="share" class="clear-btn list-item flex-center flex-column">
+						<image mode="aspectFill" class="item-image"
+							src="https://lbqny.migugu.com/admin/anmo/coupon/wechat.png"></image>
+						<view style="font-size: 26rpx;color:#666;">分享给好友</view>
+					</button>
+					<view @tap.stop="toPoster" class="list-item flex-center flex-column">
+						<image mode="aspectFill" class="item-image"
+							src="https://lbqny.migugu.com/admin/anmo/coupon/picture.png"></image>
+						<view>生成海报码</view>
+					</view>
+					<!-- #endif -->
+					<!-- #ifdef H5 -->
+					<view @tap.stop="toAppShare" class="list-item flex-center flex-column">
+						<image mode="aspectFill" class="item-image"
+							src="https://lbqny.migugu.com/admin/anmo/coupon/wechat.png"></image>
+						<view style="font-size: 26rpx;color:#666;">分享给好友</view>
+					</view>
+					<view @tap.stop="toPoster" class="list-item flex-center flex-column">
+						<image mode="aspectFill" class="item-image"
+							src="https://lbqny.migugu.com/admin/anmo/coupon/picture.png"></image>
+						<view>生成海报码</view>
+					</view>
+					<!-- #endif -->
+					<!-- #ifdef APP-PLUS -->
+					<view @tap.stop="toAppShare(1)" class="list-item flex-center flex-column">
+						<image mode="aspectFill" class="item-image"
+							src="https://lbqny.migugu.com/admin/anmo/coupon/wechat.png"></image>
+						<view style="font-size: 26rpx;color:#666;">分享给好友</view>
+					</view>
+					<view @tap.stop="toAppShare(2)" class="list-item flex-center flex-column">
+						<image mode="aspectFill" class="item-image"
+							src="https://lbqny.migugu.com/admin/anmo/coupon/wechat-moments.png"></image>
+						<view>分享到朋友圈</view>
+					</view>
+					<view @tap.stop="toPoster" class="list-item flex-center flex-column">
+						<image mode="aspectFill" class="item-image"
+							src="https://lbqny.migugu.com/admin/anmo/coupon/picture.png"></image>
+						<view>生成海报码</view>
+					</view>
+					<!-- #endif -->
+				</view>
+				<view class="space-footer"></view>
+			</view>
+		</uni-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	import siteInfo from '@/siteinfo.js';
+	export default {
+		components: {},
+		data() {
+			return {
+				options: {},
+				color: '#ffffff',
+				payList: [{
+					id: 1,
+					icon: 'icon-weixin',
+					title: '微信支付'
+				}],
+				payInd: 0,
+				chooseInd: 0,
+				qr_code: '',
+				imageUrl: 'https://lbqny.migugu.com/admin/anmo/mine/balance-wechat-share.png',
+				coach_info: {},
+				param: {
+					page: 1,
+					limit: 10
+				},
+				list: {
+					data: []
+				},
+				loading: true,
+				lockTap: false,
+				shareInd: 0
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			commonOptions: state => state.user.commonOptions,
+			userInfo: state => state.user.userInfo,
+			mineInfo: state => state.user.mineInfo,
+			isGzhLogin: state => state.user.isGzhLogin,
+		}),
+		async onLoad(options) {
+			this.$util.showLoading()
+			options = await this.updateCommonOptions(options)
+			this.options = options
+			// #ifdef MP-WEIXIN
+			uni.hideShareMenu()
+			// #endif
+			await this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		onShareAppMessage(e) {
+			if (e.from === 'button') {
+				let {
+					imageUrl
+				} = this
+				let {
+					id,
+					title,
+				} = this.list.data[0]
+				let {
+					id: pid = 0
+				} = this.userInfo
+				let {
+					coach_id
+				} = this.mineInfo
+				let path = `/user/pages/stored/list?id=${id}&pid=${pid}&coach_id=${coach_id}`
+				this.$util.log(path)
+				this.$refs.show_share_item.close()
+				return {
+					title,
+					imageUrl,
+					path,
+				}
+			}
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getUserInfo', 'getMineInfo', 'updateCommonOptions']),
+			...mapMutations(['updateOrderItem']),
+			async initIndex(refresh = false) {
+				let {
+					isGzhLogin
+				} = this
+				let {
+					id: uid = 0
+				} = this.userInfo
+				if (!uid) {
+					// #ifdef H5
+					if (isGzhLogin) {
+						setTimeout(() => {
+							this.getUserInfo()
+						}, 1000)
+					} else {
+						this.getUserInfo()
+					}
+					// #endif
+					// #ifndef H5
+					await this.getUserInfo()
+					// #endif 
+				}
+				await Promise.all([this.getConfigInfo(), this.getMineInfo(), this.getList()])
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					setTimeout(() => {
+						this.toAppShare()
+					}, 1200)
+				}
+				// #endif
+
+				let {
+					alipay_status = 0
+				} = this.configInfo
+				if (alipay_status && this.payList.length == 1) {
+					// #ifndef MP-WEIXIN
+					this.payList.push({
+						id: 3,
+						icon: 'icon-alipay-fill',
+						title: '支付宝支付'
+					})
+					// #endif
+				}
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			async getList() {
+				let {
+					list: oldList,
+					param,
+				} = this
+				let {
+					coach_id = 0
+				} = this.commonOptions
+				param.coach_id = coach_id
+				let newList = await this.$api.mine.cardList(param);
+				if (coach_id) {
+					let {
+						coach_name = ''
+					} = newList
+					this.coach_info = {
+						id: coach_id,
+						coach_name
+					}
+				}
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+				if (this.list.data.length == 0) {
+					this.chooseInd = -1
+				}
+			},
+			toChangeItem(key, val) {
+				this[key] = val
+				this.lockTap = false
+			},
+			// 去支付
+			async toPay() {
+				let {
+					chooseInd,
+					payInd
+				} = this
+				let {
+					id: card_id,
+					true_price
+				} = this.list.data[chooseInd]
+				let {
+					id: coach_id = 0
+				} = this.coach_info
+				let {
+					id: pay_model
+				} = this.payList[payInd]
+				let param = {
+					card_id,
+					coach_id,
+					pay_model
+				}
+
+				// #ifdef H5
+				if (pay_model == 3) {
+					this.updateOrderItem({
+						key: 'alipayOrderParams',
+						val: {
+							order_id: '',
+							card_id,
+							coach_id,
+							orderInfo: ''
+						}
+					})
+					this.$util.goUrl({
+						url: `/user/pages/alipay-result`
+					})
+					setTimeout(() => {
+						this.getMineInfo()
+						this.$util.back()
+					}, 3000)
+					return
+				}
+
+				// #endif
+
+				if (this.lockTap) return;
+				this.lockTap = true;
+				this.$util.showLoading()
+				try {
+					let {
+						pay_list
+					} = await this.$api.mine.payBalanceOrder(param)
+					this.$util.hideAll()
+					if (pay_list) {
+						if (pay_model == 3) {
+							pay_list = {
+								orderInfo: pay_list,
+								provider: 'alipay'
+							}
+						}
+						try {
+							await this.$util.pay(pay_list)
+							this.$util.showToast({
+								title: `支付成功`
+							})
+							await this.getMineInfo()
+							setTimeout(() => {
+								this.lockTap = false;
+								this.$util.back()
+							}, 1000)
+						} catch (e) {
+							this.lockTap = false;
+							return;
+						}
+					}
+				} catch (e) {
+					this.$util.showToast({
+						title: `支付失败`
+					})
+					setTimeout(() => {
+						this.lockTap = false
+						this.$util.hideAll()
+					}, 1000)
+				}
+			},
+			async toShare(index) {
+				this.shareInd = index
+				if (!this.qr_code) {
+					this.$util.showLoading()
+					let qr_code = await this.$api.mine.coachBalanceQr()
+					this.$util.hideAll()
+					this.qr_code = qr_code
+				}
+				// #ifndef H5
+				this.$refs.show_share_item.open()
+				// #endif
+				// #ifdef H5
+				this.$util.goUrl({
+					url: `/user/pages/stored/poster`
+				})
+				// #endif
+			},
+			toPoster() {
+				this.$refs.show_share_item.close()
+				this.$util.goUrl({
+					url: `/user/pages/stored/poster`
+				})
+			},
+			toAppShare(type = 1) {
+				let {
+					shareInd = 0,
+						imageUrl
+				} = this
+
+				let {
+					id: pid = 0
+				} = this.userInfo
+				let {
+					coach_id = 0
+				} = this.mineInfo
+
+				let {
+					id,
+					title,
+				} = this.list.data[shareInd]
+				let summary = '邀请您充值有优惠～'
+
+				let {
+					siteroot
+				} = siteInfo
+				let url = siteroot.split('/index.php')[0]
+				let href = `${url}/h5/#/user/pages/stored/list?id=${id}&coach_id=${coach_id}&pid=${pid}`
+
+				// #ifdef H5
+				this.$jweixin.wxReady(() => {
+					this.$jweixin.showOptionMenu()
+					this.$jweixin.shareAppMessage(title, summary, href, imageUrl)
+					this.$jweixin.shareTimelineMessage(title, href, imageUrl)
+				})
+				// #endif
+				// #ifdef APP-PLUS
+				this.$refs.show_share_item.close()
+				let scene = type == 1 ? 'WXSceneSession' : 'WXSceneTimeline'
+				uni.share({
+					provider: "weixin",
+					scene,
+					type: 0,
+					href,
+					title,
+					summary,
+					imageUrl,
+					success: function(res) {
+						console.log("success:" + JSON.stringify(res));
+					},
+					fail: function(err) {
+						console.log("fail:" + JSON.stringify(err));
+					}
+				});
+				// #endif
+			},
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.user-stored-list {
+
+		.stored-bg {
+			width: 100%;
+			height: 163rpx;
+			border-radius: 0 0 20rpx 20rpx;
+			top: 0;
+		}
+
+		.record-info {
+			.money {
+				font-size: 44rpx;
+			}
+
+			.record-list {
+				.list-item {
+					width: 33.33%;
+				}
+			}
+
+		}
+
+		.store-list {
+			.list-item {
+				width: 305rpx;
+			}
+		}
+
+		.pay-item {
+			.item-icon {
+
+				width: 70rpx;
+				height: 70rpx;
+				border-radius: 35rpx;
+
+				.iconfont {
+					font-size: 44rpx;
+				}
+			}
+
+			.item-icon.wechat {
+				background: #E7F9EE;
+
+				.iconfont {
+					background-image: linear-gradient(180deg, #90EE90 0%, #32CD32 100%, #19c865 100%);
+				}
+			}
+
+			.item-icon.alipay {
+				background: #E9F5FE;
+
+				.iconfont {
+					background-image: linear-gradient(180deg, #46BCFF 0%, #2587FF 100%, #1976FF 100%);
+				}
+			}
+
+			.item-title {
+				color: #2E3541;
+			}
+
+		}
+
+		.pay-btn {
+			width: 283rpx;
+			height: 90rpx;
+		}
+
+		.popup-share {
+			.list-item {
+				width: 50%;
+
+				.item-image {
+					width: 66rpx;
+					height: 66rpx;
+				}
+			}
+		}
+
+
+	}
+</style>
diff --git a/user/pages/stored/poster.vue b/user/pages/stored/poster.vue
new file mode 100644
index 0000000..0f3d082
--- /dev/null
+++ b/user/pages/stored/poster.vue
@@ -0,0 +1,232 @@
+<template>
+	<view>
+		<view class="hideCanvasView">
+			<l-painter class="hideCanvas" ref="painter" useCORS />
+		</view>
+		<block v-if="src">
+			<image :src="src" class="code-img" @tap="previewImage"></image>
+			<view class="space-max-footer"></view>
+			<fix-bottom-button @confirm="toPreviewSave" :text="[{text: confirmText,type:'confirm'}]" bgColor="#fff"
+				:classType="2">
+			</fix-bottom-button>
+		</block>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions
+	} from 'vuex';
+	export default {
+		components: {},
+		props: {
+
+		},
+		data() {
+			return {
+				// #ifdef H5
+				confirmText: '长按上图保存图片',
+				// #endif
+				// #ifndef H5
+				confirmText: '保存图片至相册',
+				// #endif
+				options: {},
+				src: ''
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		async onLoad(options) {
+			this.options = options
+			// #ifdef H5
+			if (this.$jweixin.isWechat()) {
+				await this.$jweixin.initJssdk();
+				this.$jweixin.wxReady(() => {
+					this.$jweixin.hideOptionMenu()
+				})
+			}
+			// #endif
+			this.$util.showLoading()
+			this.$util.setNavigationBarColor({
+				bg: this.primaryColor
+			})
+			let that = this
+			setTimeout(() => {
+				that.canvase()
+			}, 1000)
+		},
+		methods: {
+			...mapActions([]),
+			async canvase() {
+				let that = this;
+
+				let {
+					nickName,
+				} = this.userInfo
+
+				let {
+					qr_code,
+					shareInd,
+					list
+				} = this.$util.getPage(-1)
+
+				let bg = 'https://lbqny.migugu.com/admin/anmo/mine/balance-text-bg.png'
+				let cover = 'https://lbqny.migugu.com/admin/anmo/mine/balance-share.png'
+
+				let {
+					price = 0,
+						true_price = 0
+				} = list.data[shareInd]
+				let reduce = true_price - price
+
+				let poster = {
+					css: {
+						width: '750rpx',
+						height: '1400rpx',
+						background: '#fff'
+					},
+					views: [{
+						type: 'text',
+						text: `充${price}送${reduce}`,
+						css: {
+							position: 'absolute',
+							top: '70rpx',
+							left: '0rpx',
+							width: '750rpx',
+							fontSize: '70rpx',
+							fontWeight: '1000',
+							color: '#209620',
+							textAlign: 'center'
+						}
+					}, {
+						type: 'image',
+						src: bg,
+						css: {
+							position: 'absolute',
+							width: '484rpx',
+							height: '46rpx',
+							top: '190rpx',
+							left: '132rpx'
+						}
+					}, {
+						type: 'text',
+						text: `充值优惠多多`,
+						css: {
+							position: 'absolute',
+							top: '190rpx',
+							left: '0rpx',
+							width: '750rpx',
+							fontSize: '34rpx',
+							color: '#fff',
+							fontWeight: '400',
+							textAlign: 'center'
+						}
+					}, {
+						type: 'image',
+						src: cover,
+						css: {
+							width: '632rpx',
+							height: '464rpx',
+							objectFit: "cover",
+							position: 'absolute',
+							top: '360rpx',
+							left: '58rpx'
+						}
+					}, {
+						type: 'image',
+						src: qr_code,
+						css: {
+							width: '290rpx',
+							height: '290rpx',
+							position: 'absolute',
+							top: '920rpx',
+							left: '230rpx'
+						}
+					}, {
+						type: 'text',
+						text: nickName,
+						css: {
+							position: 'absolute',
+							top: '1235rpx',
+							left: '0rpx',
+							width: '750rpx',
+							fontSize: '30rpx',
+							color: '#209620',
+							textAlign: 'center'
+						}
+					}, {
+						type: 'text',
+						text: `邀请您充值有优惠~`,
+						css: {
+							position: 'absolute',
+							top: '1280rpx',
+							left: '0rpx',
+							width: '750rpx',
+							fontSize: '28rpx',
+							color: '#333',
+							textAlign: 'center'
+						}
+					}]
+				}
+				// 渲染
+				this.$refs.painter.render(poster);
+				// 生成图片
+				this.$refs.painter.canvasToTempFilePathSync({
+					fileType: "jpg",
+					quality: 1,
+					success: (res) => {
+						that.$util.hideAll()
+						this.src = res.tempFilePath
+					},
+				});
+			},
+			async extraImage() {
+				const p2 = this.widget.canvasToTempFilePath();
+				p2.then(res => {
+					this.src = res.tempFilePath
+				});
+			},
+			previewImage() {
+				let finalPath = this.src;
+				uni.previewImage({
+					current: finalPath,
+					urls: [finalPath]
+				})
+			},
+			async saveImage() {
+				await this.$util.checkAuth({
+					type: "writePhotosAlbum"
+				});
+				let filePath = this.src;
+				let [err, success] = await uni.saveImageToPhotosAlbum({
+					filePath
+				})
+				if (err) return;
+				uni.showToast({
+					icon: 'none',
+					title: '保存成功'
+				})
+			},
+			toPreviewSave() {
+				// #ifdef H5
+				this.previewImage()
+				// #endif
+				// #ifndef H5
+				this.saveImage()
+				// #endif
+			}
+		},
+
+	}
+</script>
+
+<style>
+	.code-img {
+		width: 750rpx;
+		height: 1400rpx;
+	} 
+</style>
diff --git a/user/pages/stored/record.vue b/user/pages/stored/record.vue
new file mode 100644
index 0000000..2d4a1d8
--- /dev/null
+++ b/user/pages/stored/record.vue
@@ -0,0 +1,302 @@
+<template>
+	<view class="stored-record-pages">
+		<fixed>
+			<view class="list-time flex-center f-paragraph c-title fill-base b-1px-b">
+				<view @tap.stop="toChangeItem(index,'rankInd')" class="item-child flex-center"
+					:style="{color: rankInd == index ? primaryColor : ''}" v-for="(item,index) in rankList"
+					:key="index">{{item}}
+					<i class="iconfont icon-right rotate-90 ml-sm" v-if="item == '日期筛选'"></i>
+				</view>
+			</view>
+		</fixed>
+
+		<view class="cate-item-area mt-md ml-lg mr-lg fill-base radius-16" @tap.stop="toChangeItem(index,'curInd')"
+			v-for="(item,index) in list.data" :key="index">
+			<view class="content f-title c-title pd-lg">
+				<view class="flex-between">
+					<view class="max-446 ellipsis">{{item.title}}</view>
+					<view class="c-success">+{{item.true_price}}</view>
+				</view>
+				<view class="flex-between f-caption c-caption">
+					<view>{{item.create_time}}</view>
+					<view>余额：{{item.now_balance}}</view>
+				</view>
+			</view>
+		</view>
+
+		<load-more :noMore="list.current_page>=list.last_page&&list.data.length>0" :loading="loading" v-if="loading">
+		</load-more>
+		<abnor v-if="!loading&&list.data.length<=0&&list.current_page==1"></abnor>
+
+		<view class="space-footer"></view>
+
+		<uni-popup ref="show_choose_time" type="top" :custom="true" :maskClick="false">
+			<view style="height: 95rpx;"></view>
+			<view class="popup-choose-time fill-base f-paragraph c-desc pt-lg pb-lg">
+				<view class="flex-center">
+					<view @tap.stop="toShowTime('start_time')" class="item-child flex-center flex-column">
+						<view>开始时间</view>
+						<view class="mt-sm" :style="{color:param.start_time ? primaryColor : '#999'}">
+							{{param.start_time || '选择时间'}}
+						</view>
+					</view>
+					<view @tap.stop="toShowTime('end_time')" class="item-child flex-center flex-column  b-1px-l">
+						<view>结束时间</view>
+						<view class="mt-sm" :style="{color:param.end_time ? primaryColor : '#999'}">
+							{{param.end_time || '选择时间'}}
+						</view>
+					</view>
+				</view>
+			</view>
+		</uni-popup>
+
+		<w-picker mode="date" :startYear="startYear*1-10" :endYear="startYear*1" :value="toDay" :current="false"
+			fields="day" @confirm="onConfirm($event)" :disabled-after="false" ref="day" :themeColor="primaryColor"
+			:visible.sync="showDate">
+		</w-picker>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapMutations
+	} from "vuex"
+	import wPicker from "@/components/w-picker/w-picker.vue";
+	export default {
+		components: {
+			wPicker
+		},
+		data() {
+			return {
+				toDay: '',
+				startYear: '',
+				showKey: '',
+				showDate: false,
+				rankList: ['本月', '日期筛选'],
+				rankInd: 0,
+				start_time: '',
+				param: {
+					page: 1,
+					start_time: '',
+					end_time: ''
+				},
+				list: {
+					data: []
+				},
+				loading: true,
+				curInd: -1,
+				startX: 0, //开始坐标
+				startY: 0, //开始坐标
+				lockTap: false
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+		}),
+		onLoad() {
+			this.$util.showLoading()
+			this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		onReachBottom() {
+			if (this.list.current_page >= this.list.last_page || this.loading) return;
+			this.param.page = this.param.page + 1;
+			this.loading = true;
+			this.getList();
+		},
+		methods: {
+			...mapMutations(['updateUserItem']),
+			async initIndex(refresh = false) {
+				// #ifdef H5
+				if (!refresh && this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				let cur_time = new Date(Math.ceil(new Date().getTime()))
+				this.toDay = this.$util.formatTime(cur_time, 'YY-M-D')
+				this.startYear = this.$util.formatTime(cur_time, 'YY')
+				this.start_time = this.$util.formatTime(cur_time, 'YY-M') + '-01'
+				await this.getList()
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+			},
+			initRefresh() {
+				this.param.page = 1
+				this.initIndex(true)
+			},
+			async getList() {
+				let {
+					list: oldList,
+					rankInd,
+					start_time,
+					toDay
+				} = this
+				let param = this.$util.deepCopy(this.param)
+				if (rankInd == 0) {
+					param.start_time = start_time
+					param.end_time = toDay
+				}
+				param.start_time = this.$util.DateToUnix(param.start_time)
+				param.end_time = this.$util.DateToUnix(param.end_time) + 24 * 3600 - 1
+				let newList = await this.$api.mine.balaceOrder(param);
+
+				newList.data.map(item => {
+					item.isTouchMove = false
+				})
+				if (this.param.page == 1) {
+					this.list = newList
+				} else {
+					newList.data = oldList.data.concat(newList.data)
+					this.list = newList
+				}
+				this.loading = false
+				this.$util.hideAll()
+			},
+			async toChangeItem(index, key) {
+				this[key] = index
+				if (key == 'rankInd') {
+					let methodModel = index == 1 ? 'open' : 'close'
+					this.$refs.show_choose_time[methodModel]()
+					if (index == 1) return
+					this.param.page = 1
+					await this.getList()
+				}
+			},
+			toShowTime(key) {
+				if (key == 'end_time' && !this.param.start_time) {
+					this.$util.showToast({
+						title: `请选择开始时间`
+					})
+					return
+				}
+				this.showKey = key
+				this.showDate = true
+			},
+			async onConfirm(val) {
+				let {
+					start_time,
+					end_time
+				} = this.param
+				let {
+					showKey
+				} = this
+
+
+				let show_unit = this.$util.DateToUnix(showKey == 'month' ? `${val.result}-01` : val.result)
+				let start_unit = start_time ? this.$util.DateToUnix(start_time) : 0
+				let end_unit = end_time ? this.$util.DateToUnix(end_time) : 0
+
+				if ((showKey == 'start_time' && end_unit && end_unit < this.$util.DateToUnix(val
+						.result)) ||
+					(showKey == 'end_time' && start_unit && start_unit > this.$util.DateToUnix(val.result))) {
+					this.$util.showToast({
+						title: `结束时间不能小于开始时间`
+					})
+					return
+				}
+				this.param[showKey] = val.result;
+				if (showKey == 'end_time') {
+					this.showDate = false
+					this.$refs.show_choose_time.close()
+					this.param.page = 1
+					await this.getList()
+				}
+			},
+			async toDel(index) {
+				let {
+					id,
+					title
+				} = this.list.data[index]
+				let [res_del, {
+					confirm
+				}] = await uni.showModal({
+					content: `请确认是否要删除‘${title}'`,
+				})
+				if (!confirm) return;
+				let param = {
+					id,
+					status: -1
+				}
+				await this.$api.master.goodsCateUpdate(param)
+				this.$util.showToast({
+					title: `删除成功`
+				})
+				this.list.data.splice(index, 1)
+			},
+			//手指触摸动作开始 记录起点X坐标
+			touchstart(e) {
+				//开始触摸时 重置所有删除
+				this.list.data.forEach(item => {
+					if (item.isTouchMove) //只操作为true的
+						item.isTouchMove = false;
+				})
+				this.startX = e.changedTouches[0].clientX
+				this.startY = e.changedTouches[0].clientY
+			},
+			//滑动事件处理
+			touchmove(e) {
+				let {
+					startX,
+					startY
+				} = this
+				let {
+					index
+				} = e.currentTarget.dataset //当前索引
+
+				let {
+					clientX,
+					clientY
+				} = e.changedTouches[0]
+				let touchMoveX = clientX
+				let touchMoveY = clientY
+				//获取滑动角度
+				let angle = this.angle({
+					X: startX,
+					Y: startY
+				}, {
+					X: touchMoveX,
+					Y: touchMoveY
+				});
+				this.list.data.forEach((v, i) => {
+					v.isTouchMove = false
+					//滑动超过30度角 return
+					if (Math.abs(angle) > 30) return;
+					if (i == index) {
+						if (touchMoveX > startX) //右滑
+							v.isTouchMove = false
+						else //左滑
+							v.isTouchMove = true
+					}
+				})
+			},
+			/**
+			 * 计算滑动角度
+			 * @param {Object} start 起点坐标
+			 * @param {Object} end 终点坐标
+			 */
+			angle(start, end) {
+				var _X = end.X - start.X,
+					_Y = end.Y - start.Y
+				//返回角度 /Math.atan()返回数字的反正切值
+				return 360 * Math.atan(_Y / _X) / (2 * Math.PI);
+			},
+		}
+	}
+</script>
+
+
+<style lang="scss">
+</style>
diff --git a/user/pages/technician-info.vue b/user/pages/technician-info.vue
new file mode 100644
index 0000000..7509f57
--- /dev/null
+++ b/user/pages/technician-info.vue
@@ -0,0 +1,480 @@
+<template>
+	<view class="technician-info order-pages rel" v-if="detail.id">
+		<banner @change="goBanner" :list="detail.banner" :margin="0" :autoplay="true" :height="717"
+			v-if="detail.banner.length > 0">
+		</banner>
+		<view class="ft-label flex-y-center f-paragraph">
+			<view class="ft-time flex-center c-base pl-lg pr-lg pt-md pb-md rel" >
+				<view class="ft-bg abs" :style="{background:primaryColor}"></view>
+				<view @tap.stop="toJump('ftList')" v-for="(item) in ftList" class="ft">
+					<i class="iconfont" :class="item.icon" :style="{color:primaryColor}"></i>
+					<span class="c-title ml-sm">{{ item.text }}</span>
+				</view>	
+			</view>
+		</view>		
+		<view class="pd-lg fill-base">		
+			<view class="flex-between">
+				<view class="f-title c-black text-bold max-500">{{detail.coach_name || '-'}}</view>
+				<view @tap.stop="toShield" class="flex-y-center">
+					<view class="like-label flex-center mr-sm radius"
+						:style="{background:detail.is_shield?'#FF8D4C':''}">
+						<i class="iconfont"
+							:class="[{'iconbuxihuan c-caption':!detail.is_shield},{'iconbuxihuan-xuanzhong c-base':detail.is_shield}]"></i>
+					</view>
+					屏蔽
+				</view>
+			</view>
+			<view class="flex-y-center mt-sm">
+				<view class="service-label flex-center f-icontext">
+					{{textType[detail.text_type]}}
+				</view>
+				<view class="time-label flex-y-center ml-md f-icontext c-base" v-if="detail.near_time" 
+					:style="{border:`1rpx solid ${primaryColor}`}">
+					<view class="near-text flex-center" :style="{background:primaryColor}">最早可约</view>
+					<view class="near-time flex-center c-base rel" :style="{color:primaryColor}">
+						<view class="bg abs" :style="{background:primaryColor}"></view>
+						今{{detail.near_time}}
+					</view>
+				</view>
+			</view>
+			<view class="flex-y-center mt-lg f-icontext c-caption">
+				<block v-if="(detail.store_id && detail.store_name) || (detail.admin_id && detail.admin_name)">
+					<view @tap.stop="goStoreMerchant" class="flex-y-center">
+						<i class="iconfont icondianpu"></i>
+						<view class="ellipsis" style="max-width: 250rpx;">{{detail.store_name || detail.admin_name}}
+						</view>
+					</view>
+					<view class="line"></view>
+				</block>
+				<view class="flex-y-baseline">
+					<i class="iconfont iconpingfen1 icon-font-color"></i>
+					<view class="star-text flex-y-center f-caption">{{detail.star || 0}}</view>
+				</view>
+				<view class="line"></view>
+				<view>已服务{{detail.order_num>9999?'9999+':detail.order_num}}单</view>
+				<view class="line"></view>
+				<view>从业{{detail.work_time}}年</view>
+			</view>
+		</view>
+		<view class="fill-base mt-md pt-lg pl-lg pr-md pb-lg">
+			<view class="pb-lg f-paragraph c-black text-bold">{{`${$t('action.attendantName')}简介`}}</view>
+			<scroll-view scroll-x class="picture-list">
+				<view @tap.stop="toPreviewImage(index,'self_img')" class="picture-item" v-for="(item,index) in detail.self_img"
+					:key="index">
+					<!-- #ifdef H5 -->
+					<view class="cover radius-16">
+						<view class="h5-image cover radius-16" :style="{ backgroundImage : `url('${item}')`}">
+						</view>
+					</view>
+					<!-- #endif -->
+					<!-- #ifndef H5 -->
+					<image mode="aspectFill" lazy-load class="cover radius-16" :src="item"></image>
+					<!-- #endif -->
+				</view>
+			</scroll-view>
+			<view class="introduce-info pt-md f-paragraph c-title radius-16">
+				<span v-if="!detail.showText">{{detail.text.substring(0,100000)}}</span>
+				<view v-else>
+					<text decode="emsp" style="word-break:break-all;">{{detail.text}}</text>
+				</view>
+				<span @tap.stop="toShowHide('showText')" :class="[{'ml-md':!detail.showText},{'mt-md':detail.showText}]"
+					:style="{color:primaryColor}" v-if="detail.have_show_text">
+
+				</span>
+			</view>			
+		</view>
+		<view class="fill-base mt-md pt-lg pl-lg pr-md pb-lg">
+			<view class="pb-lg f-paragraph c-black text-bold">资质证书</view>
+			<scroll-view scroll-x class="picture-list">
+				<view @tap.stop="toPreviewImage(index,'license')" class="picture-item" v-for="(item,index) in detail.license" 
+					:key="index">
+					<!-- #ifdef H5 -->
+					<view class="cover radius-16">
+						<view class="h5-image cover radius-16" :style="{ backgroundImage : `url('${item}')`}">
+						</view>
+					</view>
+					<!-- #endif -->					
+					<!-- #ifndef H5 -->
+					<image mode="aspectFill" lazy-load class="cover radius-16" :src="item"></image>
+					<!-- #endif -->
+					
+					
+				</view>
+			</scroll-view>	
+		</view>
+		<view class="fill-base mt-md pt-lg pb-lg">
+			<view @tap.stop="$util.goUrl({url: `/shopstore/pages/service?id=${options.id}`})"
+				class="flex-between pl-lg pr-md " :class="[{'pb-lg': serviceList.length>0}]">
+				<view class="f-paragraph c-black text-bold">选择项目</view>
+				<view @tap.stop="toComment" class="flex-y-center f-caption c-caption">查看评价<i
+						class="iconfont icongengduo" style="font-size: 24rpx;"></i></view>
+			</view>
+
+			<view class="pl-lg pr-lg b-1px-b mt-md pb-md"
+				v-for="(item,index) in serviceList" :key="index">
+				<service-list-item @order="toOrder(index)" from="technician-info" :info="item"
+					maxWidth="490rpx"></service-list-item>
+			</view>
+		</view>
+		<view class="space-footer"></view>
+		<technician-list-popup ref="technician_list_popup" from="technician-info"></technician-list-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions,
+		mapMutations
+	} from "vuex"
+	import serviceListItem from "@/components/service-list-item.vue"
+	import technicianListPopup from "@/components/technician-list-popup.vue"
+	export default {
+		components: {
+			serviceListItem,
+			technicianListPopup
+		},
+		data() {
+			return {
+				options: {},
+				textType: {
+					1: '可服务',
+					2: '服务中',
+					3: '可预约',
+					4: '不可预约'
+				},
+				ftList: [{
+					icon: 'icon-kzj',
+					text: '实名认证'
+				}, {
+					icon: 'icon-kpk',
+					text: '爽约包赔'
+				}, {
+					icon: 'icon-sybp',
+					text: '超时秒退'
+				}, {
+					icon: 'icon-kzz',
+					text: '资质证书'
+				}],				
+				detail: {},
+				serviceList: [],
+				loading: true,
+			}
+		},
+		computed: mapState({
+			primaryColor: state => state.config.configInfo.primaryColor,
+			subColor: state => state.config.configInfo.subColor,
+			configInfo: state => state.config.configInfo,
+			userInfo: state => state.user.userInfo,
+		}),
+		onLoad(options) {
+			this.options = options
+			this.initIndex()
+		},
+		onPullDownRefresh() {
+			// #ifndef APP-PLUS
+			uni.showNavigationBarLoading()
+			// #endif
+			this.initRefresh();
+			uni.stopPullDownRefresh()
+		},
+		methods: {
+			...mapActions(['getConfigInfo', 'getUserInfo']),
+			...mapMutations(['updateTechnicianItem', 'updateUserItem']),
+			async initIndex() {
+				// #ifdef H5
+				if (this.$jweixin.isWechat()) {
+					await this.$jweixin.initJssdk();
+					this.$jweixin.wxReady(() => {
+						this.$jweixin.hideOptionMenu()
+					})
+				}
+				// #endif
+				await this.getDetail()
+				this.$util.setNavigationBarColor({
+					bg: this.primaryColor
+				})
+				uni.setNavigationBarTitle({
+					title: this.$t('action.attendantName') + '详情'
+				})
+				await this.getList()
+			},
+			initRefresh() {
+				this.initIndex(true)
+			},
+			async getDetail() {
+				let {
+					id
+				} = this.options
+				let data = await this.$api.service.coachInfo({
+					id
+				});
+				data.banner = data.video ? [{
+					jump_type: 'video',
+					img: data.work_img,
+					jump_url: data.video
+				}] : [{
+					img: data.work_img
+				}]
+				let have_show_text = data.text.length > 42
+				data.have_show_text = have_show_text
+				data.showText = !have_show_text
+				this.detail = data
+			},
+			async getList() {
+				let {
+					id: coach_id
+				} = this.options
+				let {
+					data
+				} = await this.$api.service.coachServiceList({
+					coach_id
+				});
+				this.serviceList = data
+				this.loading = false
+				this.$util.hideAll()
+			},
+			async toShield() {
+				let {
+					id
+				} = this.options
+				await this.$api.mine.shieldCoachAdd({
+					type: 2,
+					coach_id: id
+				})
+				this.updateUserItem({
+					key: 'haveShieldOper',
+					val: 2
+				})
+				this.$util.back()
+				setTimeout(() => {
+					this.$util.goUrl({
+						url: 1,
+						openType: `navigateBack`
+					})
+				}, 1000)
+			},
+			// 预约
+			async toOrder(index) {
+				let {
+					is_work = 0
+				} = this.detail
+				if (!is_work) {
+					this.$util.showToast({
+						title: `该${this.$t('action.attendantName')}未上班`
+					})
+					return
+				}
+				let {
+					id: service_id,
+				} = this.serviceList[index]
+				let {
+					id: coach_id
+				} = this.options
+				if (this.lockTap) return;
+				this.lockTap = true;
+				try {
+					await this.$api.order.addCar({
+						service_id,
+						coach_id,
+						num: 1,
+						is_top: 1,
+						coach_service: 1
+					})
+					this.lockTap = false
+					let url = `/user/pages/order?id=${coach_id}&ser_id=${service_id}`
+					this.$util.goUrl({
+						url
+					})
+				} catch (e) {
+					this.lockTap = false
+				}
+			},
+			toShowHide(key) {
+				this.detail[key] = !this.detail[key]
+			},
+			toComment() {
+				this.$refs.technician_list_popup.toShowPopup(this.detail, 'message')
+			},
+			toPreviewImage(index, key = 0) {
+				let urls = this.detail[key]
+				if (key == 'work_img') {
+					urls = [urls]
+				}
+				this.$util.previewImage({
+					current: urls[index],
+					urls
+				})
+			},
+			goStoreMerchant() {
+				let {
+					store_id,
+					admin_id
+				} = this.detail
+				let url = store_id ? `/shopstore/pages/detail?id=${store_id}` : `/user/pages/merchant-info?id=${admin_id}`
+				this.$util.goUrl({
+					url
+				})
+			}
+		}
+	}
+</script>
+
+
+<style lang="scss">
+	.technician-info {
+		.cover-img {
+			width: 750rpx;
+			height: 417rpx;
+		}
+
+
+		.like-label {
+			width: 42rpx;
+			height: 42rpx;
+			background: #EFEFEF;
+
+			.iconfont {
+				font-size: 24rpx;
+				margin-top: 5rpx;
+			}
+		}
+
+		.service-label {
+			min-width: 88rpx;
+			height: 32rpx;
+			padding: 0 10rpx;
+			color: #EBDDB1;
+			background: linear-gradient(270deg, #4C545A 0%, #282B34 100%);
+			border-radius: 4rpx;
+		}
+
+		.time-label {
+
+			.near-text {
+				width: 110rpx;
+				height: 38rpx;
+				background: #F5F5F5;
+				border-radius: 3rpx 0 0 3rpx;
+			}
+
+			.near-time {
+				width: 110rpx;
+				height: 38rpx;
+				border-radius: 0 3rpx 3rpx 0;
+
+				.bg {
+					opacity: 0.1;
+					top: 0;
+					left: 0;
+					right: 0;
+					bottom: 0;
+					z-index: 1;
+					border-radius: 0 3rpx 3rpx 0;
+				}
+			}
+		}
+
+		.ft-label {
+			.near-text {
+				width: 100%;
+				height: 33rpx;
+				background: #F5F5F5;
+			}
+
+			.ft-time {
+				width: 100%;
+				height: 76rpx;
+
+				.ft-bg {
+					opacity: 0.1;
+					top: 0;
+					left: 0;
+					right: 0;
+					bottom: 0;
+					z-index: 1;
+					border-radius: 10rpx;
+				}
+			}
+			.ft{
+				display: flex;
+				align-items: center;
+				width: 100%;
+			}
+
+			.tp-img{
+				width: 183px;
+				height: 16px;
+			}			
+		}
+		
+		.icondianpu {
+			margin-right: 6rpx;
+		}
+
+		.iconpingfen1 {
+			font-size: 24rpx;
+			background-image: -webkit-linear-gradient(270deg, #FAD961 0%, #F76B1C 100%);
+		}
+
+		.star-text {
+			height: 26rpx;
+			color: #FF9519;
+			margin-left: 6rpx;
+		}
+
+		.line {
+			width: 1rpx;
+			height: 11rpx;
+			background: #979797;
+			margin: 0 18rpx;
+		}
+
+		.introduce-info {
+			width: 690rpx;
+		}
+
+		.picture-list {
+			white-space: nowrap;
+			width: 690rpx;
+
+			.picture-item {
+				width: 122rpx;
+				margin-left: 20rpx;
+				display: inline-block;
+
+				.cover {
+					width: 122rpx;
+					height: 122rpx;
+				}
+			}
+
+			.picture-item:nth-child(1) {
+				margin-left: 0;
+			}
+		}
+
+		.comment-item {
+			.avatar {
+				width: 52rpx;
+				height: 52rpx;
+				background: #f4f6f8;
+			}
+
+			.iconpingfen1 {
+				font-size: 28rpx;
+				margin-right: 5rpx;
+				font-size: 28rpx;
+			}
+		}
+		.top_rz {
+			width: 100%;
+			height: 30px;
+		}
+		.image_loading {
+			width: 100%;
+			height: 100%;
+		}		
+
+	}
+</style>
\ No newline at end of file
diff --git a/utils/bmap-wx.min.js b/utils/bmap-wx.min.js
new file mode 100644
index 0000000..2f4d563
--- /dev/null
+++ b/utils/bmap-wx.min.js
@@ -0,0 +1 @@
+"use strict";function _classCallCheck(t,a){if(!(t instanceof a))throw new TypeError("Cannot call a class as a function")}var _createClass=function(){function t(t,a){for(var e=0;e<a.length;e++){var i=a[e];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(t,i.key,i)}}return function(a,e,i){return e&&t(a.prototype,e),i&&t(a,i),a}}(),BMapWX=function(){function t(a){_classCallCheck(this,t),this.ak=a.ak}return _createClass(t,[{key:"getWXLocation",value:function(t,a,e,i){t=t||"gcj02",a=a||function(){},e=e||function(){},i=i||function(){},wx.getLocation({type:t,success:a,fail:e,complete:i})}},{key:"search",value:function(t){var a=this;t=t||{};var e={query:t.query||"生活服务$美食&酒店",scope:t.scope||1,filter:t.filter||"",coord_type:t.coord_type||2,page_size:t.page_size||10,page_num:t.page_num||0,output:t.output||"json",ak:a.ak,sn:t.sn||"",timestamp:t.timestamp||"",radius:t.radius||2e3,ret_coordtype:"gcj02ll"},i={iconPath:t.iconPath,iconTapPath:t.iconTapPath,width:t.width,height:t.height,alpha:t.alpha||1,success:t.success||function(){},fail:t.fail||function(){}},n="gcj02",o=function(t){e.location=t.latitude+","+t.longitude,wx.request({url:"https://api.map.baidu.com/place/v2/search",data:e,header:{"content-type":"application/json"},method:"GET",success:function(t){var a=t.data;if(0===a.status){var e=a.results,n={};n.originalData=a,n.wxMarkerData=[];for(var o=0;o<e.length;o++)n.wxMarkerData[o]={id:o,latitude:e[o].location.lat,longitude:e[o].location.lng,title:e[o].name,iconPath:i.iconPath,iconTapPath:i.iconTapPath,address:e[o].address,telephone:e[o].telephone,alpha:i.alpha,width:i.width,height:i.height};i.success(n)}else i.fail({errMsg:a.message,statusCode:a.status})},fail:function(t){i.fail(t)}})},s=function(t){i.fail(t)},c=function(){};if(t.location){var u=t.location.split(",")[1],r=t.location.split(",")[0],l="input location",p={errMsg:l,latitude:r,longitude:u};o(p)}else a.getWXLocation(n,o,s,c)}},{key:"suggestion",value:function(t){var a=this;t=t||{};var e={query:t.query||"",region:t.region||"全国",city_limit:t.city_limit||!1,output:t.output||"json",ak:a.ak,sn:t.sn||"",timestamp:t.timestamp||"",ret_coordtype:"gcj02ll"},i={success:t.success||function(){},fail:t.fail||function(){}};wx.request({url:"https://api.map.baidu.com/place/v2/suggestion",data:e,header:{"content-type":"application/json"},method:"GET",success:function(t){var a=t.data;0===a.status?i.success(a):i.fail({errMsg:a.message,statusCode:a.status})},fail:function(t){i.fail(t)}})}},{key:"regeocoding",value:function(t){var a=this;t=t||{};var e={coordtype:t.coordtype||"gcj02ll",pois:t.pois||0,output:t.output||"json",ak:a.ak,sn:t.sn||"",timestamp:t.timestamp||"",ret_coordtype:"gcj02ll"},i={iconPath:t.iconPath,iconTapPath:t.iconTapPath,width:t.width,height:t.height,alpha:t.alpha||1,success:t.success||function(){},fail:t.fail||function(){}},n="gcj02",o=function(t){e.location=t.latitude+","+t.longitude,wx.request({url:"https://api.map.baidu.com/geocoder/v2/",data:e,header:{"content-type":"application/json"},method:"GET",success:function(a){var e=a.data;if(0===e.status){var n=e.result,o={};o.originalData=e,o.wxMarkerData=[],o.wxMarkerData[0]={id:0,latitude:t.latitude,longitude:t.longitude,address:n.formatted_address,iconPath:i.iconPath,iconTapPath:i.iconTapPath,desc:n.sematic_description,business:n.business,alpha:i.alpha,width:i.width,height:i.height},i.success(o)}else i.fail({errMsg:e.message,statusCode:e.status})},fail:function(t){i.fail(t)}})},s=function(t){i.fail(t)},c=function(){};if(t.location){var u=t.location.split(",")[1],r=t.location.split(",")[0],l="input location",p={errMsg:l,latitude:r,longitude:u};o(p)}else a.getWXLocation(n,o,s,c)}},{key:"weather",value:function(t){var a=this;t=t||{};var e={coord_type:t.coord_type||"gcj02",output:t.output||"json",ak:a.ak,sn:t.sn||"",timestamp:t.timestamp||""},i={success:t.success||function(){},fail:t.fail||function(){}},n="gcj02",o=function(t){e.location=t.longitude+","+t.latitude,wx.request({url:"https://api.map.baidu.com/telematics/v3/weather",data:e,header:{"content-type":"application/json"},method:"GET",success:function(t){var a=t.data;if(0===a.error&&"success"===a.status){var e=a.results,n={};n.originalData=a,n.currentWeather=[],n.currentWeather[0]={currentCity:e[0].currentCity,pm25:e[0].pm25,date:e[0].weather_data[0].date,temperature:e[0].weather_data[0].temperature,weatherDesc:e[0].weather_data[0].weather,wind:e[0].weather_data[0].wind},i.success(n)}else i.fail({errMsg:a.message,statusCode:a.status})},fail:function(t){i.fail(t)}})},s=function(t){i.fail(t)},c=function(){};if(t.location){var u=t.location.split(",")[0],r=t.location.split(",")[1],l="input location",p={errMsg:l,latitude:r,longitude:u};o(p)}else a.getWXLocation(n,o,s,c)}}]),t}();module.exports.BMapWX=BMapWX;
\ No newline at end of file
diff --git a/utils/error.js b/utils/error.js
new file mode 100644
index 0000000..ade8e8d
--- /dev/null
+++ b/utils/error.js
@@ -0,0 +1,46 @@
+//网络错误
+const networkError = function({
+	code = 0,
+	msg = '网络异常'
+} = {}) {
+	if (code !== 0) return;
+	uni.showToast({
+		title: msg,
+		icon: 'none',
+		duration: 4000
+	})
+}
+//服务器错误处理
+const serverError = function({
+	code = -1,
+	msg = '服务器错误'
+} = {}) {
+	uni.showModal({
+		title: '提示',
+		content: msg,
+		showCancel: false
+	})
+}
+//错误信息
+const msgError = function({
+	msg = '错误'
+} = {}) {
+	if (msg.length > 20) {
+		uni.showModal({
+			title: '',
+			content: msg,
+			showCancel: false
+		})
+	} else {
+		uni.showToast({
+			title: msg,
+			icon: 'none',
+			duration: 4000
+		})
+	}
+}
+export {
+	networkError,
+	serverError,
+	msgError
+}
diff --git a/utils/index.js b/utils/index.js
new file mode 100644
index 0000000..c798647
--- /dev/null
+++ b/utils/index.js
@@ -0,0 +1,718 @@
+import Validate from './validate.js';
+import $store from "@/store/index.js"
+export default {
+	Validate,
+	log: console.log,
+	// log: () => {},
+	//格式化时间
+	formatTime(date, format) {
+		let newFormat = format || 'YY-M-D h:m:s';
+		let formatNumber = this.formatNumber;
+		let newDate = date || new Date();
+		if (Object.prototype.toString.call(newDate).slice(8, -1) !== "Date") {
+			newDate = new Date(date);
+		}
+		let week = ['Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday', 'Saturday', '日', '一', '二', '三',
+			'四',
+			'五', '六'
+		];
+		return newFormat.replace(/YY|Y|M|D|h|m|s|week|星期/g, function(a) {
+			switch (a) {
+				case 'YY':
+					return newDate.getFullYear();
+				case 'Y':
+					return (newDate.getFullYear() + '').slice(2);
+				case 'M':
+					return formatNumber(newDate.getMonth() + 1);
+				case 'D':
+					return formatNumber(newDate.getDate());
+				case 'h':
+					return formatNumber(newDate.getHours());
+				case 'm':
+					return formatNumber(newDate.getMinutes());
+				case 's':
+					return formatNumber(newDate.getSeconds());
+				case '星期':
+					return "星期" + week[newDate.getDay() + 7];
+				case 'week':
+					return week[newDate.getDay()];
+			}
+		})
+	},
+	// 日期转时间戳
+	DateToUnix: function(string) {
+		var f = string.split(' ', 2);
+		var d = (f[0] ? f[0] : '').split('-', 3);
+		var t = (f[1] ? f[1] : '').split(':', 3);
+		return (new Date(
+			parseInt(d[0], 10) || null,
+			(parseInt(d[1], 10) || 1) - 1,
+			parseInt(d[2], 10) || null,
+			parseInt(t[0], 10) || null,
+			parseInt(t[1], 10) || null,
+			parseInt(t[2], 10) || null
+		)).getTime() / 1000;
+	},
+	//格式化数字
+	formatNumber(n) {
+		n = n.toString();
+		return n[1] ? n : '0' + n
+	},
+	// 保留小数 （不四舍五入）
+	formatDecimal(num, decimal) {
+		num = num.toString()
+		let index = num.indexOf('.')
+		if (index !== -1) {
+			num = num.substring(0, decimal + index + 1)
+		} else {
+			num = num.substring(0)
+		}
+		return parseFloat(num).toFixed(decimal)
+	},
+	// 实时检测输入金额
+	formatMoney(val) {
+		if (val.slice(0, 1) == "0" && val.slice(1, 2) > 0) {
+			val = val.slice(1, 2);
+		}
+		if (val.slice(0, 1) == ".") {
+			val = '0.';
+		}
+		if (val == "0.00") {
+			val = '0.0';
+		}
+		return val.replace(/[^\d\.]|^\./g, '').replace(/\.{2}/g, '.').replace(
+			/^([1-9]\d*|0)(\.\d{1,2})(\.|\d{1})?$/, '$1$2').replace(/^0\d{1}/g, '0')
+	},
+	toWeiXinString(date) {
+		let str;
+		let newDate = date || new Date();
+		if (Object.prototype.toString.call(newDate).slice(8, -1) !== "Date") {
+			newDate = new Date(date);
+		}
+		const now = newDate;
+		const today = new Date(now.getFullYear(), now.getMonth(), now.getDate());
+		const yesterday = new Date(now.getFullYear(), now.getMonth(), now.getDate() - 1);
+		const beforeYesterday = new Date(now.getFullYear(), now.getMonth(), now.getDate() - 2);
+		const monday = new Date(today);
+		monday.setDate(today.getDate() - (today.getDay() ? today.getDay() - 1 : 6));
+		//注意：date初始化默认是按本地时间初始的，但打印默认却是按GMT时间打印的，也就是说打印出的不是本地现在的时间
+		//LocaleString的打印也有点问题，"0点"会被打印为"上午12点"
+		if (now.getTime() > today.getTime()) {
+			str = "";
+		} else if (now.getTime() > yesterday.getTime()) {
+			str = "昨天";
+		} else if (now.getTime() > beforeYesterday.getTime()) {
+			str = "前天";
+		} else if (now.getTime() > monday.getTime()) {
+			const week = {
+				"0": "周日",
+				"1": "周一",
+				"2": "周二",
+				"3": "周三",
+				"4": "周四",
+				"5": "周五",
+				"6": "周六"
+			};
+			str = week[now.getDay() + ""];
+		} else {
+			const hour = ["凌晨", "早上", "下午", "晚上"];
+			const h = now.getHours();
+			if (h == 12) str = "中午";
+			else str = hour[parseInt(h / 6)];
+			str = now.format("MM月dd ") + str;
+		}
+		str += now.format("HH:ss");
+		return str;
+	},
+	//返回类型
+	typeOf(param) {
+		return Object.prototype.toString.call(param).slice(8, -1)
+	},
+	//判断是否为空
+	isEmpty(param) {
+		//基本类型为空
+		let condition1 = param === '' || param === null || param === undefined || param === "NaN";
+		let condition2;
+		let condition3
+		//引用类型为空
+		if (!condition1) {
+			condition2 = this.typeOf(param) === "Object" && Object.keys(param).length < 1;
+			condition3 = this.typeOf(param) === "Array" && param.length < 1;
+		}
+		return condition1 || condition2 || condition3;
+	},
+	showLoading({
+		title = "加载中",
+		mask = true
+	} = {}) {
+		uni.showLoading({
+			title,
+			mask
+		});
+	},
+	showToast({
+		title,
+		icon = "none"
+	} = {}) {
+		uni.showToast({
+			title,
+			icon,
+			duration: 2000
+		});
+	},
+	hideAll() {
+		uni.hideLoading();
+		uni.stopPullDownRefresh();
+		uni.hideNavigationBarLoading();
+	},
+	showModal({
+		title = "提示",
+		content = "没有返回值,检查服务器是否正常"
+	}) {
+		uni.showModal({
+			title,
+			content,
+			showCancel: false
+		});
+	},
+	setNavigationBarColor({
+		color = '#ffffff',
+		bg
+	}) {
+		uni.setNavigationBarColor({
+			frontColor: color,
+			backgroundColor: bg,
+			// animation: {
+			// 	duration: 100,
+			// 	timingFunc: 'easeIn'
+			// }
+		})
+	},
+	getQueryString(name) {
+		let reg = new RegExp("([^?&]*)" + name + "=([^&]*)(&|$)");
+		let r = window.location.href.match(reg);
+		if (r !== null) return unescape(r[2]);
+		return null
+	},
+	getHostname(url) {
+		var reg = /^http(s)?:\/\/(.*?)\//
+		// 必须是http开头或者https开头，结尾为'/'
+		var ToReplace = 'Host/'
+		url.replace(reg, ToReplace)
+		url = reg.exec(url)[2];
+		return url;
+	},
+	//获取标签上data
+	getDataSet(e) {
+		return e.currentTarget.dataset
+	},
+	//获表单控件值
+	getValue(e) {
+		return e.detail.value
+	},
+	async getNavBarHeight() {
+		var {
+			statusBarHeight,
+			navigationBarHeight
+		} = await uni.getSystemInfoSync()
+
+		let navBarHeight = statusBarHeight * 1 + 44
+		// #ifdef MP-BAIDU
+		navBarHeight = statusBarHeight * 1 + navigationBarHeight * 1
+		// #endif
+		return navBarHeight
+	},
+	pick(obj, arr) {
+		return arr.reduce((acc, curr) => (curr in obj && (acc[curr] = obj[curr]), acc), {});
+	},
+	getUrlToStr(url, params) {
+		let text = url
+		if (params) {
+			text = `${url}?` + Object.keys(params)
+				.filter(key => params[key] || params[key] === 0) // 删除无值的字段，可根据需要进行保留或删除
+				.map(key => `${key}=${params[key]}`)
+				.toString().replace(/,/g, '&')
+		}
+		return text
+	},
+	toCheckLogin(param) {
+		let {
+			loginType = 'weixin',
+				userInfo
+		} = $store.state.user
+		let {
+			id: uid = 0,
+			phone = ''
+		} = userInfo
+		let {
+			short_code_status = 0
+		} = $store.state.config.configInfo
+
+		let checkLogin = true
+
+		// #ifdef H5
+		loginType = 'weixin'
+		// #endif
+
+		// #ifndef MP-WEIXIN
+		if (!uid || (loginType === 'weixin' && short_code_status && !phone)) {
+			checkLogin = false
+			let pages = getCurrentPages()
+			let {
+				route,
+				options = {}
+			} = pages[pages.length - 1]
+			let routeUrl = this.getUrlToStr(`/${route}`, options)
+			let url = !uid ? `/pages/login` : `/user/pages/phone`
+			$store.commit('updateUserItem', {
+				key: 'loginPage',
+				val: routeUrl
+			})
+			this.goUrl({
+				url
+			})
+		}
+		// #endif
+
+		if (checkLogin) {
+			this.goUrl(param)
+		}
+	},
+	goUrl({
+		url = "",
+		openType = "navigateTo",
+		path = "",
+		query = ""
+	} = {}) {
+		let that = this;
+		if (!url) return;
+		if (this.typeOf(query) == 'Object') {
+			let queryStr = Object.keys(query).map(k => `${k}=${query[k]}`).join('&');
+			url = `${url}&${queryStr}`
+		}
+		let list = ["navigateTo", "redirectTo", "switchTab", "reLaunch"];
+		if (list.includes(openType)) {
+			if (openType == 'navigateTo' && getCurrentPages().length > 9) {
+				uni.redirectTo({
+					url
+				})
+			} else {
+				uni[openType]({
+					url
+				})
+			}
+		}
+		//返回
+		openType == "navigateBack" && uni.navigateBack({
+			delta: url
+		})
+		//跳转小程序
+		openType == "miniProgram" && uni.navigateToMiniProgram({
+			appId: url,
+			path
+		})
+		//打电话
+		openType == "call" && uni.makePhoneCall({
+			phoneNumber: url
+		})
+		// 复制文本
+		openType == 'copy' && uni.setClipboardData({
+			data: url,
+			success: function(res) {
+				uni.getClipboardData({
+					success: function(res) {
+						// #ifdef MP-BAIDU 
+						that.showToast({
+							title: '复制成功'
+						})
+						// #endif
+						console.log('复制文本成功 ==>', res.data);
+					}
+				});
+			}
+		})
+		//跳转网页/播放视频
+		if (openType == "web" || openType == 'video') {
+			let encode_url = encodeURIComponent(url)
+			uni.navigateTo({
+				url: `/user/pages/common/${openType}?url=${encode_url}`
+			})
+		}
+	},
+	// 刷新上页数据
+	back() {
+		let pages = getCurrentPages(); //当前页面栈
+		if (pages.length > 1) {
+			var beforePage = pages[pages.length - 2]; //获取上一个页面实例对象  
+			//触发父页面中的方法change()  
+			beforePage.$vm.initRefresh()
+		}
+	},
+	//获取页面对象，0时为当前页面
+	getPage(index = 0) {
+		let pages = getCurrentPages();
+		let page = pages[pages.length - 1 + index]
+		return page.$vm
+	},
+	// 预览图片
+	previewImage(param) {
+		let {
+			current,
+			urls
+		} = param;
+		uni.previewImage({
+			current,
+			urls,
+		})
+	},
+	// 根据type获取数据字符串 
+	getItems(o, type = 'id', sign = ',') {
+		let items = [];
+		o = o || [];
+		o.forEach((item) => {
+			items.push(item[type])
+		})
+		return items.join(sign);
+	},
+	// 检查授权
+	async checkAuth({
+		type = "userLocation",
+		tip = ""
+	} = {}) {
+		// #ifdef MP-WEIXIN
+		let contentList = {
+			phone: "授权获取手机号",
+			userLocation: "你的地理位置",
+			address: "你的通讯地址",
+			invoiceTitle: "发票抬头",
+			invoice: "获取发票",
+			werun: "微信运动步数",
+			record: "你的录音功能",
+			writePhotosAlbum: "你的保存到相册功能",
+			camera: "摄像头"
+		}
+		tip = tip || `您暂未开启${contentList[type]}的授权，是否开启?`
+		// 声明
+		let err, result;
+		[err, result] = await uni.getSetting();
+		//获取配置失败
+		if (err) {
+			return Promise.reject(err);
+		}
+		//如果已授权
+		if (result.authSetting[`scope.${type}`]) {
+			return true
+		}
+		// 调用获取权限
+		[err, result] = await uni.authorize({
+			scope: `scope.${type}`
+		})
+		//获取成功
+		if (!err) {
+			return true
+		}
+		uni.hideLoading()
+		//提示去设置
+		return new Promise((resove, reject) => {
+			uni.showModal({
+				content: tip,
+				success(res) {
+					if (res.confirm) {
+						uni.openSetting({
+							success(result) {
+								if (result.authSetting[`scope.${type}`]) {
+									resove(true)
+								} else {
+									reject()
+								}
+							}
+						})
+					} else {
+						reject()
+					}
+				}
+			})
+		})
+		// #endif
+	},
+	//深拷贝
+	deepCopy(o) {
+		let that = this;
+		if (o instanceof Array) {
+			var n = [];
+			for (var i = 0; i < o.length; ++i) {
+				n[i] = that.deepCopy(o[i]);
+			}
+			return n;
+		} else if (o instanceof Function) {
+			var n = new Function("return " + o.toString())();
+			return n
+		} else if (o instanceof Object) {
+			var n = {}
+			for (var i in o) {
+				n[i] = that.deepCopy(o[i]);
+			}
+			return n;
+		} else {
+			return o;
+		}
+	},
+	getOptions(options, comminOptions = {}) {
+		return Object.assign({}, comminOptions, this.formatOptions(options))
+	},
+	//获取用户端公共参数
+	getCommonOptions(options) {
+		return this.pick(options, ["staff_id"])
+	},
+	// 微信支付
+	async pay(pay_list) {
+		let that = this;
+		let param = {}
+
+		// #ifdef H5
+		param = that.pick(pay_list, ['appId', 'timeStamp', 'nonceStr', 'package', 'signType',
+			'paySign'
+		])
+		if (typeof WeixinJSBridge != "undefined") {
+			return new Promise((resove, reject) => {
+				WeixinJSBridge.invoke(
+					'getBrandWCPayRequest', param,
+					function(res) {
+						if (res.err_msg == "get_brand_wcpay_request:ok") {
+							setTimeout(() => {
+								resove(true)
+							}, 1000)
+						} else {
+							that.showToast({
+								title: `支付失败`
+							})
+							setTimeout(() => {
+								reject("支付失败")
+							}, 1000)
+						}
+					})
+			});
+		}
+		// #endif
+
+
+		let {
+			provider = 'wxpay',
+				orderInfo = ''
+		} = pay_list
+
+		// #ifdef MP-WEIXIN
+		param = that.pick(pay_list, ['nonceStr', 'package', 'signType', 'paySign', 'timeStamp'])
+		// #endif
+		// #ifdef APP-PLUS
+		if (provider == 'wxpay') {
+			orderInfo = that.pick(pay_list, ['appid', 'noncestr', 'package', 'partnerid', 'prepayid',
+				'timestamp'
+			])
+			orderInfo.sign = pay_list.paySign
+			orderInfo = JSON.stringify(orderInfo)
+		}
+		param = {
+			provider,
+			orderInfo
+		}
+		// #endif
+		// #ifndef H5
+		let [err, res] = await uni.requestPayment(param)
+		if (err) {
+			console.log("=======pay err", err)
+			that.showToast({
+				title: `支付失败`
+			})
+			await Promise.reject("支付失败")
+		} else {
+			return true
+		}
+		// #endif
+	},
+	//小程序自带获取定位
+	getLocation() {
+		let that = this;
+		return new Promise((resove, reject) => {
+			uni.getLocation({
+				success: function(res) {
+					resove(res)
+				},
+				fail: function(e) {
+					console.log(e)
+					reject(e)
+				}
+			})
+		})
+	},
+	//百度地图获取定位
+	getBmapLocation: function(ak = 'GoI7BxLpfvBEyf1TcMXCloi99Vov7flZ', openLocation = false) {
+		//定位
+		let that = this;
+		let bmap = require('./bmap-wx.min.js');
+		let BMap = new bmap.BMapWX({
+			ak
+		});
+		return new Promise((resove, reject) => {
+			BMap.regeocoding({
+				success: function(data) {
+					let addressInfo = data.originalData.result;
+					let {
+						lat,
+						lng
+					} = addressInfo.location;
+					let {
+						formatted_address: address,
+						addressComponent
+					} = addressInfo;
+					let {
+						province,
+						city,
+						district
+					} = addressComponent
+					//只返回需要的数据
+					let locationInfo = {
+						lat,
+						lng,
+						address,
+						province,
+						city,
+						district,
+					}
+					// console.log(locationInfo, "====util locationInfo");
+					//成功回调
+					resove(locationInfo)
+				},
+				fail: function(res) {
+					//失败返回默认的数据
+					let locationInfo = {
+						name: '',
+						latitude: 0,
+						longitude: 0,
+						address: '',
+						city: ''
+					}
+					resove(locationInfo)
+					that.hideAll()
+					//失败后的提示
+					let errMsg = res.errMsg;
+					// #ifdef APP-PLUS
+					let {
+						isIos = false
+					} = $store.state.config.configInfo
+					if (!isIos || openLocation) {
+						if (errMsg.includes("domain")) {
+							uni.showModal({
+								title: "获取定位失败",
+								content: `请在小程序公众平台添加百度域名api.map.baidu.com`,
+								showCancel: false
+							})
+							return;
+						}
+						if (errMsg.includes("Referer")) {
+							uni.showModal({
+								title: "获取定位失败",
+								content: `登录百度开放平台给ak添加白名单`,
+								showCancel: false
+							})
+							return;
+						}
+						uni.showModal({
+							title: '提示',
+							content: '获取定位失败，是否授权打开定位',
+							success: (res) => {
+								if (res.confirm) {
+									uni.getSystemInfo({
+										success: (sys) => {
+											if (sys.platform ==
+												'ios') {
+												plus.runtime
+													.openURL(
+														"app-settings://"
+													);
+											} else {
+												var main = plus
+													.android
+													.runtimeMainActivity();
+												var Intent = plus
+													.android
+													.importClass(
+														"android.content.Intent"
+													);
+												//可能应该直接进入应用列表的权限设置？=> android.settings.APPLICATION_SETTINGS  
+												var mIntent =
+													new Intent(
+														'android.settings.LOCATION_SOURCE_SETTINGS'
+													);
+												main.startActivity(
+													mIntent);
+											}
+										}
+									})
+								}
+							}
+						})
+					}
+					// #endif
+					// #ifndef APP-PLUS
+					if (errMsg.includes("domain")) {
+						uni.showModal({
+							title: "获取定位失败",
+							content: `请在小程序公众平台添加百度域名api.map.baidu.com`,
+							showCancel: false
+						})
+						return;
+					}
+					if (errMsg.includes("Referer")) {
+						uni.showModal({
+							title: "获取定位失败",
+							content: `登录百度开放平台给ak添加白名单`,
+							showCancel: false
+						})
+						return;
+					}
+					uni.showModal({
+						title: "地理位置授权",
+						content: "为了更好的为您服务，请开启您手机中的定位授权",
+						confirmText: "去授权",
+						success(res) {
+							if (res.confirm) {
+								uni.openSetting({
+									success(result) {
+										if (result.authSetting[
+												`scope.userLocation`]) {
+											resove(true)
+										} else {
+											reject()
+										}
+									}
+								})
+							} else {
+								uni.showModal({
+									title: "提示",
+									content: "您取消了授权，是否重新设置【位置信息】权限",
+									confirmText: "去授权",
+									success(res) {
+										if (!res.confirm) return
+										uni.openSetting({
+											success(result) {
+												if (result.authSetting[
+														`scope.userLocation`
+													]) {
+													resove(true)
+												} else {
+													reject()
+												}
+											}
+										})
+									}
+								})
+							}
+						}
+					})
+					// #endif
+				}
+			})
+		})
+	},
+}
diff --git a/utils/jweixin.js b/utils/jweixin.js
new file mode 100644
index 0000000..64ef22f
--- /dev/null
+++ b/utils/jweixin.js
@@ -0,0 +1,186 @@
+import $api from "@/api/index.js"
+import $util from "@/utils/index.js"
+import $store from "@/store/index.js"
+var jweixin = require('jweixin-module');
+
+export default {
+	//判断是否在微信中    
+	async isWechat() {
+		var ua = window.navigator.userAgent.toLowerCase();
+		if (ua.match(/micromessenger/i) == 'micromessenger') {
+			//console.log('是微信客户端')  
+			return true;
+		} else {
+			//console.log('不是微信客户端')  
+			return false;
+		}
+	},
+	async initJssdk() {
+		// let page = window.location.href.split('#')[0]; //获取当前url然后传递给后台获取授权和签名信息
+		// let page = /(Android)/i.test(navigator.userAgent) ? window.location.href.split('?#')[0]+'?' : window.entryUrl;
+		let page = window.entryUrl;
+		// console.log(page)
+		var {
+			appid: appId,
+			timestamp,
+			nonceStr,
+			signature
+		} = await $api.base.getWebConfig({
+			page
+		});
+		// signature = signature + `abcdef`
+		jweixin.config({
+			debug: false,
+			appId,
+			timestamp,
+			nonceStr,
+			signature,
+			jsApiList: [ //这里是需要用到的接口名称  
+				'checkJsApi', //判断当前客户端版本是否支持指定JS接口  
+				'getLocation', //获取位置  
+				'openLocation', //打开位置  
+				'scanQRCode', //扫一扫接口  
+				'chooseWXPay', //微信支付  
+				'chooseImage', //拍照或从手机相册中选图接口  
+				'previewImage', //预览图片接口
+				'uploadImage', //上传图片  
+				'updateAppMessageShareData',
+				'updateTimelineShareData',
+				'onMenuShareAppMessage',
+				'onMenuShareTimeline',
+				'hideOptionMenu',
+				'showOptionMenu',
+				'showMenuItems'
+			]
+		});
+	},
+	wxReady: function(fn) {
+		jweixin.ready(function() {
+			fn()
+		})
+	},
+	async wxReady2() {
+		return new Promise((resolve, reject) => {
+			jweixin.ready(function() {
+				resolve(1)
+			})
+		});
+	},
+	// 关闭右上菜单
+	async hideOptionMenu() {
+		return new Promise((resolve, reject) => {
+			jweixin.hideOptionMenu()
+		});
+	},
+	// 开启右上菜单
+	async showOptionMenu() {
+		return new Promise((resolve, reject) => {
+			jweixin.showOptionMenu()
+			jweixin.showMenuItems({
+				menuList: [
+					'menuItem:share:appMessage',
+					'menuItem:share:timeline'
+				]
+			})
+		})
+	},
+	/*分享给微信朋友*/
+	shareAppMessage: function(title, desc, link, imgUrl) {
+		jweixin.updateAppMessageShareData({
+			title,
+			desc,
+			link,
+			imgUrl,
+			success: function(res) {
+				// console.log(res, "======shareAppMessage res")
+			}
+		})
+		jweixin.onMenuShareAppMessage({
+			title,
+			desc,
+			link,
+			imgUrl,
+			success: function(res) {
+				// console.log(res, "======onMenuShareAppMessage res")
+			}
+		})
+	},
+	/*分享微信朋友圈*/
+	shareTimelineMessage: function(title, link, imgUrl) {
+		jweixin.updateTimelineShareData({
+			title,
+			link,
+			imgUrl,
+			success: function(res) {
+				// console.log(res, "======shareTimelineMessage res")
+			}
+		})
+		jweixin.onMenuShareTimeline({
+			title,
+			link,
+			imgUrl,
+			success: function(res) {
+				// console.log(res, "======onMenuShareTimeline res")
+			}
+		})
+	},
+	async getWxLocation() {
+		let location = {
+			latitude: 0,
+			longitude: 0
+		}
+		return new Promise((resolve, reject) => {
+			try {
+				jweixin.checkJsApi({
+					jsApiList: ['getLocation'],
+					success: function(res) {
+						
+						// 以键值对的形式返回，可用的api值true，不可用为false
+						// 如：{"checkResult":{"chooseImage":true},"errMsg":"checkJsApi:ok"}
+						console.log(res, "=======checkJsApi")
+						
+						
+						let {
+							getLocation
+						} = res.checkResult
+						if (getLocation === true && getLocation !== 'false') {
+							
+							jweixin.getLocation({
+								type: 'gcj02', // 默认为wgs84的gps坐标，如果要返回直接给openLocation用的火星坐标，可传入'gcj02'
+								success: function(res) {
+									console.log(res, "===== getLocation success")
+									resolve(res)
+								},
+								cancel: function(err){
+									console.log(err, "==== getLocation cancel")
+									resolve(location)
+								},
+								fail: function(err) {
+									console.log(err,"===== getLocation fail")
+									reject(err)
+								}
+							});
+						} else {
+							console.log(res, "==== getLocation else")
+							resolve(location)
+						}
+					},
+					fail: function(err){
+						console.log(res, "==== checkJsApi error")
+					}
+				})
+			} catch (e) {
+				console.log(1111111111111)
+				console.log(e)
+				jweixin.error((err) => {
+					console.log('wx-config-error', err);
+					if (err.errMsg.includes('invalid signature')) {
+						resolve(location)
+					}
+				});
+			}
+
+		});
+
+	}
+}
diff --git a/utils/req.js b/utils/req.js
new file mode 100644
index 0000000..fd76a9f
--- /dev/null
+++ b/utils/req.js
@@ -0,0 +1,569 @@
+// 接口返回值code说明
+// 200=>正常；
+// 400=>报错；
+// 401=>需要登陆；
+// 402=>错误并且弹出报错，报错内容为 error；
+// 403=>错误并且弹出报错，报错内容为 error(小程序跳转到个人中心)；
+// 404=>错误并且弹出报错，报错内容为 error(小程序跳转到首页)；
+
+var Fly = require("./wx.js") //wx.js为您下载的源码文件
+var fly = new Fly; //创建fly实例
+var tokenFly = new Fly();
+import $api from '@/api/index.js';
+import $util from './index.js';
+import siteInfo from '../siteinfo.js';
+import $store from "@/store/index.js"
+
+// 打印站点信息siteInfo
+let allSiteInfo = Object.assign({}, {
+	time: "2023年03月13日 18:00",
+	remark: "(test)~ update:sp86~",
+}, siteInfo)
+
+import {
+	networkError,
+	serverError,
+	msgError
+} from './error.js';
+import store from '@/store/index.js';
+//添加finally方法,用于指定不管 Promise 对象最后状态如何，都会执行的操作
+Promise.prototype.finally = function(callback) {
+	let P = this.constructor;
+	return this.then(
+		value => P.resolve(callback()).then(() => value),
+		reason => P.resolve(callback()).then(() => {
+			throw reason
+		})
+	);
+};
+
+let isW7 = false
+let isH5 = false
+const formatUrl = function(url) {
+	let model_name = "longbing_massages_city";
+	let baseUrl = isW7 ?
+		`${siteInfo.siteroot}?i=${siteInfo.uniacid}&t=${siteInfo.multiid}&v=${siteInfo.version}&from=wxapp&c=entry&a=wxapp&do=api&core=core2&m=${model_name}&s=${url}&urls=${url}` :
+		`${siteInfo.siteroot}?i=${siteInfo.uniacid}&m=${model_name}&s=${url}&urls=${url}`
+
+	if (isH5) {
+		baseUrl = `/api?i=${siteInfo.uniacid}&m=${model_name}&s=${url}`
+	}
+	return baseUrl
+}
+//阿里云地址转为本地域名的 
+const formatImageUrl = function(url) {
+	return url.includes(siteInfo.siteroot) ? url :
+		`${formatUrl("card/getImage")}&path=${encodeURIComponent(url)}`
+}
+
+//微信小程序登录
+const wxLogin = async function() {
+	let {
+		query
+	} = await uni.getLaunchOptionsSync();
+	let url = formatUrl("index/login")
+	try {
+		uni.showLoading({
+			title: "登录中..."
+		})
+		let [providerErr, providerData] = await uni.getProvider({
+			service: 'oauth',
+		});
+		let [loginErr, loginData] = await uni.login({
+			provider: providerData.provider[0]
+		});
+
+		let {
+			pid = 0,
+				coupon_atv_id = 0,
+		} = query
+
+		let login_param = {
+			code: loginData.code,
+			pid,
+			coupon_atv_id,
+		}
+
+		// console.log("login_param==>", login_param);
+
+		let d = await tokenFly.post(url, login_param);
+		let {
+			code,
+			data,
+			error
+		} = d.data
+
+
+		if (code !== 200) {
+			uni.hideLoading()
+			serverError({
+				code,
+				msg: error
+			});
+			throw d;
+		}
+		//登录成功
+		uni.hideLoading()
+		$store.commit('updateUserItem', {
+			key: 'userInfo',
+			val: data.data
+		})
+		$store.commit('updateUserItem', {
+			key: 'autograph',
+			val: data.autograph
+		})
+		return data;
+	} catch (e) {
+		uni.hideLoading()
+		let {
+			code,
+			error
+		} = e.response.data
+		if (code !== 200) {
+			serverError({
+				code,
+				msg: error
+			});
+		}
+		return await Promise.reject(e);
+	}
+}
+
+
+//公众号登录
+let H5LoginNum = 0
+let pageArr = ['/pages/order']
+const gzhLogin = async function() {
+	let code = $util.getQueryString('code')
+	let pageUrl = window.location.href
+	console.log(H5LoginNum, "======H5LoginNum")
+	if (H5LoginNum == 0 && code) {
+		code = ''
+	}
+	if (code) {
+		let coupon_atv_id = $util.getQueryString('coupon_atv_id') || 0
+		let pid = $util.getQueryString('pid') || 0
+		// console.log("index/webLogin ==>", code, coupon_atv_id, pid) 
+		let url = formatUrl("index/webLogin")
+		try {
+			let d = await tokenFly.post(url, {
+				login_type: 'gzh',
+				code,
+				pid,
+				coupon_atv_id
+			});
+			H5LoginNum = 0
+
+			let {
+				code: res_code,
+				data,
+				error
+			} = d.data
+
+			if (res_code !== 200) {
+				uni.hideLoading()
+				serverError({
+					code: res_code,
+					msg: error
+				});
+				throw d;
+			}
+			//登录成功
+			uni.hideLoading()
+			$store.commit('updateUserItem', {
+				key: 'isGzhLogin',
+				val: true
+			})
+			$store.commit('updateUserItem', {
+				key: 'userInfo',
+				val: data.data
+			})
+			$store.commit('updateUserItem', {
+				key: 'autograph',
+				val: data.autograph
+			})
+			return data;
+		} catch (e) {
+			uni.hideLoading()
+			let {
+				code,
+				error
+			} = e.response.data
+			// console.log("catch e code error=======", code, error)
+			if (code == 40163) {
+				let pages = getCurrentPages()
+				let {
+					route,
+					options = {}
+				} = pages[pages.length - 1]
+				let routeUrl = $util.getUrlToStr(`/${route}`, options)
+				let {
+					userPageType = 1
+				} = $store.state.user
+				let pageParam = route === 'pages/mine' ? `?type=${userPageType}` : ``
+				let loginPage = `${routeUrl}${pageParam}`
+				let openType = pageArr.includes(loginPage) ? `reLaunch` : `navigateTo`
+				setTimeout(() => {
+					$store.commit('updateUserItem', {
+						key: 'loginPage',
+						val: loginPage
+					})
+					$util.goUrl({
+						url: `/pages/login`,
+						openType
+					})
+					fly.unlock()
+				}, 200)
+			} else {
+				serverError({
+					code,
+					msg: error
+				});
+				uni.hideLoading()
+			}
+			return await Promise.reject(e)
+		}
+	} else {
+		H5LoginNum = 0
+		let pages = getCurrentPages()
+		let {
+			route,
+			options = {}
+		} = pages[pages.length - 1]
+		let routeUrl = $util.getUrlToStr(`/${route}`, options)
+		let {
+			userPageType = 1
+		} = $store.state.user
+		let pageParam = route === 'pages/mine' ? `?type=${userPageType}` : ``
+		let loginPage = `${routeUrl}${pageParam}`
+
+		let openType = pageArr.includes(loginPage) ? `reLaunch` : `navigateTo`
+		$store.commit('updateUserItem', {
+			key: 'loginPage',
+			val: loginPage
+		})
+		$util.goUrl({
+			url: `/pages/login`,
+			openType
+		})
+		$util.hideAll()
+		fly.unlock()
+		return await Promise.reject("跳转授权===============")
+	}
+}
+
+
+// app登录
+let appLoginNum = 0
+const appLogin = async function() {
+	let {
+		autograph = '',
+			appLogin = {},
+			loginType = 'weixin'
+	} = $store.state.user
+
+	if (appLoginNum == 0 && autograph) {
+		appLogin = ''
+	}
+	// console.log(autograph, "=========================appLogin autograph")
+	if (appLogin) {
+		code = ''
+		let url = formatUrl(loginType == 'weixin' ? 'index/appLogin' : 'index/iosLogin')
+		try {
+			let d = await tokenFly.post(url, {
+				data: appLogin
+			});
+			appLoginNum = 0
+
+			let {
+				code: res_code,
+				data,
+				error
+			} = d.data
+
+			if (res_code !== 200) {
+				uni.hideLoading()
+				serverError({
+					code: res_code,
+					msg: error
+				});
+				throw d;
+			}
+			//登录成功
+			uni.hideLoading()
+			$store.commit('updateUserItem', {
+				key: 'isShowLogin',
+				val: false
+			})
+			$store.commit('updateUserItem', {
+				key: 'userInfo',
+				val: data.data
+			})
+			$store.commit('updateUserItem', {
+				key: 'autograph',
+				val: data.autograph
+			})
+			return data;
+		} catch (e) {
+			uni.hideLoading()
+			appLoginNum = 0
+			let {
+				code,
+				error
+			} = e.response.data
+			if (code !== 200) {
+				serverError({
+					code,
+					msg: error
+				});
+			}
+			return await Promise.reject(e);
+		}
+
+	} else {
+		appLoginNum = 0
+
+		let pages = getCurrentPages()
+		let {
+			route,
+			options = {}
+		} = pages[pages.length - 1]
+		let routeUrl = $util.getUrlToStr(`/${route}`, options)
+		let {
+			userPageType = 1
+		} = $store.state.user
+		let pageParam = route === 'pages/mine' ? `?type=${userPageType}` : ``
+		let loginPage = `${routeUrl}${pageParam}`
+
+		let openType = pageArr.includes(loginPage) ? `reLaunch` : `navigateTo`
+		$store.commit('updateUserItem', {
+			key: 'loginPage',
+			val: loginPage
+		})
+		$util.goUrl({
+			url: `/pages/login`,
+			openType
+		})
+		$util.hideAll()
+		fly.unlock()
+		return await Promise.reject("跳转授权===============");
+	}
+}
+
+//设置超时
+fly.config.timeout = 30000;
+
+//设置请求基地址
+
+//给所有请求添加自定义header
+fly.config.headers = tokenFly.config.headers = {
+	"content-type": "application/json"
+}
+
+
+let isapp = 0
+// #ifdef APP-PLUS
+isapp = 1;
+// #endif
+// #ifdef H5
+isapp = 2;
+// #endif
+
+//添加请求拦截器
+fly.interceptors.request.use(
+	async (request) => {
+		//添加验证token
+		request.headers['autograph'] = $store.state.user.autograph || '';
+		request.headers['isapp'] = isapp;
+		return request;
+	})
+
+//添加响应拦截器，响应拦截器会在then/catch处理之前执行
+fly.interceptors.response.use(
+	async (response) => {
+			// #ifdef H5
+			let h5code = $util.getQueryString('code')
+			console.log(h5code, "=======h5code")
+			if (h5code && !$store.state.user.autograph && H5LoginNum == 0) {
+				response.data.code = 401
+				H5LoginNum++
+			}
+			// #endif
+
+			//token过期验证
+			// console.log("response====>", response.request.url.split('&urls=')[1], "=== urls ====>", response.data.code, response)
+			if (response.data.code != 401) return response;
+			fly.lock()
+
+			//#ifdef  MP-WEIXIN
+			console.log("==> MP-WEIXIN 401")
+			await wxLogin()
+			//#endif
+
+			//#ifdef H5
+			console.log("==> H5 401")
+			if ($store.state.user.autograph) {
+				let storeArr = ['userInfo', 'mineInfo', 'coachInfo', 'userPageType']
+				storeArr.map(key => {
+					$store.commit('updateUserItem', {
+						key,
+						val: key == 'coachInfo' ? {
+							id: -1,
+						} : key == 'userPageType' ? 1 : ''
+					})
+				})
+				H5LoginNum++
+			}
+			await gzhLogin()
+			//#endif
+
+			//#ifdef  APP-PLUS 
+			console.log("==> APP-PLUS 401")
+			if (!$store.state.user.autograph) {
+				appLoginNum++
+			}
+			await appLogin()
+			//#endif
+
+			response.request.headers["autograph"] = $store.state.user.autograph || ''
+			fly.unlock();
+			return fly.request(response.request);
+		},
+		async (err) => {
+			console.log(err, "=======fly.interceptors.response.use err");
+			let {
+				status = 0,
+			} = err
+
+			$util.hideAll()
+			networkError({
+				code: status,
+			})
+			//网络错误
+			return await Promise.reject(err);
+		}
+)
+
+//统一处理请求,satus=200网络正常code=200服务器正常
+const httpType = ["post", "get"]
+const formatReq = function() {
+	let req = {};
+	httpType.forEach((type) => {
+		req[type] = async function(url, param) {
+			//构造请求地址
+			url = formatUrl(url);
+
+			let res = await fly[type](url, param)
+			// console.log(res, "========= formatReq res")
+			// #ifdef MP-BAIDU
+			res.data = typeof(res.data) == "string" ? JSON.parse(res.data) : res.data;
+			// #endif
+			let {
+				code,
+				error,
+				data
+			} = res.data
+			code = code * 1
+			if (code === 200) return data;
+			//code!=200抛出错误
+			$util.hideAll();
+			if (code == 400 && error) {
+				console.log(code, error, "code != 200");
+				msgError({
+					msg: error
+				})
+			}
+			return await Promise.reject(res.data);
+		}
+	})
+	return req;
+}
+const req = formatReq();
+
+
+// 定义上传,picture--代表图片 audio--音频 video--视频,默认picture
+const uploadFile = async (url, {
+	name = "file",
+	filePath,
+	contentType = '',
+	header = {
+		autograph: $store.state.user.autograph || '',
+		isapp: isapp
+	},
+	formData = {
+		type: 'picture'
+	}
+} = {}) => {
+	url = formatUrl(url); 
+	let [resErr, res] = await uni.uploadFile({
+		url,
+		filePath,
+		name,
+		formData,
+		header,
+	})
+	// console.log(res, "======uploadFile res")
+
+	if (res.statusCode != 200) {
+		$util.hideAll()
+		networkError();
+		return await Promise.reject(res);
+	}
+	let parseData = JSON.parse(res.data)
+	//服务器错误
+	let {
+		code,
+		error,
+		data
+	} = parseData;
+	if (code != 200) {
+		$util.hideAll()
+		if (code === 401) {
+			fly.lock()
+			//#ifdef  MP-WEIXIN
+			console.log("==> MP-WEIXIN 401")
+			await wxLogin()
+			//#endif
+
+			//#ifdef H5
+			console.log("==> H5 401")
+			if ($store.state.user.autograph) {
+				let storeArr = ['userInfo', 'autograph', 'mineInfo', 'coachInfo', 'userPageType']
+				storeArr.map(key => {
+					$store.commit('updateUserItem', {
+						key,
+						val: key == 'coachInfo' ? {
+							id: -1,
+						} : key == 'userPageType' ? 1 : ''
+					})
+				})
+				H5LoginNum = 0
+			}
+			await gzhLogin()
+			//#endif
+
+			//#ifdef  APP-PLUS 
+			console.log("==> APP-PLUS 401")
+			if (!$store.state.user.autograph) {
+				appLoginNum++
+			}
+			await appLogin()
+			//#endif
+		} else {
+			serverError({
+				code,
+				msg: error
+			});
+		}
+		return await Promise.reject(res);
+	}
+	return data
+}
+
+export {
+	fly,
+	req,
+	uploadFile,
+	formatImageUrl,
+	formatUrl,
+}
\ No newline at end of file
diff --git a/utils/validate.js b/utils/validate.js
new file mode 100644
index 0000000..73f49aa
--- /dev/null
+++ b/utils/validate.js
@@ -0,0 +1,206 @@
+const strategies = {
+	// errorMsg参数，提升了适用性
+	isNotNull: function(value, errorMsg, regType) { //去空字符，不为空
+		// regType 2去除所有空格
+		if (regType == 2 && value) {
+			value = value.replace(/(^\s*)|(\s*$)/g, "")
+		}
+		if (value === '' || value === undefined || value === false || JSON.stringify(value) === '[]' || JSON
+			.stringify(value) === '{}') {
+			// 返回字符串true  错误信息
+			return errorMsg;
+		}
+	},
+	minLength: function(value, errorMsg, length) { //限制最小长度
+		if (value.length < length) {
+			return errorMsg;
+		}
+	},
+	maxLength: function(value, errorMsg, length) { //限制最大长度
+		if (value == null || value.length < 1) {
+			return errorMsg;
+		} else if (value.length > length) {
+			return `${errorMsg}，最多¥${length}字`;
+		}
+	},
+	isAllPhone: function(value, errorMsg, regType, regText) {
+		regText = regText || '电话号码'
+		let reg = /((^400)-([0-9]{7})$)|(^1[3-9]\d{9}$)|((^0\d{2,3})-(\d{7,8})$)/
+		if (value == null || value.length < 1) {
+			return errorMsg;
+		} else if (!reg.test(value)) {
+			return `${value} ${regText}无效`
+		}
+	},
+	isMobile: function(value, errorMsg) {
+		//   if (!/^((\+?86)|(\(\+86\)))?(13[012356789][0-9]{8}|15[012356789][0-9]{8}|18[02356789][0-9]{8}|147[0-9]{8}|1349[0-9]{7}|([0-9]{3,4}-)?[0-9]{7,8})$/.test(value)) { //电话号码校验
+		if (value == null || value.length < 1) {
+			return errorMsg;
+		}
+		if (!/^(1[0-9]{10})$/.test(value)) { //电话号码校验
+			return `${value} 手机号无效`;
+		}
+	},
+	isZuoji: function(value, errorMsg) {
+		if (!/0\d{2,3}-\d{7,8}|\(?0\d{2,3}[)-]?\d{7,8}|\(?0\d{2,3}[)-]*\d{7,8}$/.test(value)) { //座机号码校验
+			return errorMsg;
+		}
+	},
+	isNotText: function(value, errorMsg) {
+		if (!/^[\u4e00-\u9fa5]+$/.test(value)) { //非中文校验
+		} else {
+			return errorMsg;
+		}
+	},
+	isWechat: function(value, errorMsg) {
+		if (!/^[a-zA-Z]{1}[-_a-zA-Z0-9]{5,29}$/.test(value)) { //微信号码校验
+			return errorMsg;
+		}
+	},
+	isEmail: function(value, errorMsg) {
+		if (!/^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/.test(value)) { //邮箱校验
+			return errorMsg;
+		}
+	},
+	isMoney: function(value, errorMsg, regType) {
+		// regType 1大于0；2可为0
+		let regArr = {
+			1: /^(([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/,
+			2: /^(([0-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/
+		}
+		let reg = regArr[regType]
+		if (value == '') {
+			return errorMsg;
+		} else if (regType == 1 && value * 1 === 0) {
+			return `${errorMsg}，不可为0`;
+		} else if (!reg.test(value)) {
+			return `${errorMsg}，最多2位小数`;
+		}
+	},
+	isUrl: function(value, errorMsg) {
+		if (value.indexOf('http') < 0) {
+			return errorMsg;
+		}
+	},
+	isNumber: function(value, errorMsg, regType) {
+		// 1可为0；2大于0
+		let reg = regType == 1 ? /^\+?[0-9]*$/ : /^[1-9]\d*$/
+		if (!reg.test(value)) {
+			return errorMsg;
+		}
+	},
+	isFloatNum: function(value, errorMsg, regType, dotLen) {
+		// dotLen 保留几位小数
+		// regType 1大于0；2可为0 
+		let regArr = {
+			1: {
+				1: /^(([1-9][0-9]*)|(([0]\.\d{1}|[1-9][0-9]*\.\d{1})))$/,
+				2: /^(([0-9][0-9]*)|(([0]\.\d{1}|[1-9][0-9]*\.\d{1})))$/
+			},
+			2: {
+				1: /^(([1-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/,
+				2: /^(([0-9][0-9]*)|(([0]\.\d{1,2}|[1-9][0-9]*\.\d{1,2})))$/
+			}
+		}
+		let reg = regArr[dotLen][regType]
+		if (value == '') {
+			return errorMsg;
+		} else if (regType == 1 && value * 1 === 0) {
+			return `${errorMsg}，不可为0`;
+		} else if (!reg.test(value)) {
+			return `${errorMsg}，最多${dotLen}位小数`;
+		}
+	},
+	isIdCard: function(value, errorMsg) {
+		var regIdCard =
+			/^(^[1-9]\d{7}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])\d{3}$)|(^[1-9]\d{5}[1-9]\d{3}((0\d)|(1[0-2]))(([0|1|2]\d)|3[0-1])((\d{4})|\d{3}[Xx])$)$/;
+		if (value == null || value.length < 1) {
+			return errorMsg;
+		}
+		if (regIdCard.test(value)) {
+			if (value.length == 18) {
+				var idCardWi = new Array(7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4,
+					2); //将前17位加权因子保存在数组里
+				var idCardY = new Array(1, 0, 10, 9, 8, 7, 6, 5, 4, 3,
+					2); //这是除以11后，可能产生的11位余数、验证码，也保存成数组
+				var idCardWiSum = 0; //用来保存前17位各自乖以加权因子后的总和
+				for (var i = 0; i < 17; i++) {
+					idCardWiSum += value.substring(i, i + 1) * idCardWi[i];
+				}
+				var idCardMod = idCardWiSum % 11; //计算出校验码所在数组的位置
+				var idCardLast = value.substring(17); //得到最后一位身份证号码
+				//如果等于2，则说明校验码是10，身份证号码最后一位应该是X
+				if (idCardMod == 2) {
+					if (idCardLast == "X" || idCardLast == "x") {} else {
+						return `${value} 身份证号码最后一位应为X`;
+					}
+				} else {
+					//用计算出的验证码与最后一位身份证号码匹配，如果一致，说明通过，否则是无效的身份证号码
+					if (idCardLast == idCardY[idCardMod]) {} else {
+						return `${value} 身份证号码无效`;
+					}
+				}
+			}
+		} else {
+			return `${value} 身份证号码无效`;
+		}
+	}
+};
+class Validate {
+	constructor() {
+		this.cache = []
+	}
+}
+Validate.prototype.add = function(value, item = {}) {
+	let {
+		checkType,
+		errorMsg,
+		length,
+		regType = 1,
+		regText,
+		dotLen = 2
+	} = item
+	this.cache.push(function() {
+		// 规则
+		let method, arr;
+		//判断为已有的策略还是新增的
+		if (typeof checkType === 'string') {
+			arr = checkType.split(':');
+			let strategy = arr.shift();
+			method = strategies[strategy];
+		} else {
+			arr = [];
+			method = checkType;
+		}
+		arr.unshift(value);
+		arr.push(errorMsg);
+		let lengthArr = ['minLength', 'maxLength']
+		if (lengthArr.includes(checkType) && length) {
+			arr.push(length);
+		}
+		let regTypeArr = ['isNotNull', 'isAllPhone', 'isMoney', 'isNumber', 'isFloatNum']
+		if (regTypeArr.includes(checkType)) {
+			arr.push(regType);
+		}
+		let regTextArr = ['isAllPhone']
+		if (regTextArr.includes(checkType)) {
+			arr.push(regText);
+		}
+		let dotLenArr = ['isFloatNum']
+		if (dotLenArr.includes(checkType)) {
+			arr.push(dotLen);
+		}
+		return method.apply(null, arr);
+	});
+};
+
+Validate.prototype.start = function() {
+	for (let i = 0, validatorFunc; validatorFunc = this.cache[i++];) {
+		let msg = validatorFunc();
+		if (msg) {
+			return msg;
+		}
+	}
+};
+
+export default Validate
\ No newline at end of file
diff --git a/utils/wx.js b/utils/wx.js
new file mode 100644
index 0000000..e827319
--- /dev/null
+++ b/utils/wx.js
@@ -0,0 +1,776 @@
+(function webpackUniversalModuleDefinition(root, factory) {
+  if (typeof exports === 'object' && typeof module === 'object')
+    module.exports = factory();
+  else if (typeof define === 'function' && define.amd)
+    define([], factory);
+  else {
+    var a = factory();
+    for (var i in a) (typeof exports === 'object' ? exports : root)[i] = a[i];
+  }
+})(this, function () {
+  return /******/ (function (modules) { // webpackBootstrap
+/******/ 	// The module cache
+/******/ 	var installedModules = {};
+/******/
+/******/ 	// The require function
+/******/ 	function __webpack_require__(moduleId) {
+/******/
+/******/ 		// Check if module is in cache
+/******/ 		if (installedModules[moduleId]) {
+/******/ 			return installedModules[moduleId].exports;
+        /******/
+}
+/******/ 		// Create a new module (and put it into the cache)
+/******/ 		var module = installedModules[moduleId] = {
+/******/ 			i: moduleId,
+/******/ 			l: false,
+/******/ 			exports: {}
+        /******/
+};
+/******/
+/******/ 		// Execute the module function
+/******/ 		modules[moduleId].call(module.exports, module, module.exports, __webpack_require__);
+/******/
+/******/ 		// Flag the module as loaded
+/******/ 		module.l = true;
+/******/
+/******/ 		// Return the exports of the module
+/******/ 		return module.exports;
+      /******/
+}
+/******/
+/******/
+/******/ 	// expose the modules object (__webpack_modules__)
+/******/ 	__webpack_require__.m = modules;
+/******/
+/******/ 	// expose the module cache
+/******/ 	__webpack_require__.c = installedModules;
+/******/
+/******/ 	// identity function for calling harmony imports with the correct context
+/******/ 	__webpack_require__.i = function (value) { return value; };
+/******/
+/******/ 	// define getter function for harmony exports
+/******/ 	__webpack_require__.d = function (exports, name, getter) {
+/******/ 		if (!__webpack_require__.o(exports, name)) {
+/******/ 			Object.defineProperty(exports, name, {
+/******/ 				configurable: false,
+/******/ 				enumerable: true,
+/******/ 				get: getter
+          /******/
+});
+        /******/
+}
+      /******/
+};
+/******/
+/******/ 	// getDefaultExport function for compatibility with non-harmony modules
+/******/ 	__webpack_require__.n = function (module) {
+/******/ 		var getter = module && module.__esModule ?
+/******/ 			function getDefault() { return module['default']; } :
+/******/ 			function getModuleExports() { return module; };
+/******/ 		__webpack_require__.d(getter, 'a', getter);
+/******/ 		return getter;
+      /******/
+};
+/******/
+/******/ 	// Object.prototype.hasOwnProperty.call
+/******/ 	__webpack_require__.o = function (object, property) { return Object.prototype.hasOwnProperty.call(object, property); };
+/******/
+/******/ 	// __webpack_public_path__
+/******/ 	__webpack_require__.p = "";
+    /******/
+    /******/ 	// Load entry module and return exports
+    /******/
+    return __webpack_require__(__webpack_require__.s = 11);
+    /******/
+})
+/************************************************************************/
+/******/([
+/* 0 */
+/***/ (function (module, exports, __webpack_require__) {
+
+        "use strict";
+
+
+        var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+        module.exports = {
+          type: function type(ob) {
+            return Object.prototype.toString.call(ob).slice(8, -1).toLowerCase();
+          },
+          isObject: function isObject(ob, real) {
+            if (real) {
+              return this.type(ob) === "object";
+            } else {
+              return ob && (typeof ob === 'undefined' ? 'undefined' : _typeof(ob)) === 'object';
+            }
+          },
+          isFormData: function isFormData(val) {
+            return typeof FormData !== 'undefined' && val instanceof FormData;
+          },
+          trim: function trim(str) {
+            return str.replace(/(^\s*)|(\s*$)/g, '');
+          },
+          encode: function encode(val) {
+            return encodeURIComponent(val).replace(/%40/gi, '@').replace(/%3A/gi, ':').replace(/%24/g, '$').replace(/%2C/gi, ',').replace(/%20/g, '+').replace(/%5B/gi, '[').replace(/%5D/gi, ']');
+          },
+          formatParams: function formatParams(data) {
+            var str = "";
+            var first = true;
+            var that = this;
+
+            function _encode(sub, path) {
+              var encode = that.encode;
+              var type = that.type(sub);
+              if (type == "array") {
+                sub.forEach(function (e, i) {
+                  _encode(e, path + "%5B%5D");
+                });
+              } else if (type == "object") {
+                for (var key in sub) {
+                  if (path) {
+                    _encode(sub[key], path + "%5B" + encode(key) + "%5D");
+                  } else {
+                    _encode(sub[key], encode(key));
+                  }
+                }
+              } else {
+                if (!first) {
+                  str += "&";
+                }
+                first = false;
+                str += path + "=" + encode(sub);
+              }
+            }
+
+            _encode(data, "");
+            return str;
+          },
+
+          // Do not overwrite existing attributes
+          merge: function merge(a, b) {
+            for (var key in b) {
+              if (!a.hasOwnProperty(key)) {
+                a[key] = b[key];
+              } else if (this.isObject(b[key], 1) && this.isObject(a[key], 1)) {
+                this.merge(a[key], b[key]);
+              }
+            }
+            return a;
+          }
+        };
+
+        /***/
+}),
+    /* 1 */
+/***/ (function (module, exports, __webpack_require__) {
+
+        function KEEP(_, cb) { cb(); }
+        "use strict";
+
+        var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
+        var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+        function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+        /*
+         * author: wendu
+         * email: 824783146@qq.com
+         **/
+
+        var util = __webpack_require__(0);
+        var isBrowser = typeof document !== "undefined";
+
+        //EngineWrapper can help  generating  a  http engine quickly through a adapter
+        function EngineWrapper(adapter) {
+          var AjaxEngine = function () {
+            function AjaxEngine() {
+              _classCallCheck(this, AjaxEngine);
+
+              this.requestHeaders = {};
+              this.readyState = 0;
+              this.timeout = 0; // 0 stands for no timeout
+              this.responseURL = "";
+              this.responseHeaders = {};
+            }
+
+            _createClass(AjaxEngine, [{
+              key: "_call",
+              value: function _call(name) {
+                this[name] && this[name].apply(this, [].splice.call(arguments, 1));
+              }
+            }, {
+              key: "_changeReadyState",
+              value: function _changeReadyState(state) {
+                this.readyState = state;
+                this._call("onreadystatechange");
+              }
+            }, {
+              key: "open",
+              value: function open(method, url) {
+                this.method = method;
+                if (!url) {
+                  url = location.href;
+                } else {
+                  url = util.trim(url);
+                  if (url.indexOf("http") !== 0) {
+                    // Normalize the request url
+                    if (isBrowser) {
+                      var t = document.createElement("a");
+                      t.href = url;
+                      url = t.href;
+                    }
+                  }
+                }
+                this.responseURL = url;
+                this._changeReadyState(1);
+              }
+            }, {
+              key: "send",
+              value: function send(arg) {
+                var _this = this;
+
+                arg = arg || null;
+                // if (isBrowser) {
+                //   var cookie = document.cookie;
+                //   if (cookie) {
+                //     this.requestHeaders.cookie = cookie;
+                //   }
+                // }
+                var self = this;
+                if (adapter) {
+                  var request = {
+                    method: self.method,
+                    url: self.responseURL,
+                    headers: self.requestHeaders || {},
+                    body: arg
+                  };
+                  util.merge(request, self._options || {});
+                  if (request.method === "GET") {
+                    request.body = null;
+                  }
+                  self._changeReadyState(3);
+                  var timer;
+                  self.timeout = self.timeout || 0;
+                  if (self.timeout > 0) {
+                    timer = setTimeout(function () {
+                      if (self.readyState === 3) {
+                        _this._call("onloadend");
+                        self._changeReadyState(0);
+                        self._call("ontimeout");
+                      }
+                    }, self.timeout);
+                  }
+                  request.timeout = self.timeout;
+                  adapter(request, function (response) {
+
+                    function getAndDelete(key) {
+                      var t = response[key];
+                      delete response[key];
+                      return t;
+                    }
+
+                    // If the request has already timeout, return
+                    if (self.readyState !== 3) return;
+                    clearTimeout(timer);
+
+                    // Make sure the type of status is integer
+                    self.status = getAndDelete("statusCode") - 0;
+
+                    var responseText = getAndDelete("responseText");
+                    var statusMessage = getAndDelete("statusMessage");
+
+                    // Network error, set the status code 0
+                    if (!self.status) {
+                      self.statusText = responseText;
+                      self._call("onerror", { msg: statusMessage });
+                    } else {
+                      // Parsing the response headers to array in a object,  because
+                      // there may be multiple values with the same header name
+                      var responseHeaders = getAndDelete("headers");
+                      var headers = {};
+                      for (var field in responseHeaders) {
+                        var value = responseHeaders[field];
+                        var key = field.toLowerCase();
+                        // Is array
+                        if ((typeof value === "undefined" ? "undefined" : _typeof(value)) === "object") {
+                          headers[key] = value;
+                        } else {
+                          headers[key] = headers[key] || [];
+                          headers[key].push(value);
+                        }
+                      }
+                      var cookies = headers["set-cookie"];
+                      if (isBrowser && cookies) {
+                        cookies.forEach(function (e) {
+                          // Remove the http-Only property of the  cookie
+                          // so that JavaScript can operate it.
+                          document.cookie = e.replace(/;\s*httpOnly/ig, "");
+                        });
+                      }
+                      self.responseHeaders = headers;
+                      // Set the fields of engine from response
+                      self.statusText = statusMessage || "";
+                      self.response = self.responseText = responseText;
+                      self._response = response;
+                      self._changeReadyState(4);
+                      self._call("onload");
+                    }
+                    self._call("onloadend");
+                  });
+                } else {
+                  console.error("Ajax require adapter");
+                }
+              }
+            }, {
+              key: "setRequestHeader",
+              value: function setRequestHeader(key, value) {
+                this.requestHeaders[util.trim(key)] = value;
+              }
+            }, {
+              key: "getResponseHeader",
+              value: function getResponseHeader(key) {
+                return (this.responseHeaders[key.toLowerCase()] || "").toString() || null;
+              }
+            }, {
+              key: "getAllResponseHeaders",
+              value: function getAllResponseHeaders() {
+                var str = "";
+                for (var key in this.responseHeaders) {
+                  str += key + ":" + this.getResponseHeader(key) + "\r\n";
+                }
+                return str || null;
+              }
+            }, {
+              key: "abort",
+              value: function abort(msg) {
+                this._changeReadyState(0);
+                this._call("onerror", { msg: msg });
+                this._call("onloadend");
+              }
+            }], [{
+              key: "setAdapter",
+              value: function setAdapter(requestAdapter) {
+                adapter = requestAdapter;
+              }
+            }]);
+
+            return AjaxEngine;
+          }();
+
+          return AjaxEngine;
+        }
+
+        // learn more about keep-loader: https://github.com/wendux/keep-loader
+        ;
+        module.exports = EngineWrapper;
+
+        /***/
+}),
+    /* 2 */
+/***/ (function (module, exports, __webpack_require__) {
+
+        function KEEP(_, cb) { cb(); }
+        "use strict";
+
+        var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+        function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+        var utils = __webpack_require__(0);
+        var isBrowser = typeof document !== "undefined";
+
+        var Fly = function () {
+          function Fly(engine) {
+            _classCallCheck(this, Fly);
+
+            this.engine = engine || XMLHttpRequest;
+
+            this.default = this; //For typeScript
+
+            /**
+             * Add  lock/unlock API for interceptor.
+             *
+             * Once an request/response interceptor is locked, the incoming request/response
+             * will be added to a queue before they enter the interceptor, they will not be
+             * continued  until the interceptor is unlocked.
+             *
+             * @param [interceptor] either is interceptors.request or interceptors.response
+             */
+            function wrap(interceptor) {
+              var completer;
+              utils.merge(interceptor, {
+                lock: function lock() {
+                  if (!completer) {
+                    interceptor.p = new Promise(function (resolve) {
+                      completer = resolve;
+                    });
+                  }
+                },
+                unlock: function unlock() {
+                  if (completer) {
+                    completer();
+                    interceptor.p = completer = null;
+                  }
+                }
+              });
+            }
+
+            var interceptors = this.interceptors = {
+              response: {
+                use: function use(handler, onerror) {
+                  this.handler = handler;
+                  this.onerror = onerror;
+                }
+              },
+              request: {
+                use: function use(handler) {
+                  this.handler = handler;
+                }
+              }
+            };
+
+            var irq = interceptors.request;
+            var irp = interceptors.response;
+            wrap(irp);
+            wrap(irq);
+
+            this.config = {
+              method: "GET",
+              baseURL: "",
+              headers: {},
+              timeout: 0,
+              parseJson: true, // Convert response data to JSON object automatically.
+              withCredentials: false
+            };
+          }
+
+          _createClass(Fly, [{
+            key: "request",
+            value: function request(url, data, options) {
+              var _this = this;
+
+              var engine = new this.engine();
+              var contentType = "Content-Type";
+              var contentTypeLowerCase = contentType.toLowerCase();
+              var interceptors = this.interceptors;
+              var requestInterceptor = interceptors.request;
+              var responseInterceptor = interceptors.response;
+              var requestInterceptorHandler = requestInterceptor.handler;
+              var promise = new Promise(function (resolve, reject) {
+                if (utils.isObject(url)) {
+                  options = url;
+                  url = options.url;
+                }
+                options = options || {};
+                options.headers = options.headers || {};
+
+                function isPromise(p) {
+                  // some  polyfill implementation of Promise may be not standard,
+                  // so, we test by duck-typing
+                  return p && p.then && p.catch;
+                }
+
+                /**
+                 * If the request/response interceptor has been locked，
+                 * the new request/response will enter a queue. otherwise, it will be performed directly.
+                 * @param [promise] if the promise exist, means the interceptor is  locked.
+                 * @param [callback]
+                 */
+                function enqueueIfLocked(promise, callback) {
+                  if (promise) {
+                    promise.then(function () {
+                      callback();
+                    });
+                  } else {
+                    callback();
+                  }
+                }
+
+                // make the http request
+                function makeRequest(options) {
+                  data = options.body;
+                  // Normalize the request url
+                  url = utils.trim(options.url);
+                  var baseUrl = utils.trim(options.baseURL || "");
+                  if (!url && isBrowser && !baseUrl) url = location.href;
+                  if (url.indexOf("http") !== 0) {
+                    var isAbsolute = url[0] === "/";
+                    if (!baseUrl && isBrowser) {
+                      var arr = location.pathname.split("/");
+                      arr.pop();
+                      baseUrl = location.protocol + "//" + location.host + (isAbsolute ? "" : arr.join("/"));
+                    }
+                    if (baseUrl[baseUrl.length - 1] !== "/") {
+                      baseUrl += "/";
+                    }
+                    url = baseUrl + (isAbsolute ? url.substr(1) : url);
+                    if (isBrowser) {
+
+                      // Normalize the url which contains the ".." or ".", such as
+                      // "http://xx.com/aa/bb/../../xx" to "http://xx.com/xx" .
+                      var t = document.createElement("a");
+                      t.href = url;
+                      url = t.href;
+                    }
+                  }
+
+                  var responseType = utils.trim(options.responseType || "");
+                  engine.withCredentials = !!options.withCredentials;
+                  var isGet = options.method === "GET";
+                  if (isGet) {
+                    if (data) {
+                      if (utils.type(data) !== "string") {
+                        data = utils.formatParams(data);
+                      }
+                      url += (url.indexOf("?") === -1 ? "?" : "&") + data;
+                    }
+                  }
+                  engine.open(options.method, url);
+
+                  // try catch for ie >=9
+                  try {
+                    engine.timeout = options.timeout || 0;
+                    if (responseType !== "stream") {
+                      engine.responseType = responseType;
+                    }
+                  } catch (e) {
+                  }
+
+                  if (!isGet) {
+                    // If the request data is json object, transforming it  to json string,
+                    // and set request content-type to "json". In browser,  the data will
+                    // be sent as RequestBody instead of FormData
+                    if (options.headers[contentType].toLowerCase() === "application/x-www-form-urlencoded") {
+                      data = utils.formatParams(data);
+                    } else if (!utils.isFormData(data) && ["object", "array"].indexOf(utils.type(data)) !== -1) {
+                      options.headers[contentType] = 'application/json;charset=utf-8';
+                      data = JSON.stringify(data);
+                    }
+                  }
+
+                  for (var k in options.headers) {
+                    if (k === contentType && (utils.isFormData(data) || !data || isGet)) {
+                      // Delete the content-type, Let the browser set it
+                      delete options.headers[k];
+                    } else {
+                      try {
+                        // In browser environment, some header fields are readonly,
+                        // write will cause the exception .
+                        engine.setRequestHeader(k, options.headers[k]);
+                      } catch (e) {
+                      }
+                    }
+                  }
+
+                  function onresult(handler, data, type) {
+                    enqueueIfLocked(responseInterceptor.p, function () {
+                      if (handler) {
+                        //如果失败，添加请求信息
+                        if (type) {
+                          data.request = options;
+                        }
+                        var ret = handler.call(responseInterceptor, data, Promise);
+                        data = ret === undefined ? data : ret;
+                      }
+                      if (!isPromise(data)) {
+                        data = Promise[type === 0 ? "resolve" : "reject"](data);
+                      }
+                      data.then(function (d) {
+                        resolve(d);
+                      }).catch(function (e) {
+                        reject(e);
+                      });
+                    });
+                  }
+
+                  function onerror(e) {
+                    e.engine = engine;
+                    onresult(responseInterceptor.onerror, e, -1);
+                  }
+
+                  function Err(msg, status) {
+                    this.message = msg;
+                    this.status = status;
+                  }
+
+                  engine.onload = function () {
+                    // The xhr of IE9 has not response filed
+                    var response = engine.response || engine.responseText;
+                    if (options.parseJson && (engine.getResponseHeader(contentType) || "").indexOf("json") !== -1
+                      // Some third engine implementation may transform the response text to json object automatically,
+                      // so we should test the type of response before transforming it
+                      && !utils.isObject(response)) {
+                      response = JSON.parse(response);
+                    }
+                    var headers = {};
+                    var items = (engine.getAllResponseHeaders() || "").split("\r\n");
+                    items.pop();
+                    items.forEach(function (e) {
+                      var key = e.split(":")[0];
+                      headers[key] = engine.getResponseHeader(key);
+                    });
+                    var status = engine.status;
+                    var statusText = engine.statusText;
+                    var data = { data: response, headers: headers, status: status, statusText: statusText };
+                    // The _response filed of engine is set in  adapter which be called in engine-wrapper.js
+                    utils.merge(data, engine._response);
+                    if (status >= 200 && status < 300 || status === 304) {
+                      data.engine = engine;
+                      data.request = options;
+                      onresult(responseInterceptor.handler, data, 0);
+                    } else {
+                      var e = new Err(statusText, status);
+                      e.response = data;
+                      onerror(e);
+                    }
+                  };
+
+                  engine.onerror = function (e) {
+                    onerror(new Err(e.msg || "Network Error", 0));
+                  };
+
+                  engine.ontimeout = function () {
+                    onerror(new Err("timeout [ " + engine.timeout + "ms ]", 1));
+                  };
+                  engine._options = options;
+                  setTimeout(function () {
+                    engine.send(isGet ? null : data);
+                  }, 0);
+                }
+
+                enqueueIfLocked(requestInterceptor.p, function () {
+                  utils.merge(options, _this.config);
+                  var headers = options.headers;
+                  headers[contentType] = headers[contentType] || headers[contentTypeLowerCase] || "";
+                  delete headers[contentTypeLowerCase];
+                  options.body = data || options.body;
+                  url = utils.trim(url || "");
+                  options.method = options.method.toUpperCase();
+                  options.url = url;
+                  var ret = options;
+                  if (requestInterceptorHandler) {
+                    ret = requestInterceptorHandler.call(requestInterceptor, options, Promise) || options;
+                  }
+                  if (!isPromise(ret)) {
+                    ret = Promise.resolve(ret);
+                  }
+                  ret.then(function (d) {
+                    //if options continue
+                    if (d === options) {
+                      makeRequest(d);
+                    } else {
+                      resolve(d);
+                    }
+                  }, function (err) {
+                    reject(err);
+                  });
+                });
+              });
+              promise.engine = engine;
+              return promise;
+            }
+          }, {
+            key: "all",
+            value: function all(promises) {
+              return Promise.all(promises);
+            }
+          }, {
+            key: "spread",
+            value: function spread(callback) {
+              return function (arr) {
+                return callback.apply(null, arr);
+              };
+            }
+          }, {
+            key: "lock",
+            value: function lock() {
+              this.interceptors.request.lock();
+            }
+          }, {
+            key: "unlock",
+            value: function unlock() {
+              this.interceptors.request.unlock();
+            }
+          }]);
+
+          return Fly;
+        }();
+
+        //For typeScript
+
+
+        Fly.default = Fly;
+
+        ["get", "post", "put", "patch", "head", "delete"].forEach(function (e) {
+          Fly.prototype[e] = function (url, data, option) {
+            return this.request(url, data, utils.merge({ method: e }, option));
+          };
+        });
+        // Learn more about keep-loader: https://github.com/wendux/keep-loader
+        ;
+        module.exports = Fly;
+
+        /***/
+      }),
+    /* 3 */,
+    /* 4 */,
+    /* 5 */,
+    /* 6 */
+    /***/ (function (module, exports, __webpack_require__) {
+
+        "use strict";
+
+
+        //微信小程序适配器
+        module.exports = function (request, responseCallback) {
+          var con = {
+            method: request.method,
+            url: request.url,
+            dataType: request.dataType || undefined,
+            header: request.headers,
+            data: request.body || {},
+            success: function success(res) {
+              responseCallback({
+                statusCode: res.statusCode,
+                responseText: res.data,
+                headers: res.header,
+                statusMessage: res.errMsg
+              });
+            },
+            fail: function fail(res) {
+              responseCallback({
+                statusCode: res.statusCode || 0,
+                statusMessage: res.errMsg
+              });
+            }
+          };
+          uni.request(con);
+        };
+
+        /***/
+      }),
+    /* 7 */,
+    /* 8 */,
+    /* 9 */,
+    /* 10 */,
+    /* 11 */
+    /***/ (function (module, exports, __webpack_require__) {
+
+        "use strict";
+
+
+        //微信小程序入口
+        var Fly = __webpack_require__(2);
+        var EngineWrapper = __webpack_require__(1);
+        var adapter = __webpack_require__(6);
+        var wxEngine = EngineWrapper(adapter);
+        module.exports = function (engine) {
+          return new Fly(engine || wxEngine);
+        };
+
+        /***/
+})
+/******/]);
+});
\ No newline at end of file